diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index 0131ca0437b..06c3ed15a93 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -133,7 +133,9 @@ module named account_voucher.
         'test/account_bank_statement.yml',
         'test/account_cash_statement.yml',
         'test/account_report.yml',
-    ],
+        
+
+            ],
     'installable': True,
     'active': False,
     'certificate': '0080331923549',
diff --git a/addons/account/account.py b/addons/account/account.py
index f79e36c7681..3fed8c45f17 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -131,7 +131,7 @@ class account_account_type(osv.osv):
     _name = "account.account.type"
     _description = "Account Type"
     _columns = {
-        'name': fields.char('Acc. Type Name', size=64, required=True, translate=True),
+        'name': fields.char('Acc. Type Name', size=64, required=True),
         'code': fields.char('Code', size=32, required=True),
         'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.
 
diff --git a/addons/account/account_demo.xml b/addons/account/account_demo.xml
index 5ef0ee4992d..566185c70c3 100644
--- a/addons/account/account_demo.xml
+++ b/addons/account/account_demo.xml
@@ -126,6 +126,9 @@
             <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-        
+
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('account.group_account_user'))]"/> 
+        </record>      
     </data>
 </openerp>
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 495b4f4e5ba..64d124f1dc2 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -24,7 +24,7 @@
                     <attribute name='string'></attribute>
                 </xpath>
                 <group colspan="8">
-                    <group colspan="4" height="450" width="600">
+                    <group colspan="4" width="600">
                         <field name="charts"/>
                             <group colspan="4" groups="base.group_extended">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index f0cec0abda3..5b661e3e7d7 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -155,7 +155,7 @@
                         <field name="currency_id" width="50"/>
                         <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                         <newline/>
-                        <field string="Supplier" name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
+                        <field string="Supplier" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
@@ -264,7 +264,7 @@
                     <field name="currency_id" width="50"/>
                     <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}" groups="account.group_account_user"/>
                     <newline/>
-                    <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
+                    <field string="Customer" name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user" context="{'search_default_customer': 1}"/>
                     <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
@@ -434,6 +434,7 @@
             <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
+            <field name="groups_id" eval="[(6,0,[ref('account.group_account_manager'),ref('account.group_account_user')])]"/>
         </record>
 
 
@@ -461,7 +462,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice', 'journal_type': 'purchase'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase order or receipt. This way, you can control the invoice from your supplier according to what you purchased or received.</field>
+            <field name="help">With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received.</field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 7b7e6b308b1..867aaeeba51 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -6,7 +6,6 @@
             groups="group_account_user,group_account_manager,group_account_invoice"
             web_icon="images/accounting.png"
             web_icon_hover="images/accounting-hover.png"/>
-        <menuitem id="menu_partners" name="Partners" parent="menu_finance" sequence="1"/>
         <menuitem id="menu_finance_receivables" name="Customers" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2522e53b2a0..9b4af85164e 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -100,6 +100,57 @@ class account_move_line(osv.osv):
 
         return query
 
+    def _amount_residual(self, cr, uid, ids, field_names, args, context=None):
+        """
+           This function returns the residual amount on a receivable or payable account.move.line. 
+           By default, it returns an amount in the currency of this journal entry (maybe different 
+           of the company currency), but if you pass 'residual_in_company_currency' = True in the 
+           context then the returned amount will be in company currency.
+        """
+        res = {}
+        if context is None:
+            context = {}
+        cur_obj = self.pool.get('res.currency')
+        for move_line in self.browse(cr, uid, ids, context=context):
+            res[move_line.id] = {
+                'amount_residual': 0.0,
+                'amount_residual_currency': 0.0,
+            }
+ 
+            if move_line.reconcile_id:
+                continue
+            if not move_line.account_id.type in ('payable', 'receivable'):
+                #this function does not suport to be used on move lines not related to payable or receivable accounts
+                continue
+            
+            if move_line.currency_id:
+                move_line_total = move_line.amount_currency
+                sign = move_line.amount_currency < 0 and -1 or 1
+            else:
+                move_line_total = move_line.debit - move_line.credit
+                sign = (move_line.debit - move_line.credit) < 0 and -1 or 1
+            line_total_in_company_currency =  move_line.debit - move_line.credit
+            context_unreconciled = context.copy()
+            if move_line.reconcile_partial_id:
+                for payment_line in move_line.reconcile_partial_id.line_partial_ids:
+                    if payment_line.id == move_line.id:
+                        continue
+                    if payment_line.currency_id and move_line.currency_id and payment_line.currency_id.id == move_line.currency_id.id:
+                            move_line_total += payment_line.amount_currency
+                    else:
+                        if move_line.currency_id:
+                            context_unreconciled.update({'date': payment_line.date})
+                            amount_in_foreign_currency = cur_obj.compute(cr, uid, move_line.company_id.currency_id.id, move_line.currency_id.id, (payment_line.debit - payment_line.credit), round=False, context=context_unreconciled)
+                            move_line_total += amount_in_foreign_currency
+                        else:
+                            move_line_total += (payment_line.debit - payment_line.credit)
+                    line_total_in_company_currency += (payment_line.debit - payment_line.credit)
+
+            result = move_line_total
+            res[move_line.id]['amount_residual_currency'] =  sign * (move_line.currency_id and self.pool.get('res.currency').round(cr, uid, move_line.currency_id, result) or result)
+            res[move_line.id]['amount_residual'] = sign * line_total_in_company_currency
+        return res
+
     def default_get(self, cr, uid, fields, context=None):
         data = self._default_get(cr, uid, fields, context=context)
         for f in data.keys():
@@ -433,6 +484,8 @@ class account_move_line(osv.osv):
         'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
         'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
         'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
+        'amount_residual_currency': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
+        'amount_residual': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
         'period_id': fields.many2one('account.period', 'Period', required=True, select=2),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1),
@@ -676,6 +729,7 @@ class account_move_line(osv.osv):
             company_list.append(line.company_id.id)
 
         for line in self.browse(cr, uid, ids, context=context):
+            company_currency_id = line.company_id.currency_id
             if line.reconcile_id:
                 raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
             if line.reconcile_partial_id:
@@ -688,8 +742,7 @@ class account_move_line(osv.osv):
             else:
                 unmerge.append(line.id)
                 total += (line.debit or 0.0) - (line.credit or 0.0)
-
-        if not total:
+        if self.pool.get('res.currency').is_zero(cr, uid, company_currency_id, total):
             res = self.reconcile(cr, uid, merges+unmerge, context=context)
             return res
         r_id = move_rec_obj.create(cr, uid, {
@@ -771,6 +824,19 @@ class account_move_line(osv.osv):
                 libelle = context['comment']
             else:
                 libelle = _('Write-Off')
+
+            cur_obj = self.pool.get('res.currency')
+            cur_id = False
+            amount_currency_writeoff = 0.0
+            if context.get('company_currency_id',False) != context.get('currency_id',False):
+                cur_id = context.get('currency_id',False)
+                for line in unrec_lines:
+                    if line.currency_id and line.currency_id.id == context.get('currency_id',False):
+                        amount_currency_writeoff += line.amount_currency
+                    else:
+                        tmp_amount = cur_obj.compute(cr, uid, line.account_id.company_id.currency_id.id, context.get('currency_id',False), abs(line.debit-line.credit), context={'date': line.date})
+                        amount_currency_writeoff += (line.debit > 0) and tmp_amount or -tmp_amount
+
             writeoff_lines = [
                 (0, 0, {
                     'name': libelle,
@@ -779,8 +845,8 @@ class account_move_line(osv.osv):
                     'account_id': account_id,
                     'date': date,
                     'partner_id': partner_id,
-                    'currency_id': account.currency_id.id or False,
-                    'amount_currency': account.currency_id.id and -currency or 0.0
+                    'currency_id': cur_id or (account.currency_id.id or False),
+                    'amount_currency': amount_currency_writeoff and -1 * amount_currency_writeoff or (account.currency_id.id and -1 * currency or 0.0)
                 }),
                 (0, 0, {
                     'name': libelle,
@@ -789,7 +855,9 @@ class account_move_line(osv.osv):
                     'account_id': writeoff_acc_id,
                     'analytic_account_id': context.get('analytic_id', False),
                     'date': date,
-                    'partner_id': partner_id
+                    'partner_id': partner_id,
+                    'currency_id': cur_id or (account.currency_id.id or False),
+                    'amount_currency': amount_currency_writeoff and amount_currency_writeoff or (account.currency_id.id and currency or 0.0)
                 })
             ]
 
@@ -802,6 +870,8 @@ class account_move_line(osv.osv):
             })
 
             writeoff_line_ids = self.search(cr, uid, [('move_id', '=', writeoff_move_id), ('account_id', '=', account_id)])
+            if account_id == writeoff_acc_id:
+                writeoff_line_ids = [writeoff_line_ids[1]]
             ids += writeoff_line_ids
 
         r_id = move_rec_obj.create(cr, uid, {
@@ -1283,4 +1353,4 @@ class account_move_line(osv.osv):
 
 account_move_line()
 
-# 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/account_view.xml b/addons/account/account_view.xml
index db2984b5593..23c2bb21b48 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -950,11 +950,11 @@
                                   <field groups="base.group_extended" colspan="4" name="child_ids">
                                       <tree string="Account Tax">
                                           <field name="sequence"/>
-					                      <field name="name"/>
-					                      <field name="price_include" groups="base.group_extended"/>
-					                      <field name="description"/>
-					                 </tree>
-					             </field>
+                                          <field name="name"/>
+                                          <field name="price_include" groups="base.group_extended"/>
+                                          <field name="description"/>
+                                     </tree>
+                                 </field>
                           </group>
                         </page>
                         <page groups="base.group_extended" string="Special Computation">
@@ -963,8 +963,11 @@
                             <field name="domain"/>
                             <separator colspan="4" string="Applicable Code (if type=code)"/>
                             <field colspan="4" name="python_applicable" nolabel="1" attrs="{'readonly':[('applicable_type','=','true')], 'required':[('applicable_type','=','code')]}"/>
-                            <separator colspan="4" string="Compute Code (if type=code)"/>
-                            <field colspan="4" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
+                            <separator colspan="2" string="Compute Code"/>
+                            <separator colspan="2" string="Reverse Compute Code"/>
+                            <field colspan="2" name="python_compute" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
+                            <field colspan="2" name="python_compute_inv" nolabel="1" attrs="{'readonly':[('type','!=','code')],'required':[('type','=','code')]}"/>
+
                         </page>
                     </notebook>
                 </form>
@@ -2762,11 +2765,13 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
             <field name="filter" eval="True"/>
         </record>
 
-        <menuitem id="menu_partners_partners"
-                name="Partners"
-                parent="menu_partners"
-                action="action_partner_all"
-                sequence="1"/>
+        <menuitem id="menu_account_customer" name="Customers"
+            parent="menu_finance_receivables"
+            action="base.action_partner_customer_form" sequence="100"/>
+
+        <menuitem id="menu_account_supplier" name="Suppliers"
+            parent="menu_finance_payables"
+            action="base.action_partner_supplier_form" sequence="100"/>
 
     </data>
 </openerp>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 93bcc7724be..673cdfab8e1 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -26,15 +26,15 @@
           <field name="view_type">form</field>
           <field name="view_mode">tree,graph</field>
           <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="account.view_account_entries_report_tree"/>
+          <field name="view_id" ref="account.view_account_entries_report_tree"/>
       </record>
       <record id="action_treasory_graph" model="ir.actions.act_window">
           <field name="name">Treasury</field>
           <field name="res_model">account.account</field>
           <field name="view_type">form</field>
           <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','liquidity')]</field>
-            <field name="view_id" ref="account.view_treasory_graph"/>
+          <field name="domain">[('type','=','liquidity')]</field>
+          <field name="view_id" ref="account.view_treasory_graph"/>
       </record>
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
@@ -45,11 +45,11 @@
                     <hpaned>
                         <child1>
                             <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Approve" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
-                            <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
+                            <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" groups="account.group_account_manager"/>
                         </child1>
                         <child2>
-                            <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasury"/>
-                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged Receivables"/>
+                            <action colspan="4" height="220" name="%(action_treasory_graph)d" string="Treasury" groups="account.group_account_manager,account.group_account_user"/>
+                            <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged Receivables" groups="account.group_account_manager,account.group_account_user"/>
                             <!--  <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/> -->
                         </child2>
                     </hpaned>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 871ef514836..65184b3d130 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -438,6 +438,5 @@
             <field eval="'account.account,'+str(ref('account.a_sale'))" model="account.account" name="value"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index f81f8bb4f6b..b5b1082b43d 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:18+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:18+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:45+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:45+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,13 +26,13 @@ msgid "Other Configuration"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #, python-format
 msgid "No journal for ending writing has been defined for the fiscal year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:506
 #, python-format
 msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
 msgstr ""
@@ -62,7 +62,7 @@ msgid "Residual"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:803
 #, python-format
 msgid "Please define sequence on invoice journal"
 msgstr ""
@@ -123,12 +123,13 @@ msgid "Accounting Entries-"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1291
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
 msgstr ""
 
 #. module: account
+#: report:account.invoice:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
 msgstr ""
@@ -164,7 +165,7 @@ msgid "If the active field is set to False, it will allow you to hide the paymen
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1439
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -190,6 +191,12 @@ msgstr ""
 msgid "Negative"
 msgstr ""
 
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr ""
+
 #. module: account
 #: help:account.analytic.journal,type:0
 msgid "Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."
@@ -207,7 +214,7 @@ msgid "account.tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:901
 #, python-format
 msgid "No period defined for this date: %s !\n"
 "Please create a fiscal year."
@@ -230,7 +237,7 @@ msgid "Check this box if you don't want any VAT related to this Tax Code to appe
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1228
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -246,7 +253,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1102
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +291,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:547
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -300,7 +307,7 @@ msgid "Installs localized accounting charts to match as closely as possible the
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Can't find any account journal of %s type for this company.\n"
 "\n"
@@ -319,11 +326,6 @@ msgstr ""
 msgid "Purchase Properties"
 msgstr ""
 
-#. module: account
-#: help:account.account.type,sign:0
-msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
-msgstr ""
-
 #. module: account
 #: view:account.installer:0
 #: view:account.installer.modules:0
@@ -417,11 +419,6 @@ msgstr ""
 msgid "The amount expressed in an optional other currency."
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_move_journal_line
-msgid "A journal entry consists of several journal items, each of which is either a debit or a credit. OpenERP creates automatically one journal entry per accounting document: invoices, refund, supplier payment, bank statements, etc."
-msgstr ""
-
 #. module: account
 #: help:account.journal.period,state:0
 msgid "When journal period is created. The state is 'Draft'. If a report is printed it comes to 'Printed' state. When all transactions are done, it comes in 'Done' state."
@@ -456,11 +453,13 @@ msgstr ""
 #: field:account.move.line,journal_id:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: code:addons/account/account_move_line.py:909
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
 #: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
+#, python-format
 msgid "Journal"
 msgstr ""
 
@@ -519,7 +518,7 @@ msgid "Not reconciled transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_cash_statement.py:348
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
 msgstr ""
@@ -531,11 +530,6 @@ msgstr ""
 msgid "Tax Mapping"
 msgstr ""
 
-#. module: account
-#: model:ir.model,name:account.model_account_installer_modules
-msgid "account.installer.modules"
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
@@ -604,8 +598,8 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2779
+#: code:addons/account/installer.py:434
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -637,7 +631,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:675
+#: code:addons/account/account_move_line.py:719
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -648,7 +643,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:302
 #: model:ir.actions.act_window,name:account.action_aged_receivable
+#, python-format
 msgid "Receivable Accounts"
 msgstr ""
 
@@ -678,7 +675,7 @@ msgid "Partners Reconciled Today"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:306
 #, python-format
 msgid "The statement balance is incorrect !\n"
 ""
@@ -696,14 +693,14 @@ msgid "Charts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/project/wizard/project_account_analytic_line.py:0
+#: code:addons/account/project/wizard/project_account_analytic_line.py:47
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_change_currency.py:39
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
 msgstr ""
@@ -780,7 +777,7 @@ msgid "If checked, the new chart of accounts will not contain this by default."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:102
 #, python-format
 msgid "Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice"
 msgstr ""
@@ -801,7 +798,7 @@ msgid "Next Partner to reconcile"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
 msgstr ""
@@ -857,11 +854,6 @@ msgstr ""
 msgid "Consolidation"
 msgstr ""
 
-#. module: account
-#: model:account.account.type,name:account.account_type_liability
-msgid "Liability"
-msgstr ""
-
 #. module: account
 #: view:account.analytic.line:0
 #: view:account.entries.report:0
@@ -923,11 +915,12 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:2083
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:115
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:688
+#: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "No Analytic Journal !"
 msgstr ""
@@ -1045,6 +1038,11 @@ msgstr ""
 msgid "Credit Centralisation"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid "With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received."
+msgstr ""
+
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
@@ -1087,7 +1085,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:976
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1164,7 +1162,7 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:0
+#: code:addons/account/wizard/account_report_common.py:120
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
@@ -1179,6 +1177,11 @@ msgstr ""
 msgid "Search tax template"
 msgstr ""
 
+#. module: account
+#: report:account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
 #. module: account
 #: view:account.move.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
@@ -1221,8 +1224,6 @@ msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_partner_all
-#: model:ir.ui.menu,name:account.menu_partners
-#: model:ir.ui.menu,name:account.menu_partners_partners
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1252,7 +1253,7 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid "You can not use this general account in this journal !"
 msgstr ""
@@ -1318,6 +1319,11 @@ msgstr ""
 msgid "Total Without Tax"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid "A journal entry consists of several journal items, each of which is either a debit or a credit transaction. OpenERP automatically creates one journal entry per accounting document: invoice, refund, supplier payment, bank statements, etc."
+msgstr ""
+
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
@@ -1340,17 +1346,12 @@ msgid "Example: at 14 net days 2 percents, remaining amount at 30 days end of mo
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:833
 #, python-format
 msgid "Cannot create the invoice !\n"
 "The payment term defined gives a computed amount greater than the total invoiced amount."
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree1
-msgid "Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers."
-msgstr ""
-
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
 msgid "Anglo-Saxon Accounting"
@@ -1446,6 +1447,11 @@ msgstr ""
 msgid "Statement lines"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid "A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card or any other type of financial account. The starting balance will be proposed automatically and the closing balance is to be found on your statement. When you are in the Payment column of a line, you can press F1 to open the reconciliation form."
+msgstr ""
+
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
@@ -1551,7 +1557,7 @@ msgid "Error! You cannot define overlapping fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:751
 #, python-format
 msgid "The account is not defined to be reconciled !"
 msgstr ""
@@ -1582,7 +1588,7 @@ msgid "Receivables & Payables"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:758
 #, python-format
 msgid "You have to provide an account for the write off entry !"
 msgstr ""
@@ -1618,7 +1624,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_cash_statement.py:328
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -1639,7 +1645,7 @@ msgid "Tax Declaration: Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:499
 #, python-format
 msgid "You cannot deactivate an account that contains account moves."
 msgstr ""
@@ -1655,7 +1661,7 @@ msgid "You can not create move line on closed account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:519
 #, python-format
 msgid "You cannot change the type of account from 'Closed' to any other type which contains account entries!"
 msgstr ""
@@ -1729,7 +1735,7 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:332
 #, python-format
 msgid "Please verify that an account is defined in the journal."
 msgstr ""
@@ -1903,13 +1909,13 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/installer.py:0
+#: code:addons/account/installer.py:348
 #, python-format
 msgid " Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1319
 #, python-format
 msgid "There is no default default debit account defined \n"
 "on journal \"%s\""
@@ -1952,8 +1958,8 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2844
+#: code:addons/account/installer.py:498
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -1972,7 +1978,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:370
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2116,7 +2122,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:563
 #, python-format
 msgid "Can't find any account journal of %s type for this company.\n"
 "\n"
@@ -2135,11 +2141,6 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of invoice tax."
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you."
-msgstr ""
-
 #. module: account
 #: field:account.tax,base_sign:0
 #: field:account.tax,ref_base_sign:0
@@ -2184,8 +2185,8 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2796
+#: code:addons/account/installer.py:454
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2232,7 +2233,6 @@ msgid "Error ! You can not create recursive categories."
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2262,7 +2262,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:369
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2280,7 +2280,7 @@ msgid "Date:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:640
 #, python-format
 msgid "You cannot modify company of this journal as its related record exist in Entry Lines"
 msgstr ""
@@ -2386,11 +2386,6 @@ msgstr ""
 msgid "Accounting entries"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-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 ""
-
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
@@ -2421,17 +2416,17 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1181
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:2083
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:115
+#: code:addons/account/invoice.py:688
+#: code:addons/account/wizard/account_use_model.py:81
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
@@ -2444,6 +2439,7 @@ msgid "Tax codes"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
 msgstr ""
@@ -2465,7 +2461,7 @@ msgid "August"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:307
 #, python-format
 msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
@@ -2580,7 +2576,7 @@ msgid "Analytic Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:822
 #, python-format
 msgid "No fiscal year defined for this date !\n"
 "Please create one."
@@ -2684,14 +2680,13 @@ msgstr ""
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
-#: model:account.account.type,name:account.account_type_root
 #: selection:account.entries.report,type:0
 msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2906
+#: code:addons/account/installer.py:296
 #, python-format
 msgid "BNK"
 msgstr ""
@@ -2853,7 +2848,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1302
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -2943,7 +2938,7 @@ msgid "All selected journal entries will be validated and posted. It means you w
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:388
 #, python-format
 msgid "Cannot delete invoice(s) that are already opened or paid !"
 msgstr ""
@@ -2996,13 +2991,13 @@ msgid "Draft Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_invoice_state.py:68
 #, python-format
 msgid "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:522
 #, python-format
 msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!"
 msgstr ""
@@ -3053,8 +3048,8 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree2
-msgid "Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received."
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
 msgstr ""
 
 #. module: account
@@ -3141,7 +3136,7 @@ msgid "Unreconcile"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#: code:addons/account/wizard/account_fiscalyear_close.py:79
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
@@ -3152,20 +3147,20 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:2095
 #, python-format
 msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:753
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1204
 #, python-format
 msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
 msgstr ""
@@ -3274,7 +3269,7 @@ msgid "Unit Price"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1054
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3285,13 +3280,13 @@ msgid "#Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1440
 #, python-format
 msgid "You selected an Unit of Measure which is not compatible with the product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:491
 #, python-format
 msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
 msgstr ""
@@ -3335,7 +3330,7 @@ msgid "Effective date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
 #, python-format
 msgid "Standard Encoding"
 msgstr ""
@@ -3478,8 +3473,10 @@ msgid "Analytic Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:0
-#: code:addons/account/report/account_profit_loss.py:0
+#: code:addons/account/report/account_balance_sheet.py:76
+#: code:addons/account/report/account_balance_sheet.py:122
+#: code:addons/account/report/account_profit_loss.py:76
+#: code:addons/account/report/account_profit_loss.py:124
 #, python-format
 msgid "Net Loss"
 msgstr ""
@@ -3533,6 +3530,12 @@ msgstr ""
 msgid "Cancel the Selected Invoices"
 msgstr ""
 
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+msgid "This account will be used to value outgoing stock for the current product category using sale price"
+msgstr ""
+
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "3"
@@ -3560,7 +3563,7 @@ msgid "Acc.Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:732
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
 msgstr ""
@@ -3576,6 +3579,11 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
 #. module: account
 #: field:account.account,note:0
 #: field:account.account.template,note:0
@@ -3609,7 +3617,7 @@ msgid "All manually created new journal entry are usually in the state 'Unposted
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:0
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -3647,7 +3655,7 @@ msgid "All Posted Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
 msgstr ""
@@ -3667,13 +3675,18 @@ msgstr ""
 msgid "Check if you want to display Accounts with 0 balance too."
 msgstr ""
 
+#. module: account
+#: view:account.tax:0
+msgid "Compute Code"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:88
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -3732,7 +3745,7 @@ msgid "Bank statements are entered in the system."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_reconcile.py:0
+#: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
 msgstr ""
@@ -3744,8 +3757,8 @@ msgid "Maturity date"
 msgstr ""
 
 #. module: account
-#: view:account.account.template:0
-msgid "Account Template"
+#: view:report.account.receivable:0
+msgid "Accounts by type"
 msgstr ""
 
 #. module: account
@@ -3755,7 +3768,7 @@ msgid "Closing Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/common_report_header.py:0
+#: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
 msgstr ""
@@ -3776,8 +3789,8 @@ msgid "Credit Notes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "Unable to find a valid period !"
 msgstr ""
@@ -3807,11 +3820,6 @@ msgstr ""
 msgid "Allow Reconciliation"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_subscription_form
-msgid "A recurring entry is a payment related entry that occurs on a recurrent basis from a specific date corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create them in the system in order to automate their entries in the system."
-msgstr ""
-
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
@@ -3850,13 +3858,17 @@ msgid "Change"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_automatic_reconcile.py:0
-#: code:addons/account/wizard/account_fiscalyear_close.py:0
-#: code:addons/account/wizard/account_move_journal.py:0
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#: code:addons/account/account.py:1290
+#: code:addons/account/account.py:1318
+#: code:addons/account/account.py:1325
+#: code:addons/account/account_move_line.py:981
+#: code:addons/account/invoice.py:914
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:78
+#: code:addons/account/wizard/account_fiscalyear_close.py:81
+#: code:addons/account/wizard/account_move_journal.py:162
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:59
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -3925,7 +3937,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:338
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -3941,13 +3953,13 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s' !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1397
 #, python-format
 msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
 msgstr ""
@@ -3974,7 +3986,7 @@ msgid "Account Balance -"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1007
 #, python-format
 msgid "Invoice "
 msgstr ""
@@ -4012,7 +4024,7 @@ msgid "Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:822
 #, python-format
 msgid "Please verify the price of the invoice !\n"
 "The real total does not match the computed total."
@@ -4090,7 +4102,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
-#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/wizard/account_move_journal.py:150
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
 #: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
@@ -4123,16 +4135,8 @@ msgid "Third Party (Country)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_cash_statement.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/report/common_report_header.py:0
-#: code:addons/account/wizard/account_change_currency.py:0
-#: code:addons/account/wizard/account_move_bank_reconcile.py:0
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0
-#: code:addons/account/wizard/account_report_common.py:0
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
 msgstr ""
 
 #. module: account
@@ -4150,7 +4154,7 @@ msgid "Bank Details"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:738
 #, python-format
 msgid "Taxes missing !"
 msgstr ""
@@ -4203,7 +4207,7 @@ msgid "Check Date not in the Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1210
 #, python-format
 msgid "You can not modify a posted entry of this journal !\n"
 "You should set the journal to allow cancelling entries if you want to do that."
@@ -4220,7 +4224,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:940
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4277,6 +4281,11 @@ msgstr ""
 msgid "Payments"
 msgstr ""
 
+#. module: account
+#: view:account.tax:0
+msgid "Reverse Compute Code"
+msgstr ""
+
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
@@ -4288,11 +4297,6 @@ msgstr ""
 msgid "Python Code (reverse)"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
-msgid "Define your company's fiscal year depending on the period you have chosen to follow. A fiscal year is a 1 year period over which a company budgets its spending. It may run over any period of 12 months. The fiscal year is referred to by the date in which it ends. For example, if a company's fiscal year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011  would be referred to as FY 2011. Not using the actual calendar year gives many companies an advantage, allowing them to close their books at a time which is most convenient for them."
-msgstr ""
-
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
@@ -4331,7 +4335,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4347,7 +4351,7 @@ msgid "month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:293
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
 msgstr ""
@@ -4405,13 +4409,12 @@ msgid "UoM"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:138
 #, python-format
 msgid "No Period found on Invoice!"
 msgstr ""
 
 #. module: account
-#: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
 msgstr ""
@@ -4443,7 +4446,7 @@ msgid "Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
 msgstr ""
@@ -4475,8 +4478,8 @@ msgid "You can not create move line on receivable/payable account without partne
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
 #, python-format
 msgid "No period found !"
 msgstr ""
@@ -4545,8 +4548,9 @@ msgid "Number of days to add before computation of the day of month.If Date=15/0
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2896
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
 #, python-format
 msgid "Bank Journal "
 msgstr ""
@@ -4572,7 +4576,7 @@ msgid "Start of period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1119
 #, python-format
 msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
 msgstr ""
@@ -4592,11 +4596,6 @@ msgstr ""
 msgid "Analytic Accounting"
 msgstr ""
 
-#. module: account
-#: help:product.template,property_account_expense:0
-msgid "This account will be used for invoices instead of the default one to value expenses for the current product"
-msgstr ""
-
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
@@ -4630,9 +4629,14 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/account_bank_statement.py:331
+#: code:addons/account/invoice.py:423
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:538
+#: code:addons/account/invoice.py:546
+#: code:addons/account/invoice.py:563
+#: code:addons/account/invoice.py:1365
+#: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
 msgstr ""
@@ -4703,7 +4707,7 @@ msgid "Sort By"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1326
 #, python-format
 msgid "There is no default default credit account defined \n"
 "on journal \"%s\""
@@ -4717,7 +4721,7 @@ msgid "Amount Currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_validate_account_move.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:39
 #, python-format
 msgid "Specified Journal does not have any account move entries in draft state for this period"
 msgstr ""
@@ -4839,7 +4843,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:680
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -4873,7 +4877,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:773
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -4888,16 +4892,11 @@ msgstr ""
 msgid "account.analytic.line.extended"
 msgstr ""
 
-#. module: account
-#: model:account.account.type,name:account.account_type_income
-msgid "Income"
-msgstr ""
-
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:340
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -4912,8 +4911,8 @@ msgid "March"
 msgstr ""
 
 #. module: account
-#: view:report.account.receivable:0
-msgid "Accounts by type"
+#: view:account.account.template:0
+msgid "Account Template"
 msgstr ""
 
 #. module: account
@@ -4936,6 +4935,8 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:306
+#, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
 
@@ -4970,6 +4971,11 @@ msgstr ""
 msgid "From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool."
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid "The tax code definition depends on the tax declaration of your country. OpenERP allows you to define the tax structure and manage it from this menu. You can define both numeric and alphanumeric tax codes."
+msgstr ""
+
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
 msgid "Shows you the progress made today on the reconciliation process. Given by \n"
@@ -4996,7 +5002,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_change_currency.py:60
 #, python-format
 msgid "New currency is not confirured properly !"
 msgstr ""
@@ -5021,13 +5027,14 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1057
+#: code:addons/account/account_move_line.py:1140
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:746
 #, python-format
 msgid "Entries are not of the same account or already reconciled ! "
 msgstr ""
@@ -5055,12 +5062,18 @@ msgid "7"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/invoice.py:0
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:388
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr ""
+
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
@@ -5111,7 +5124,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:0
+#: code:addons/account/wizard/account_report_common.py:126
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5122,7 +5135,7 @@ msgid "Company related to this journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_invoice_state.py:44
 #, python-format
 msgid "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"
 msgstr ""
@@ -5139,11 +5152,6 @@ msgstr ""
 msgid "Analytic Entries Analysis"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_bank_statement_tree
-msgid "A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card, or any other type of account. Start by encoding the starting and closing balance, then record 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 ""
-
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Past"
@@ -5165,6 +5173,11 @@ msgstr ""
 msgid "Overdue Payments Message"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid "This view can be used by accountants in order to quickly record entries in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account. OpenERP will propose to you automatically the Tax related to this account and the counterpart \"Account Payable\"."
+msgstr ""
+
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
@@ -5191,7 +5204,7 @@ msgid "As soon as the reconciliation is done, the invoice's state turns to “do
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1007
 #, python-format
 msgid "is validated."
 msgstr ""
@@ -5256,7 +5269,7 @@ msgid "Companies"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:532
 #, python-format
 msgid "You cannot modify Company of account as its related record exist in Entry Lines"
 msgstr ""
@@ -5355,7 +5368,6 @@ msgstr ""
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
-#: model:account.account.type,name:account.account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
 msgstr ""
@@ -5395,11 +5407,6 @@ msgstr ""
 msgid "CashBox"
 msgstr ""
 
-#. module: account
-#: model:account.account.type,name:account.account_type_cash_equity
-msgid "Equity"
-msgstr ""
-
 #. module: account
 #: selection:account.tax,type:0
 msgid "Percentage"
@@ -5512,13 +5519,15 @@ msgid "Optional create"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:424
+#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:1366
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:59
 #, python-format
 msgid "Enter a Start date !"
 msgstr ""
@@ -5605,6 +5614,7 @@ msgstr ""
 #: field:account.journal,analytic_journal_id:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.model,name:account.model_account_analytic_journal
 msgid "Analytic Journal"
 msgstr ""
 
@@ -5635,7 +5645,7 @@ msgid "Cash Transactions"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_state_open.py:0
+#: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled"
 msgstr ""
@@ -5658,8 +5668,8 @@ msgid "Analytic Entries Statistics"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:0
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:831
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -5670,11 +5680,16 @@ msgid "Create manual recurring entries in a chosen journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1393
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid "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."
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
 msgid "Bank Reconciliation consists of verifying that your bank statement corresponds with the entries (or records) of that account in your accounting system."
@@ -5687,11 +5702,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
+#: code:addons/account/account_move_line.py:929
+#, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:724
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -5724,7 +5741,7 @@ msgid "Python Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#: code:addons/account/wizard/account_report_balance_sheet.py:72
 #, python-format
 msgid "Please define the Reserve and Profit/Loss account for current user company !"
 msgstr ""
@@ -5750,28 +5767,35 @@ msgid "  valuation: percent"
 msgstr ""
 
 #. module: account
-#: field:account.installer,bank_accounts_id:0
-msgid "Your Bank and Cash Accounts"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_analytic_line.py:0
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/account_cash_statement.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_invoice_refund.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:499
+#: code:addons/account/account.py:501
+#: code:addons/account/account.py:822
+#: code:addons/account/account.py:901
+#: code:addons/account/account.py:976
+#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2333
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_bank_statement.py:292
+#: code:addons/account/account_bank_statement.py:305
+#: code:addons/account/account_bank_statement.py:345
+#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_move_line.py:1102
+#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/invoice.py:803
+#: code:addons/account/invoice.py:833
+#: code:addons/account/invoice.py:1026
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
 msgstr ""
 
-#. module: account
-#: report:account.journal.period.print:0
-msgid "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol"
-msgstr ""
-
 #. module: account
 #: view:account.vat.declaration:0
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -5826,7 +5850,7 @@ msgid "This report is an analysis done by a partner. It is a PDF report containi
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_validate_account_move.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
@@ -5865,7 +5889,7 @@ msgid "Journal Select"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_change_currency.py:65
 #, python-format
 msgid "Currnt currency is not confirured properly !"
 msgstr ""
@@ -5926,7 +5950,7 @@ msgid "Select entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:2050
 #, python-format
 msgid "You can specify year, month and date in the name of the model using the following labels:\n"
 "\n"
@@ -5954,8 +5978,8 @@ msgid "Child Codes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/invoice.py:491
+#: code:addons/account/wizard/account_invoice_refund.py:137
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -6000,11 +6024,6 @@ msgstr ""
 msgid "Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_journal_view
-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 ""
-
 #. module: account
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
@@ -6012,8 +6031,8 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_account_period_form
-msgid "Here, you can define a period, an interval of time between successive closings of the books of your company. An accounting period typically is a month or a quarter, corresponding to the tax year used by the business. Create and manage them from here and decide whether a period should be left open or closed depending on your company's activities over a specific period."
+#: help:account.account.type,sign:0
+msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
 msgstr ""
 
 #. module: account
@@ -6036,6 +6055,11 @@ msgstr ""
 msgid "For taxes of type percentage, enter % ratio between 0-1."
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid "A recurring entry is a miscellaneous entry that occurs on a recurrent basis from a specific date, i.e. corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create such entries to automate the postings in the system."
+msgstr ""
+
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
@@ -6043,6 +6067,11 @@ msgstr ""
 msgid "Product UOM"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid "A Cash Register allows you to manage cash entries in your cash journals. This feature provides an easy way to follow up cash payments on a daily basis. You can enter the coins that are in your cash box, and then post entries when money comes in or goes out of the cash box."
+msgstr ""
+
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "9"
@@ -6081,7 +6110,7 @@ msgid "Lines"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:539
 #, python-format
 msgid "Can not find account chart for this company in invoice line account, Please Create account."
 msgstr ""
@@ -6101,6 +6130,12 @@ msgstr ""
 msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_move_line.py:889
+#, python-format
+msgid "Accounting Entries"
+msgstr ""
+
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
@@ -6141,6 +6176,11 @@ msgid "Financial and accounting module that covers:\n"
 "    "
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
+msgid "You can search for individual account entries through useful information. To search for account entries, open a journal, then select a record line."
+msgstr ""
+
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
@@ -6165,11 +6205,6 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
-msgid "Cash Register allows you to manage cash entries in your cash journals."
-msgstr ""
-
 #. module: account
 #: view:account.automatic.reconcile:0
 #: view:account.use.model:0
@@ -6177,7 +6212,7 @@ msgid "Ok"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_partner_balance.py:0
+#: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
 msgstr ""
@@ -6207,11 +6242,6 @@ msgstr ""
 msgid "Ending Date"
 msgstr ""
 
-#. module: account
-#: field:account.invoice.report,uom_name:0
-msgid "Default UoM"
-msgstr ""
-
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
@@ -6234,7 +6264,7 @@ msgid "This field is only used if you develop your own module allowing developer
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:938
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -6297,7 +6327,6 @@ msgid "Use model"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_account_moves_all_a
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
 msgid "This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
@@ -6329,16 +6358,11 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_cash_statement.py:249
 #, python-format
 msgid "You can not have two open register for the same journal"
 msgstr ""
 
-#. module: account
-#: report:account.invoice:0
-msgid "Must be after setLang()"
-msgstr ""
-
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  day of the month= -1"
@@ -6409,14 +6433,14 @@ msgid "This field is used for payable and receivable journal entries. You can pu
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1197
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2777
+#: code:addons/account/installer.py:432
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -6427,7 +6451,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1172
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -6482,6 +6506,8 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:304
+#, python-format
 msgid "Payable Accounts"
 msgstr ""
 
@@ -6507,7 +6533,6 @@ msgid "Sale Taxes"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_cash_moves
 #: selection:account.analytic.journal,type:0
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
@@ -6571,13 +6596,13 @@ msgid "Monthly"
 msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  number of days: 14"
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+msgid "Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence in which they will appear. Then you can create a new journal and link your view to it."
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_asset
-msgid "Asset"
+#: view:account.payment.term.line:0
+msgid "  number of days: 14"
 msgstr ""
 
 #. module: account
@@ -6647,9 +6672,17 @@ msgid "Fixed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
+#: code:addons/account/account.py:506
+#: code:addons/account/account.py:519
+#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
+#: code:addons/account/account.py:640
+#: code:addons/account/account.py:927
+#: code:addons/account/account_move_line.py:675
+#: code:addons/account/account_move_line.py:719
+#: code:addons/account/invoice.py:732
+#: code:addons/account/invoice.py:735
+#: code:addons/account/invoice.py:738
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -6705,13 +6738,13 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:100
 #, python-format
 msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:805
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -6747,12 +6780,7 @@ msgid "Tax Use In"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_account_journal_form
-msgid "Create and manage your company's financial journals from this menu. A journal is a business diary in which all financial data related to the day to day business transactions of your company is recorded using double-entry book keeping system. Depending on the nature of its activities and number of daily transactions, a company may keep several  types of specialized journals such as a cash journal, purchases journal, and sales journal."
-msgstr ""
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:346
 #, python-format
 msgid "The account entries lines are not in valid state."
 msgstr ""
@@ -6763,7 +6791,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:377
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -6783,11 +6811,6 @@ msgstr ""
 msgid "Line"
 msgstr ""
 
-#. module: account
-#: help:product.template,property_account_income:0
-msgid "This account will be used for invoices instead of the default one to value sales for the current product"
-msgstr ""
-
 #. module: account
 #: help:account.journal,group_invoice_lines:0
 msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
@@ -6825,7 +6848,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1302
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -6853,6 +6876,11 @@ msgstr ""
 msgid "Invoice's state is Open"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid "The chart of taxes is used to generate your periodical tax statement. You will see the taxes with codes related to your legal statement according to your country."
+msgstr ""
+
 #. module: account
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
@@ -6882,8 +6910,8 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2841
+#: code:addons/account/installer.py:495
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -6925,7 +6953,9 @@ msgstr ""
 #: view:account.period:0
 #: field:account.subscription,period_nbr:0
 #: field:account.tax.chart,period_id:0
+#: code:addons/account/account_move_line.py:908
 #: field:validate.account.move,period_id:0
+#, python-format
 msgid "Period"
 msgstr ""
 
@@ -6975,6 +7005,11 @@ msgstr ""
 msgid "Tax/Base Amount"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid "With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
 msgid "This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very 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."
@@ -7005,13 +7040,13 @@ msgid "Payment"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
-msgid "You can look up individual account entries by searching for useful information. To search for account entries, open a journal, then select a record line."
+#: help:account.bs.report,reserve_account_id:0
+msgid "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"
 msgstr ""
 
 #. module: account
-#: help:product.category,property_account_income_categ:0
-msgid "This account will be used for invoices to value sales for the current product category"
+#: help:account.move.line,blocked:0
+msgid "You can check this box to mark this journal item as a litigation with the associated partner"
 msgstr ""
 
 #. module: account
@@ -7030,11 +7065,6 @@ msgstr ""
 msgid "Account Common Report"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree3
-msgid "This menu helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form."
-msgstr ""
-
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
@@ -7058,7 +7088,7 @@ msgid "Account Types"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:915
 #, python-format
 msgid "Cannot create invoice move on centralised journal"
 msgstr ""
@@ -7074,7 +7104,7 @@ msgstr ""
 #: view:account.move.line:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.select:0
-#: code:addons/account/wizard/account_move_line_reconcile_select.py:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
 #: model:ir.ui.menu,name:account.periodical_processing_reconciliation
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
@@ -7112,6 +7142,11 @@ msgstr ""
 msgid "Filter By"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid "With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers."
+msgstr ""
+
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
@@ -7137,8 +7172,8 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2794
+#: code:addons/account/installer.py:452
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -7153,11 +7188,6 @@ msgstr ""
 msgid "Subtotal"
 msgstr ""
 
-#. module: account
-#: report:account.invoice:0
-msgid "Partner Ref."
-msgstr ""
-
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
@@ -7178,6 +7208,7 @@ msgid "Due Date"
 msgstr ""
 
 #. module: account
+#: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
 msgstr ""
@@ -7219,8 +7250,8 @@ msgid "Fiscalyear Close"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_account_type_form
-msgid "An account type is a name or code given to an account that indicates its purpose. 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 to be used for your company management."
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
 msgstr ""
 
 #. module: account
@@ -7285,11 +7316,6 @@ msgstr ""
 msgid "Journal Name"
 msgstr ""
 
-#. module: account
-#: help:account.move.line,blocked:0
-msgid "You can check this box to mark this journal item as a litigation with the associated partner"
-msgstr ""
-
 #. module: account
 #: help:account.invoice,internal_number:0
 msgid "Unique number of the invoice, computed automatically when the invoice is created."
@@ -7301,12 +7327,8 @@ msgid "The amount of the voucher must be the same amount as the one on the state
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1057
+#: code:addons/account/account_move_line.py:1140
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -7317,7 +7339,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:982
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -7347,6 +7369,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
 #: field:report.account.sales,currency_id:0
 #: field:report.account_type.sales,currency_id:0
 #: field:report.invoice.created,currency_id:0
@@ -7363,6 +7386,11 @@ msgstr ""
 msgid "Accountant validates the accounting entries coming from the invoice."
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
+msgid "Define your company's financial year according to your needs. A financial year is a period at the end of which a company's accounts are made up (usually 12 months). The financial year is usually referred to by the date in which it ends. For example, if a company's financial year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011  would be referred to as FY 2011. You are not obliged to follow the actual calendar year."
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
@@ -7424,11 +7452,6 @@ msgstr ""
 msgid "Reference Type"
 msgstr ""
 
-#. module: account
-#: help:account.bs.report,reserve_account_id:0
-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
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for period"
@@ -7486,14 +7509,14 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2817
+#: code:addons/account/installer.py:476
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:927
 #, python-format
 msgid "You cannot modify company of this period as its related record exist in Entry Lines"
 msgstr ""
@@ -7540,16 +7563,11 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:805
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_tax_code_list
-msgid "A tax code is a reference of a tax that will be taken out of a gross income depending on the country and sometimes industry sector. OpenERP allows you to define and manage them from this menu."
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Dear Sir/Madam,"
@@ -7561,13 +7579,8 @@ msgid "Configure Your Accounting Application"
 msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_account_form
-msgid "Create and manage accounts you will need to record financial entries in. Accounts are financial records of your company that register all financial transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual 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 ""
-
-#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2820
+#: code:addons/account/installer.py:479
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -7607,7 +7620,7 @@ msgid "Start Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:2333
 #, python-format
 msgid "Cannot locate parent code for template account!"
 msgstr ""
@@ -7633,6 +7646,8 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
+#: code:addons/account/account_move_line.py:932
+#, python-format
 msgid "Total credit"
 msgstr ""
 
@@ -7642,7 +7657,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1026
 #, python-format
 msgid "You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!"
 msgstr ""
@@ -7657,11 +7672,6 @@ msgstr ""
 msgid "Unpaid"
 msgstr ""
 
-#. module: account
-#: model:ir.actions.act_window,help:account.action_tax_code_tree
-msgid "The chart of taxes is used to generate your periodic tax statement. You will see here the taxes with codes related to your legal statement according to your country."
-msgstr ""
-
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
@@ -7673,11 +7683,37 @@ msgid "You can not create move line on view account."
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_change_currency.py:71
 #, python-format
 msgid "Current currency is not confirured properly !"
 msgstr ""
 
+#. module: account
+#: code:addons/account/account.py:938
+#: code:addons/account/account.py:940
+#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1397
+#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:746
+#: code:addons/account/account_move_line.py:748
+#: code:addons/account/account_move_line.py:751
+#: code:addons/account/account_move_line.py:753
+#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr ""
+
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
@@ -7688,11 +7724,6 @@ msgstr ""
 msgid "Particulars"
 msgstr ""
 
-#. module: account
-#: report:account.invoice:0
-msgid "Document"
-msgstr ""
-
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Profit & Loss (Income Accounts)"
@@ -7762,7 +7793,6 @@ msgstr ""
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
-#: model:account.account.type,name:account.account_type_payable
 #: selection:account.entries.report,type:0
 msgid "Payable"
 msgstr ""
@@ -7791,13 +7821,13 @@ msgid "This view is used by accountants in order to record entries massively in
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:391
 #, python-format
 msgid "Cannot delete bank statement(s) which are already confirmed !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:0
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -7812,6 +7842,11 @@ msgstr ""
 msgid "Accounting entries are the first input of the reconciliation."
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid "Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be closed or left open depending on your company's activities over a specific period."
+msgstr ""
+
 #. module: account
 #: report:account.move.voucher:0
 msgid "Receiver's Signature"
@@ -7840,7 +7875,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1054
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -7866,7 +7901,7 @@ msgid "Date of the day"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
 #, python-format
 msgid "You have to define the bank account\n"
 "in the journal definition for reconciliation."
@@ -7889,7 +7924,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#: code:addons/account/wizard/account_fiscalyear_close.py:82
 #, python-format
 msgid "The journal must have centralised counterpart without the Skipping draft state option checked!"
 msgstr ""
@@ -7973,7 +8008,7 @@ msgid "Account Subscription"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:735
 #, python-format
 msgid "Tax base different !\n"
 "Click on compute to update tax base"
@@ -8027,7 +8062,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:822
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -8078,13 +8113,13 @@ msgid "Active"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:372
 #, python-format
 msgid "Unknown Error"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1167
 #, python-format
 msgid "You cannot validate a non-balanced entry !\n"
 "Make sure you have configured Payment Term properly !\n"
@@ -8159,7 +8194,7 @@ msgid "Journal Entry Model"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Maturity date of entry line generated by model line '%s' is based on partner payment term!\n"
 "Please define partner on it!"
@@ -8399,8 +8434,12 @@ msgid "Tax Source"
 msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_balance_sheet.py:0
-#: code:addons/account/report/account_profit_loss.py:0
+#: code:addons/account/report/account_balance_sheet.py:71
+#: code:addons/account/report/account_balance_sheet.py:116
+#: code:addons/account/report/account_balance_sheet.py:119
+#: code:addons/account/report/account_balance_sheet.py:120
+#: code:addons/account/report/account_profit_loss.py:71
+#: code:addons/account/report/account_profit_loss.py:127
 #, python-format
 msgid "Net Profit"
 msgstr ""
@@ -8416,7 +8455,7 @@ msgid "This is a model for recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:0
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -8455,6 +8494,12 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:97
+#, python-format
+msgid "Journal: All"
+msgstr ""
+
 #. module: account
 #: field:account.account,company_id:0
 #: field:account.analytic.journal,company_id:0
@@ -8556,18 +8601,22 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/wizard/account_invoice_state.py:0
-#: code:addons/account/wizard/account_report_balance_sheet.py:0
-#: code:addons/account/wizard/account_state_open.py:0
-#: code:addons/account/wizard/account_validate_account_move.py:0
+#: code:addons/account/account_move_line.py:680
+#: code:addons/account/account_move_line.py:758
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_report_balance_sheet.py:72
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid "Warning"
 msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_analytic_journal
-msgid "account.analytic.journal"
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid "This account will be used to value outgoing stock for the current product category using cost price"
 msgstr ""
 
 #. module: account
@@ -8635,11 +8684,6 @@ msgstr ""
 msgid "Invoice Lines"
 msgstr ""
 
-#. module: account
-#: help:product.category,property_account_expense_categ:0
-msgid "This account will be used for invoices to value expenses for the current product category"
-msgstr ""
-
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
@@ -8651,7 +8695,7 @@ msgid "Recurring"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:748
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -8672,7 +8716,7 @@ msgid "Range"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1172
 #, python-format
 msgid "Can not create an automatic sequence for this piece !\n"
 "\n"
@@ -8735,7 +8779,7 @@ msgid "Applicability"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/wizard/account_move_journal.py:162
 #, python-format
 msgid "This period is already closed !"
 msgstr ""
@@ -8760,6 +8804,11 @@ msgstr ""
 msgid "Parent Account"
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid "Create and manage your company's journals from this menu. A journal is used to record transactions of all accounting data related to the day-to-day business of your company using double-entry bookkeeping system. Depending on the nature of its activities and the number of daily transactions, a company may keep several types of specialized journals such as a cash journal, purchase journal, sales journal..."
+msgstr ""
+
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
@@ -8788,7 +8837,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:364
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -8803,8 +8852,8 @@ msgid "November"
 msgstr ""
 
 #. module: account
-#: sql_constraint:account.account:0
-msgid "The code of the account must be unique per company !"
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
 msgstr ""
 
 #. module: account
@@ -8813,7 +8862,7 @@ msgid "The income or expense account related to the selected product."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1043
 #, python-format
 msgid "The date of your Journal Entry is not in the defined period!"
 msgstr ""
@@ -8922,7 +8971,6 @@ msgstr ""
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
 #: field:account.common.partner.report,result_selection:0
-#: report:account.general.ledger:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
 #: field:account.partner.ledger,result_selection:0
@@ -9021,14 +9069,19 @@ msgid "Amount currency"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
 #, python-format
 msgid "You must enter a period length that cannot be 0 or below !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:501
 #, python-format
 msgid "You cannot remove an account which has account entries!. "
 msgstr ""
 
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid "Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually."
+msgstr ""
+
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 7db46e935b5..68aad9e9f21 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7845,9 +7845,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 7b5b0d9cac9..8ab36111445 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7876,9 +7876,9 @@ msgstr "Вид отпратка"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index 19a05b00c9b..92c8df05ee3 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 35dfd9669ab..dfa9bd472dc 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7900,9 +7900,9 @@ msgstr "Tip reference"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 2201ee988f1..252eda0f7d9 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7935,9 +7935,9 @@ msgstr "Tipus referència"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index 722527a41ff..a73284105cf 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7842,9 +7842,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index fc33be16eba..d4c7c605787 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7862,9 +7862,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 475eba310ce..619d7b3a714 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-25 20:08+0000\n"
+"PO-Revision-Date: 2010-12-31 08:58+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1607,7 +1607,7 @@ msgstr "Kreditlimit"
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr "Statistik Rechnungen"
+msgstr "Rechnung"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
@@ -8408,9 +8408,9 @@ msgstr "Referenztyp"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 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"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 "Dieses Konto wird als vorläufiges Konto für einen Gewinn oder Verlust aus "
 "dem Geschäftsjahr verwendet (Bei vorläufigem Gewinn: Betrag wird "
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index e0c4d54edde..7bd646fc715 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 14:04+0000\n"
+"PO-Revision-Date: 2010-12-28 07:19+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7966,9 +7966,9 @@ msgstr "Τύπος Παραπομπής"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 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"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 6b8f08ebf02..b4f740ab02c 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/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:43+0000\n"
-"PO-Revision-Date: 2010-12-27 10:40+0000\n"
+"PO-Revision-Date: 2010-12-31 08:26+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-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -91,7 +91,7 @@ msgstr "Definición hijos"
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "Efectos a cobrar vencidos hasta hoy"
+msgstr "A cobrar vencidos hasta hoy"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
@@ -105,7 +105,7 @@ msgid ""
 "loss in a single document"
 msgstr ""
 "El informe de pérdidas y ganancias (P&G) le da una visión global de las "
-"pérdidas y ganancias realizadas por su empresa en un único documento"
+"pérdidas y ganancias de su empresa en un único documento"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -141,7 +141,7 @@ msgstr "Asientos contables"
 #: code:addons/account/account.py:0
 #, python-format
 msgid "You can not delete posted movement: \"%s\"!"
-msgstr "¡No puede eliminar el movimiento fijado: \"%s\"!"
+msgstr "¡No puede eliminar el movimiento asentado: \"%s\"!"
 
 #. module: account
 #: field:account.invoice.line,origin:0
@@ -244,7 +244,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "seleccionar conciliar línea movimiento"
+msgstr "Seleccionar conciliación línea movimiento"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -275,7 +275,7 @@ msgstr ""
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "Asientos contables son una entrada para la conciliación."
+msgstr "Los asientos contables son una entrada de la conciliación."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -359,7 +359,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr "Contabilidad. Romper conciliación"
+msgstr "Desconciliar cuenta"
 
 #. module: account
 #: view:product.product:0
@@ -399,19 +399,19 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
-"Los contables utilizan esta vista para introducir asientos masivamente en "
-"OpenERP. OpenERP crea los asientos contables si utiliza extractos bancarios, "
-"registros de caja o pagos de cliente/proveedor."
+"Los contables utilizan esta vista para introducir apuntes masivamente en "
+"OpenERP. Cuando utiliza los extractos bancarios, hojas de caja, o pagos de "
+"cliente/proveedor OpenERP crea automáticamente apuntes contables."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr "account.tax.template"
+msgstr "cuenta.impuesto.plantilla"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr "account.banco.cuentas.asistente"
+msgstr "cuenta.banco.cuentas.asistente"
 
 #. module: account
 #: field:account.move.line,date_created:0
@@ -451,7 +451,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr "Cuenta debe por defecto"
+msgstr "Cuenta deudora por defecto"
 
 #. module: account
 #: view:account.move:0
@@ -609,7 +609,7 @@ msgstr "Transacciones no conciliadas"
 #: code:addons/account/account_cash_statement.py:0
 #, python-format
 msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr "¡El saldo del diario de caja no concuerda con el saldo calculado!"
+msgstr "¡El saldo de caja no coincide con el saldo calculado!"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -621,7 +621,7 @@ msgstr "Mapeo impuestos"
 #. module: account
 #: model:ir.model,name:account.model_account_installer_modules
 msgid "account.installer.modules"
-msgstr "account.instalador.módulos"
+msgstr "cuenta.instalador.módulos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
@@ -661,9 +661,9 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
-"Si rompe una conciliación de transacciones, debe verificar también todas las "
-"acciones relacionadas con esas transacciones debido a que no serán "
-"deshabilitadas."
+"Si rompe la conciliación de las transacciones, también debe verificar todas "
+"las acciones que están relacionadas con estas transacciones, ya que no se "
+"desactivarán."
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -700,7 +700,7 @@ msgstr "Importe código impuesto"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "SAJ"
-msgstr "VENTA"
+msgstr "VEN"
 
 #. module: account
 #: help:account.bank.statement,balance_end_real:0
@@ -2153,7 +2153,7 @@ msgstr "Descripción"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ACOMPRA"
 
 #. module: account
 #: view:account.subscription:0
@@ -2412,7 +2412,7 @@ msgstr "Contabilidad. Líneas de modelo"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "EXJ"
-msgstr "GASTO"
+msgstr "COMPRA"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -2628,7 +2628,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr "Balance de empresa anterior"
+msgstr "Saldos vencidos de empresa"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
@@ -2659,11 +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 "
+"Marque esta opción si no desea que los nuevos apuntes pasen por el estado "
+"'Borrador' y por tanto vayan directamente al estado 'Asentado' sin ninguna "
 "validación manual. \n"
-"Tenga en cuenta que los asientos creados automáticamente por el sistema "
-"siempre se saltan ese estado."
+"Tenga en cuenta que los apuntes creados automáticamente por el sistema "
+"siempre obvian ese estado."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
@@ -3266,7 +3266,7 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
-"Todos los asientos seleccionados serán validados y fijados. Esto significa "
+"Todos los apuntes seleccionadas serán validados y asentados. Esto significa "
 "que ya no podrá modificar sus campos contables."
 
 #. module: account
@@ -3695,7 +3695,7 @@ msgstr "Nombre"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr "Contabilidad. Informe de sumas y saldos anterior"
+msgstr "Informe de balance de comprobación de vencimientos"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4009,11 +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 "
+"Todos los apuntes creadas manualmente están, por lo general, en el estado "
+"'No asentado', pero puede configurar la opción de omitir ese estado en el "
+"diario correspondiente. En ese caso, se comportan como apuntes creados "
 "automáticamente por el sistema en la validación de documentos (facturas, "
-"extractos bancarios, ...) y se crearán en estado 'Fijado'."
+"extractos bancarios, ...) y se crearán en estado 'Asentado'."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:0
@@ -4052,7 +4052,7 @@ msgstr "Descripción impuesto"
 #: selection:account.tax.chart,target_move:0
 #: selection:account.vat.declaration,target_move:0
 msgid "All Posted Entries"
-msgstr "Todos los asientos fijados"
+msgstr "Todos los apuntes asentados"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
@@ -4308,7 +4308,7 @@ msgstr "Considerar asientos conciliados."
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "Fijar asientos contables"
+msgstr "Asentar apuntes"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4659,7 +4659,7 @@ msgid ""
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
-"¡No se puede modificar un asiento introducido este diario!\n"
+"¡No se puede modificar una apunte asentado de este diario!\n"
 "Debe configurar el diario para permitir la cancelación de los asientos si "
 "quiere hacerlo."
 
@@ -4754,6 +4754,15 @@ msgid ""
 "calendar year gives many companies an advantage, allowing them to close "
 "their books at a time which is most convenient for them."
 msgstr ""
+"Defina el ejercicio fiscal de su compañía según la periodicidad que ha "
+"decidido seguir. Un ejercicio fiscal es un periodo de 1 año sobre el cual la "
+"compañía presupuesta sus gastos. Puede incluir cualquier periodo de 12 "
+"meses. El ejercicio fiscal suele denominarse según la fecha en la que acaba. "
+"Así, si el ejercicio fiscal de una compañía finaliza el 30 de noviembre de "
+"2011, entonces todo lo comprendido entre el 1 de diciembre de 2010 y el 30 "
+"de noviembre de 2011 será considerado como el EF 2011. No usar el calendario "
+"natural es una ventaja para muchas compañías, ya que les permite cerrar sus "
+"libros en el momento más conveniente para ellas."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
@@ -5148,7 +5157,7 @@ msgstr "Cantidad de productos"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "No fijado"
+msgstr "No asentado"
 
 #. module: account
 #: view:account.change.currency:0
@@ -5331,7 +5340,7 @@ msgstr "Válido hasta"
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr "A cobrar antiguos"
+msgstr "A cobrar vencidos"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -6389,6 +6398,9 @@ msgid ""
 "o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
 "o.journal_id.currency and o.journal_id.currency.symbol"
 msgstr ""
+"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
+"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
+"o.journal_id.currency and o.journal_id.currency.symbol"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -6668,6 +6680,12 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
+"Saldos vencidos de empresa es un informe más detallado de sus efectos a "
+"cobrar por intervalos. Al abrir el informe, OpenERP pregunta por el nombre "
+"de la compañía, el periodo fiscal, y el tamaño del intervalo a analizar (en "
+"días). Luego OpenERP calcula una tabla del saldo deudor por periodo. Así que "
+"si solicita un intervalo de 30 días, OpenERP genera un análisis de todos los "
+"deudores para el mes pasado, últimos dos meses, etc. "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -6694,6 +6712,12 @@ msgid ""
 "Create and manage them from here and decide whether a period should be left "
 "open or closed depending on your company's activities over a specific period."
 msgstr ""
+"Aquí puede definir un periodo, un intervalo de tiempo entre cierres "
+"consecutivos de los libros de su compañía. Un periodo contable es "
+"típicamente un mes o un trimestre, correspondientemente al régimen "
+"impositivo usado en el negocio. Creelos y gestionelos desde aquí, y decida "
+"si un periodo debe permanecer abierto o cerrado según las actividades de su "
+"compañía en un plazo específico."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
@@ -7054,6 +7078,11 @@ msgid ""
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
+"Esta vista es usada por los contables para registrar apuntes masivamente en "
+"OpenERP. Si quiere registrar una factura de proveedor, comience "
+"introduciendo el apunte de la cuenta de gastos. OpenERP le propondrá "
+"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a pagar\" "
+"de contrapartida."
 
 #. module: account
 #: help:res.company,property_reserve_and_surplus_account:0
@@ -7118,6 +7147,12 @@ msgid ""
 "Situation' to be used at the time of new fiscal year creation or end of year "
 "entries generation."
 msgstr ""
+"Seleccione 'Ventas' para el diario de ventas que será usado cuando se creen "
+"facturas. Seleccione 'Compras' para el diario a usar cuando se aprueben "
+"pedidos de compra. Seleccione 'Efectivo' (Caja) para que se use a la hora de "
+"hacer pagos. Seleccione 'General' para operaciones misceláneas. Seleccione "
+"'Situación apertura/cierre' para usarlo cuando se crea un nuevo ejercicio "
+"fiscal o la generación del asiento de cierre."
 
 #. module: account
 #: report:account.invoice:0
@@ -7273,7 +7308,7 @@ msgstr "Código"
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr "Fijar asientos de un diario"
+msgstr "Asentar apuntes de un diario"
 
 #. module: account
 #: view:product.product:0
@@ -7550,6 +7585,13 @@ msgid ""
 "daily transactions, a company may keep several  types of specialized "
 "journals such as a cash journal, purchases journal, and sales journal."
 msgstr ""
+"Cree y gestione los diarios financieros de su compañía desde este menú. Un "
+"diario es un histórico del negocio en el que se anotan todos los datos, "
+"relacionados con gestiones financieras de la empresa, del día a día, usando "
+"un sistema de doble entrada para el mantenimiento del libro. Dependiendo de "
+"la naturaleza de sus actividades, y del número de transacciones diarias, una "
+"compañía puede tener varios tipos de diarios especializados, como un diario "
+"de caja, diario de compras y diario de ventas."
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
@@ -7806,6 +7848,13 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Este menú imprime una declaración de IVA basada en facturas o pagos. Puede "
+"seleccionar uno o varios periodos del ejercicio fiscal. La información "
+"necesaria para la declaración de impuestos es generada por OpenERP a partir "
+"de las facturas (o pagos, en algunos países). Esta información se actualiza "
+"en tiempo real; lo cual es muy útil porque le permite previsualizar en "
+"cualquier momento los impuestos a pagar al principio y al final del mes o "
+"trimestre."
 
 #. module: account
 #: report:account.invoice:0
@@ -7875,6 +7924,10 @@ msgid ""
 "of it. You can easily generate refunds and reconcile them from the invoice "
 "form."
 msgstr ""
+"Este menú le permite gestionar notas de crédito (reembolsos) emitidas/a "
+"emitir a sus clientes. Una factura rectificativa es un documento que anula "
+"una factura o parte de ella. Puede generar reembolsos fácilmente y "
+"reconciliarlos desde el formulario de factura."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -7907,7 +7960,7 @@ msgstr "No se puede crear asiento factura en el diario centralizado"
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "Categoría Balance / PyG"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8071,6 +8124,10 @@ msgid ""
 "expense account or payable account. From this view, you can create and "
 "manage the account types you need to be used for your company management."
 msgstr ""
+"Un tipo de cuenta es un nombre o código asignado a una cuenta que indica su "
+"propósito. Por ejemplo, el tipo de cuenta podría estar asociado a una cuenta "
+"de activos, de gastos o a pagar. Desde esta vista, puede crear y gestionar "
+"los tipos de cuenta que necesite usar para la gestión de su compañía."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -8254,6 +8311,16 @@ msgid ""
 "* The 'Paid' state is set automatically when invoice is paid.            \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * El estado 'Borrador' se utiliza cuando un usuario está introduciendo una "
+"nueva factura sin confirmar.             \n"
+"* El estado 'Pro-forma' se utiliza cuando la factura es una Pro-forma sin "
+"número de factura.             \n"
+"* El estado 'Abierto' se utiliza cuando el usuario confirma una factura; se "
+"genera automáticamente un número de factura. Permanece en estado abierto "
+"mientras el usuario no paga la factura.             \n"
+"* El estado 'Pagado' se establece automáticamente cuando se paga la factura. "
+"           \n"
+"* El estado 'Cancelado' se utiliza cuando el usuario cancela la factura."
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -8306,9 +8373,9 @@ msgstr "Tipo de referencia"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 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"
+"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 "
@@ -8488,7 +8555,7 @@ msgstr ""
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "SCNJ"
-msgstr ""
+msgstr "AVENTA"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8507,6 +8574,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Establece la vista usada cuando se escriben o consultan apuntes en este "
+"diario. La vista le dice a OpenERP qué campos deben ser visibles, requeridos "
+"o de sólo lectura, y en qué orden. Puede crear su propia vista en cada "
+"diario para introducir apuntes más rápido."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8735,6 +8806,12 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
+"Esta vista es usada por los contables para registrar apuntes masivamente en "
+"OpenERP. Si quiere registrar una factura de cliente, seleccione el diario y "
+"el periodo en la barra de herramientas de búsqueda. Luego, comience "
+"introduciendo el apunte de la cuenta de ingresos. OpenERP le propondrá "
+"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a cobrar\" "
+"de contrapartida."
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
@@ -9006,6 +9083,15 @@ msgid ""
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
+"Un periodo es una plazo de tiempo fiscal durante la cual se deben registrar "
+"en asientos las actividades relacionadas con la contabilidad. Lo normal es "
+"un periodo mensual pero, dependiendo del país y las necesidades de su "
+"compañía, podría usar también periodos trimestrales (por ejemplo en España "
+"las PYMES habitualmente usan periodos trimestrales). Cerrar un periodo "
+"impide registrar nuevos asientos, cualquier nuevo asiento deberá anotarse en "
+"el siguiente periodo abierto. Cierre un periodo cuando no vaya a escribir "
+"nuevos asientos y desee bloquear este periodo por motivos relacionados con "
+"el cálculo de impuestos."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -9056,6 +9142,10 @@ msgid ""
 "Make sure you have configured Payment Term properly !\n"
 "It should contain atleast one Payment Term Line with type \"Balance\" !"
 msgstr ""
+"¡ No se puede confirmar un asiento descuadrado !\n"
+"¡ Asegúrese de haber configurado el plazo de pago correctamente !\n"
+"¡ Debería contener al menos una línea de plazo de pago con de tipo \"Saldo\" "
+"!"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -9270,6 +9360,8 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
+"El proceso de validación de apuntes, también llamado 'asentar', transfiere "
+"los importes del debe y haber de la anotación original a un libro mayor."
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -9741,7 +9833,7 @@ msgstr "Cuenta fin."
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr "A cobrar anteriores"
+msgstr "A cobrar vencido"
 
 #. module: account
 #: field:account.tax,applicable_type:0
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 22b2943171e..4dc0a67d9c6 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7937,9 +7937,9 @@ msgstr "Tipo de referencia"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index b31e3b1b27f..1172cbd60ef 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8249,13 +8249,10 @@ msgstr "Tipo de referencia"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -11819,6 +11816,15 @@ msgstr "You cannot remove an account which has account entries!. "
 #~ "    def create_entries(self, cr, uid, ids, context=None):\n"
 #~ "        account_model_obj = self.pool.get('account.model"
 
+#~ msgid ""
+#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
+#~ "& Loss Report"
+#~ msgstr ""
+#~ "This Account is used for trasfering Profit/Loss(If It is Profit: Amount will "
+#~ "be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
+#~ "& Loss Report"
+
 #~ msgid "Liability View"
 #~ msgstr "Vista de Pasivo"
 
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 3483fd89fa5..4058dc98bf6 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr "Viite tüüp"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index e2fa2d47565..93332441b01 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 6e975ce508e..f7345a59754 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index ef3d8ed27d9..380b83a4326 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7907,9 +7907,9 @@ msgstr "Viitetyyppi"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index bf390c81c5d..03056b8d204 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-26 07:43+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2011-01-01 06:56+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -489,7 +489,7 @@ msgstr "Date de création"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Remboursement d'achat"
+msgstr "Avoir fournisseur"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -1632,7 +1632,7 @@ msgstr "Compte fournisseurs débiteurs"
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Compte de taxe à payer"
+msgstr "Compte de taxe pour avoirs"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7157,7 +7157,7 @@ msgstr "Impossible d'avoir deux registres ouverts pour le même journal"
 #. module: account
 #: report:account.invoice:0
 msgid "Must be after setLang()"
-msgstr ""
+msgstr "Doit être après setlang ()"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -7964,7 +7964,7 @@ msgstr ""
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "P&L / BS Category"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8085,6 +8085,8 @@ msgstr "Fournisseurs"
 msgid ""
 "You cannot create more than one move per period on centralized journal"
 msgstr ""
+"Vous ne pouvez pas créer plus d'une écriture par période sur un journal "
+"centralisé"
 
 #. module: account
 #: view:account.journal:0
@@ -8281,6 +8283,7 @@ msgstr ""
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
 msgstr ""
+"Le comptable valide les écritures comptables provenant de la facture."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -8335,7 +8338,7 @@ msgstr "Journal des écritures d'ouverture"
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Les brouillons de facture sont vérifiés, validés et imprimés."
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8353,9 +8356,9 @@ msgstr "Type de référence"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 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"
+"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
@@ -8493,6 +8496,9 @@ msgid ""
 "depending on the country and sometimes industry sector. OpenERP allows you "
 "to define and manage them from this menu."
 msgstr ""
+"Un code de taxe est une référence à une taxe qui sera prise sur un revenu "
+"brut selon les pays voire un secteur industriel. OpenERP permet de les "
+"définir et les gérer depuis ce menu."
 
 #. module: account
 #: report:account.overdue:0
@@ -8772,6 +8778,12 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
+"Cette vue est utilisée par les comptables afin d'enregistrer massivement les "
+"écritures dans OpenERP. Si vous voulez enregistrer une facture client, "
+"sélectionnez le journal et la période dans la barre de recherche. Alors, "
+"commencez par l'enregistrement de la ligne de saisie du compte des revenus. "
+"OpenERP vous proposera automatiquement la taxe afférente à ce compte et la "
+"contre-partie \"Compte à recevoir\"."
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
@@ -9264,6 +9276,8 @@ msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
 msgstr ""
+"Remboursement facture de base sur ce type. Vous ne pouvez pas modifier ou "
+"annuler si la facture est déjà réconciliés"
 
 #. module: account
 #: help:account.installer.modules,account_analytic_plans:0
@@ -9448,6 +9462,7 @@ msgstr "Ceci est un modèle pour des écritures comptable récurrentes"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
+"Il n'y a pas de compte de revenu défini pour ce produit : \"%s\" (id : %d)."
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9616,7 +9631,7 @@ msgstr "Traitement des écarts de règlement"
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "L'état de la facture est \"Terminé\""
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -9761,7 +9776,7 @@ msgstr "Imprimer les journaux analytiques"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Fin.Account"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -9884,7 +9899,7 @@ msgstr "Rechercher une facture"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Rembourser"
+msgstr "Créer un avoir"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po
new file mode 100644
index 00000000000..eb2a32e49ff
--- /dev/null
+++ b/addons/account/i18n/fr_BE.po
@@ -0,0 +1,9534 @@
+# French (Belgium) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"PO-Revision-Date: 2010-12-29 11:36+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"Language-Team: French (Belgium) <fr_BE@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-31 05:25+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "System payment"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Other Configuration"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0
+#, python-format
+msgid "No journal for ending writing has been defined for the fiscal year"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot remove/deactivate an account which is set as a property to any "
+"Partner."
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Journal Entry Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_voucher:0
+msgid "Voucher Management"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,residual:0
+#: field:report.invoice.created,residual:0
+msgid "Residual"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Please define sequence on invoice journal"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid "Error ! The duration of the Period(s) is/are invalid. "
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Children Definition"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,reconcil:0
+msgid "Include Reconciled Entries"
+msgstr ""
+
+#. module: account
+#: view:account.pl.report:0
+msgid ""
+"The Profit and Loss report gives you an overview of your company profit and "
+"loss in a single document"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Import from invoice or payment"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disabled"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,reconcile:0
+#: view:account.automatic.reconcile:0
+#: field:account.move.line,reconcile_id:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,ref:0
+#: field:account.entries.report,ref:0
+#: field:account.move,ref:0
+#: view:account.move.line:0
+#: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+msgid "Choose Fiscal Year "
+msgstr ""
+
+#. module: account
+#: help:account.payment.term,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the payment "
+"term without removing it."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_src_id:0
+#: field:account.fiscal.position.account.template,account_src_id:0
+msgid "Account Source"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
+msgid "All Analytic Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Negative"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,type:0
+msgid ""
+"Gives the type of the analytic journal. When it needs for a document (eg: an "
+"invoice) to create analytic entries, OpenERP will look for a matching "
+"journal of the same type."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
+msgid "Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create a fiscal year."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile_select
+msgid "Move line reconcile select"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want any VAT related to this Tax Code to appear "
+"on invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries are an input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
+msgid "Belgian Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not add/modify entries in a closed journal."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Calculated Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
+#: 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 ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close Fiscalyear"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,allow_write_off:0
+msgid "Allow write off"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Select the Period for Analysis"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice line account company does not match with invoice company."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+msgstr ""
+
+#. module: account
+#: help:account.installer,charts:0
+msgid ""
+"Installs localized accounting charts to match as closely as possible the "
+"accounting needs of your company based on your country."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:0
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration/Financial Accounting/Accounts/Journals."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile
+msgid "Account Unreconcile"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,sign:0
+msgid ""
+"Allows you to change the sign of the balance amount displayed in the "
+"reports, so that you can see positive figures instead of negative ones in "
+"expenses accounts."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+msgid "Configure"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "June"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_bank
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
+"Cash Registers, or Customer/Supplier payments."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_accounts_wizard
+msgid "account.bank.accounts.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_created:0
+#: field:account.move.reconcile,create_date:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Purchase Refund"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Opening/Closing Situation"
+msgstr ""
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr ""
+
+#. module: account
+#: field:account.open.closed.fiscalyear,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr ""
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid ""
+"This field contains the informatin related to the numbering of the journal "
+"entries of this journal."
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Positive"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+msgid "Open For Unreconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.template,chart_template_id:0
+#: field:account.tax.template,chart_template_id:0
+#: field:wizard.multi.charts.accounts,chart_template_id:0
+msgid "Chart Template"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid ""
+"A journal entry consists of several journal items, each of which is either a "
+"debit or a credit. OpenERP creates automatically one journal entry per "
+"accounting document: invoices, refund, supplier payment, bank statements, "
+"etc."
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,state:0
+msgid ""
+"When journal period is created. The state is 'Draft'. If a report is printed "
+"it comes to 'Printed' state. When all transactions are done, it comes in "
+"'Done' state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_tax_chart
+msgid ""
+"Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or "
+"tax codes) and shows the current tax situation. The tax chart represents the "
+"amount of each area of the tax declaration for your country. It’s presented "
+"in a hierarchical structure, which can be modified to fit your needs."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,journal_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,journal_id:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,journal_id:0
+#: report:account.general.ledger:0
+#: view:account.invoice:0
+#: field:account.invoice,journal_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: report:account.journal.period.print:0
+#: view:account.model:0
+#: field:account.model,journal_id:0
+#: view:account.move:0
+#: field:account.move,journal_id:0
+#: field:account.move.bank.reconcile,journal_id:0
+#: view:account.move.line:0
+#: field:account.move.line,journal_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: field:validate.account.move,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_confirm
+msgid "Confirm the selected invoices"
+msgstr ""
+
+#. module: account
+#: field:account.addtmpl.wizard,cparent_id:0
+msgid "Parent target"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,account_id:0
+msgid "Account used in this journal"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,chart_account_id:0
+#: help:account.balance.report,chart_account_id:0
+#: help:account.bs.report,chart_account_id:0
+#: help:account.central.journal,chart_account_id:0
+#: help:account.common.account.report,chart_account_id:0
+#: help:account.common.journal.report,chart_account_id:0
+#: help:account.common.partner.report,chart_account_id:0
+#: help:account.common.report,chart_account_id:0
+#: help:account.general.journal,chart_account_id:0
+#: help:account.partner.balance,chart_account_id:0
+#: help:account.partner.ledger,chart_account_id:0
+#: help:account.pl.report,chart_account_id:0
+#: help:account.print.journal,chart_account_id:0
+#: help:account.report.general.ledger,chart_account_id:0
+#: help:account.vat.declaration,chart_account_id:0
+msgid "Select Charts of Accounts"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_refund
+msgid "Invoice Refund"
+msgstr "Note de crédit"
+
+#. module: account
+#: report:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:0
+#, python-format
+msgid "CashBox Balance is not matching with Calculated Balance !"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Tax Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "The accountant confirms the statement."
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.bs.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.pl.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "All"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_invoice_id:0
+msgid "Invoice Address Name"
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "3 Monthly"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "   30 Days   "
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "Centralized Journal"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.sequence.fiscalyear:0
+msgid "Main Sequence must be different from current !"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "SAJ"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end_real:0
+msgid "closing balance entered by the cashbox verifier"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+#: view:account.period.close:0
+msgid "Close Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_partner_report
+msgid "Account Common Partner Report"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "To reconcile the entries company should be the same for all entries"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_report_general_ledger
+msgid "General Ledger Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,today_reconciled:0
+msgid "Partners Reconciled Today"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "The statement balance is incorrect !\n"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
+msgid "Percent"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_charts
+msgid "Charts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/project/wizard/project_account_analytic_line.py:0
+#: model:ir.model,name:account.model_project_account_analytic_line
+#, python-format
+msgid "Analytic Entries by line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:0
+#, python-format
+msgid "You can only change currency for Draft Invoice !"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,type:0
+#: view:account.journal:0
+#: field:account.journal,type:0
+#: field:account.move.reconcile,type:0
+#: field:report.invoice.created,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.unreconcile.select:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: model:ir.model,name:account.model_account_move_line_unreconcile_select
+msgid "Unreconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_Journal_report
+msgid "Account Analytic Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_automatic_reconcile
+msgid "Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Due date Computation"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "September"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,nocreate:0
+msgid ""
+"If checked, the new chart of accounts will not contain this by default."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid ""
+"Can not %s invoice which is already reconciled, invoice should be "
+"unreconciled first. You can only Refund this invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Computation"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner to reconcile"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid ""
+"You can not do this modification on a confirmed entry ! Please note that you "
+"can just change some non important fields !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_chart
+#: model:ir.actions.act_window,name:account.action_tax_code_tree
+#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
+msgid "Chart of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Due"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Approve"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Consolidation"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Liability"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.entries.report:0
+#: view:account.invoice.report:0
+#: view:account.move.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_central_journal
+msgid "Centralizing Journal"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Sale Refund"
+msgstr "Notes de crédit (Ventes)"
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"If the Tax account is a tax code account, this field will contain the taxed "
+"amount.If the tax account is base tax code, this field will contain the "
+"basic amount(without tax)."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Purchases"
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: report:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.fiscalyear,code:0
+#: report:account.general.journal:0
+#: field:account.journal,code:0
+#: report:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "No Analytic Journal !"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+#: view:account.partner.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_balance
+#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
+#: model:ir.ui.menu,name:account.menu_account_partner_balance_report
+msgid "Partner Balance"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_name:0
+msgid "Account Name."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_reserve_and_surplus_account:0
+#: field:res.company,property_reserve_and_surplus_account:0
+msgid "Reserve and Profit/Loss Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:account.bs.report,display_type:0
+#: field:account.pl.report,display_type:0
+#: field:account.report.general.ledger,landscape:0
+msgid "Landscape Mode"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Customer Invoices to Approve"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,fy_id:0
+msgid "Select a Fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.account,user_type:0
+#: help:account.account.template,user_type:0
+msgid ""
+"These types are defined according to your country. The type contains more "
+"information about the account and its specificities."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Applicability Options"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "In dispute"
+msgstr ""
+
+#. module: account
+#: 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 ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Expense Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: report:account.move.voucher:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "-"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Manager"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid "Generate Entries before:"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Bank"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_dest_id:0
+#: field:account.fiscal.position.tax.template,tax_dest_id:0
+msgid "Replacement Tax"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+msgid "Cancel Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,trans_nbr:0
+msgid "# of Transaction"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.tax.code.entries:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Entry Label"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You can not modify/delete a journal with entries for this period !"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,origin:0
+#: help:account.invoice.line,origin:0
+msgid "Reference of the document that produced this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.journal:0
+msgid "Others"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.account.balance:0
+#: view:account.analytic.line:0
+#: field:account.automatic.reconcile,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: field:account.invoice.report,account_id:0
+#: field:account.journal,account_control_ids:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,account_id:0
+#: view:account.move.line:0
+#: field:account.move.line,account_id:0
+#: field:account.move.line.reconcile.select,account_id:0
+#: field:account.move.line.unreconcile.select,account_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,account_id:0
+#: model:ir.model,name:account.model_account_account
+#: field:report.account.sales,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Included in base amount"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: model:ir.actions.act_window,name:account.action_account_entries_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
+msgid "Entries Analysis"
+msgstr ""
+
+#. module: account
+#: field:account.account,level:0
+msgid "Level"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.account_template_taxes
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.menu_tax_report
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:0
+#, python-format
+msgid "Select a starting and an ending period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Search tax template"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_reconcile_select
+#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
+msgid "Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Reset to Draft"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.common.report:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_entries_report
+msgid "Journal Items Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
+#: model:ir.ui.menu,name:account.menu_partners
+#: model:ir.ui.menu,name:account.menu_partners_partners
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partners"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_accountingstatemententries0
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account owner"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not use this general account in this journal !"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.bs.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.partner.balance,display_partner:0
+#: selection:account.pl.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Search Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger
+msgid "Account Analytic Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,nbr:0
+msgid "# of Items"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Compute Taxes"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,code_digits:0
+msgid "# of Digits"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Manual Entries"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Entry encoding"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Entries "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_temp_range
+msgid "A Temporary table used for Dashboard view"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree4
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
+msgid "Supplier Refunds"
+msgstr "Notes de crédit (Fournisseurs)"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid ""
+"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Cannot create the invoice !\n"
+"The payment term defined gives a computed amount greater than the total "
+"invoiced amount."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid ""
+"Customer Invoices allows you create and manage invoices issued to your "
+"customers. OpenERP generates draft of invoices automatically so that you "
+"only have to confirm them before sending them to your customers."
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_anglo_saxon:0
+msgid "Anglo-Saxon Accounting"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.bank.statement,state:0
+#: selection:account.entries.report,type:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.period,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurring Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "and Journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+#: field:report.invoice.created,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Go to next partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Search Bank Statements"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid ""
+"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_paid_id:0
+#: field:account.tax.template,account_paid_id:0
+msgid "Refund Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "Date/Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,general_account_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.move.line,invoice:0
+#: model:ir.model,name:account.model_account_invoice
+#: model:res.request.link,name:account.req_link_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_analytic0
+#: model:process.node,note:account.process_node_analyticcost0
+msgid "Analytic costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequence"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Responsible"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
+msgid "Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
+"cancel the current invoice."
+msgstr ""
+"Annuler la facture : crée, valide et rapproche une note de crédit pour "
+"annuler la facture actuelle."
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_invoicing
+msgid "Invoicing"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include initial balances"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.report_account_voucher_new
+msgid "Print Voucher"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "This wizard will change the currency of the invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_chart
+msgid ""
+"Display your company chart of accounts per fiscal year and filter by period. "
+"Have a complete tree view of all journal items per account code by clicking "
+"on an account."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! You cannot define overlapping fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "The account is not defined to be reconciled !"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
+
+#. module: account
+#: help:account.journal.period,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the journal "
+"period without removing it."
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Debit"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
+msgid "Receivables & Payables"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You have to provide an account for the write off entry !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_journal_report
+msgid "Account Common Journal Report"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance,display_partner:0
+msgid "All Partners"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Ref. :"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "My Entries"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:0
+#, python-format
+msgid "User %s does not have rights to access %s journal !"
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Credit Notes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You cannot deactivate an account that contains account moves."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains account entries!"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+msgid "Reserve And Profit/Loss Account"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
+#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
+msgid "Invoices Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period_close
+msgid "period close"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Fiscal Year"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
+msgid "Entries By Line"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "A/c Code"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_id:0
+#: field:account.invoice,move_name:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Tax Declaration: Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,subtotal:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Treasury Analysis"
+msgstr ""
+
+#. module: account
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Please verify that an account is defined in the journal."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: selection:account.move.line,state:0
+msgid "Valid"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_print_journal
+#: model:ir.model,name:account.model_account_print_journal
+msgid "Account Print Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_category
+msgid "Product Category"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "/"
+msgstr ""
+
+#. module: account
+#: field:account.bs.report,reserve_account_id:0
+msgid "Reserve & Profit/Loss Account"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Closing balance based on Starting Balance and Cash Transactions"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Comparison between accounting and payment entries"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,seq_journal:0
+msgid ""
+"Check this box if you want to use a different sequence for each created "
+"journal. Otherwise, all will use the same sequence."
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,amount_currency:0
+#: help:account.report.general.ledger,amount_currency:0
+msgid ""
+"It adds the currency column if the currency is different then the company "
+"currency"
+msgstr ""
+
+#. module: account
+#: help:account.journal,allow_date:0
+msgid ""
+"If set to True then do not accept the entry if the entry date is not into "
+"the period dates"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_pl_report
+msgid "Account Profit And Loss"
+msgstr ""
+
+#. module: account
+#: field:account.installer,config_logo:0
+#: field:account.installer.modules,config_logo:0
+#: field:wizard.multi.charts.accounts,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Canceled"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: account
+#: help:account.tax,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the tax "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+#: view:project.account.analytic.line:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,account_ids:0
+msgid "Accounts to Reconcile"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import of the statement in the system from an electronic file"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import from invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "January"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Validations"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This F.Year"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "Account tax charts"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid ""
+"Invalid period ! Some periods overlap or the date period is not in the scope "
+"of the fiscal year. "
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: code:addons/account/installer.py:0
+#, python-format
+msgid " Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"There is no default default debit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+#: help:account.account.template,type:0
+#: help:account.entries.report,type:0
+msgid ""
+"This type is used to differentiate types with special effects in OpenERP: "
+"view can not have entries, consolidation are accounts that can have children "
+"accounts for multi-company consolidations, payable/receivable are for "
+"partners accounts (for debit/credit computations), closed for depreciated "
+"accounts."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Search Chart of Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid ""
+"The default Chart of Accounts is matching your country selection. If no "
+"certified Chart of Accounts exists for your specified country, a generic one "
+"can be installed and will be selected by default."
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: field:account.account.type,note:0
+#: view:account.analytic.account:0
+#: report:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: field:account.invoice.refund,description:0
+#: report:account.overdue:0
+#: field:account.payment.term,note:0
+#: view:account.tax.code:0
+#: field:account.tax.code,info:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,info:0
+#: field:analytic.entries.report,name:0
+#: field:report.invoice.created,name:0
+msgid "Description"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "ECNJ"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_income_categ:0
+#: field:product.template,property_account_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "There is no Accounting Journal of type Sale/Purchase defined!"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: field:account.change.currency,currency_id:0
+msgid "Change to"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "# of Products Qty "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,fiscalyear_id:0
+#: field:account.fiscalyear,name:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: field:account.journal.period,fiscalyear_id:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.period,fiscalyear_id:0
+#: field:account.sequence.fiscalyear,fiscalyear_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account
+#: help:account.aged.trial.balance,fiscalyear_id:0
+#: help:account.balance.report,fiscalyear_id:0
+#: help:account.bs.report,fiscalyear_id:0
+#: help:account.central.journal,fiscalyear_id:0
+#: help:account.common.account.report,fiscalyear_id:0
+#: help:account.common.journal.report,fiscalyear_id:0
+#: help:account.common.partner.report,fiscalyear_id:0
+#: help:account.common.report,fiscalyear_id:0
+#: help:account.general.journal,fiscalyear_id:0
+#: help:account.partner.balance,fiscalyear_id:0
+#: help:account.partner.ledger,fiscalyear_id:0
+#: help:account.pl.report,fiscalyear_id:0
+#: help:account.print.journal,fiscalyear_id:0
+#: help:account.report.general.ledger,fiscalyear_id:0
+#: help:account.vat.declaration,fiscalyear_id:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,payment_term:0
+#: field:account.invoice.report,payment_term:0
+#: view:account.payment.term:0
+#: field:account.payment.term,name:0
+#: view:account.payment.term.line:0
+#: field:account.payment.term.line,payment_id:0
+#: model:ir.model,name:account.model_account_payment_term
+#: field:res.partner,property_payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
+msgid "Fiscal Positions"
+msgstr ""
+
+#. module: account
+#: field:account.period.close,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: view:account.common.report:0
+msgid "Filters"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: view:account.open.closed.fiscalyear:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftinvoices0
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Draft state of an invoice"
+msgstr ""
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this if the user is allowed to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: view:account.partner.reconcile.process:0
+msgid "Partner Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_code_id:0
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Can't find any account journal of %s type for this company.\n"
+"\n"
+"You can create one in the menu: \n"
+"Configuration\\Financial Accounting\\Accounts\\Journals."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice tax."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid ""
+"A supplier refund is a credit note from your supplier indicating that he "
+"refunds part or totality of the invoice sent to you."
+msgstr ""
+"Une note de crédit reçue de votre fournisseur vous indique qu'il rembourse "
+"en totalité ou en partie une facture qu'il a émise à votre nom."
+
+#. module: account
+#: field:account.tax,base_sign:0
+#: field:account.tax,ref_base_sign:0
+#: field:account.tax.template,base_sign:0
+#: field:account.tax.template,ref_base_sign:0
+msgid "Base Code Sign"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid ""
+"This menu prints a VAT declaration based on invoices or payments. Select one "
+"or several periods of the fiscal year. The information required for a tax "
+"declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"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 ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
+msgid "Confirm Draft Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,day:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,day:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_renew_view
+msgid "Accounts to Renew"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "EXJ"
+msgstr ""
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_due:0
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates, for example 50% now, 50% in one month."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_pp_statements
+msgid "Statements"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid ""
+"The fiscal position will determine taxes and the accounts used for the "
+"partner."
+msgstr ""
+
+#. module: account
+#: view:account.print.journal:0
+msgid ""
+"This report gives you an overview of the situation of a specific journal"
+msgstr ""
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_tax
+#: report:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.bank.statement.line,analytic_account_id:0
+#: field:account.entries.report,analytic_account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.model.line,analytic_account_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:account.move.line.reconcile.writeoff,analytic_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.journal:0
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.account_account_menu
+#: model:ir.ui.menu,name:account.account_template_accounts
+#: model:ir.ui.menu,name:account.menu_action_account_form
+#: model:ir.ui.menu,name:account.menu_analytic
+msgid "Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,price_average:0
+msgid "Average Price"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+#: report:account.overdue:0
+msgid "Date:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot modify company of this journal as its related record exist in "
+"Entry Lines"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+msgid "Label"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
+msgid "Bank reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: report:account.overdue:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Ref"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_code_id:0
+msgid "The Account can either be a base tax code or a tax code account."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_base_code_id:0
+#: field:account.tax.template,ref_base_code_id:0
+msgid "Refund Base Code"
+msgstr "Case pour base de note de crédit"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.common.report:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Dates"
+msgstr ""
+
+#. module: account
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+msgid ""
+"Automatically generate entries based on what has been entered in the  system "
+"before a specific date."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Accounting entries"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+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 ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new journal entries to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation. \n"
+"Note that journal entries that are automatically created by the system are "
+"always skipping that state."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
+#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
+msgid "New Company Financial Setting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+msgid "Sales by Account"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "This wizard will create recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "No sequence defined on the journal !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+#: model:ir.actions.act_window,name:account.action_tax_code_list
+#: model:ir.ui.menu,name:account.menu_action_tax_code_list
+msgid "Tax codes"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_receivables
+msgid "Customers"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period to"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "August"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid ""
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Payment entries are the second input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Number:"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "October"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,quantity:0
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very useful for some reports."
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 2:"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:product.category,property_account_expense_categ:0
+#: field:product.template,property_account_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,account_id:0
+msgid ""
+"used in statement reconciliation domain, but shouldn't be used elswhere."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax:0
+msgid "Default Sale Tax"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+msgid ""
+"The maturity date of the generated entries for this model. You can choose "
+"between the creation date or the creation date of the entries plus the "
+"partner payment terms."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.pl.report:0
+#: model:ir.ui.menu,name:account.menu_account_pl_report
+msgid "Profit And Loss"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,name:0
+#: field:account.fiscal.position.account,position_id:0
+#: field:account.fiscal.position.tax,position_id:0
+#: field:account.fiscal.position.tax.template,position_id:0
+#: view:account.fiscal.position.template:0
+#: field:account.invoice,fiscal_position:0
+#: field:account.invoice.report,fiscal_position:0
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"It adds initial balance row on report which display previous sum amount of "
+"debit/credit/balance"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one."
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_invoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Set if the amount of tax must be included in the base amount before "
+"computing the next taxes."
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "Search Period"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+msgid "Invoice Currency"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,total_entry_encoding:0
+msgid "Cash Transaction"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_template_ids:0
+msgid "Tax Template List"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how the current currency rate for outgoing transactions is "
+"computed. In most countries the legal method is \"average\" but only a few "
+"software systems are able to manage this. So if you import from another "
+"software system you may have to use the rate at date. Incoming transactions "
+"always use the rate at date."
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,code_digits:0
+msgid "No. of Digits to use for account code"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Search Fiscalyear"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Always"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: view:account.subscription:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.account_type_root
+#: selection:account.entries.report,type:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "BNK"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,analytic_lines:0
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Starts on"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_ledger
+msgid "Account Partner Ledger"
+msgstr ""
+
+#. module: account
+#: help:account.journal.column,sequence:0
+msgid "Gives the sequence order to journal column."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: help:account.account.template,currency_id:0
+#: help:account.bank.accounts.wizard,currency_id:0
+msgid "Forces all moves for this account to have this secondary currency."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move_line
+msgid ""
+"This wizard will validate all journal entries of a particular journal and "
+"period. Once journal entries are validated, you can not update them anymore."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_chart_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
+msgid "Chart of Accounts Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+msgid "Generate Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_unreconcile_reconcile
+msgid "Account Unreconcile Reconcile"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,close_method:0
+msgid ""
+"Set here the method that will be used to generate the end of year journal "
+"entries for all the accounts of this type.\n"
+"\n"
+" 'None' means that nothing will be done.\n"
+" 'Balance' will generally be used for cash accounts.\n"
+" 'Detail' will copy each existing journal item of the previous year, even "
+"the reconciled ones.\n"
+" 'Unreconciled' will copy only the journal items that were unreconciled on "
+"the first day of the new fiscal year."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,journal_ids:0
+#: field:account.analytic.cost.ledger.journal.report,journal:0
+#: field:account.balance.report,journal_ids:0
+#: field:account.bs.report,journal_ids:0
+#: field:account.central.journal,journal_ids:0
+#: field:account.common.account.report,journal_ids:0
+#: field:account.common.journal.report,journal_ids:0
+#: field:account.common.partner.report,journal_ids:0
+#: view:account.common.report:0
+#: field:account.common.report,journal_ids:0
+#: report:account.general.journal:0
+#: field:account.general.journal,journal_ids:0
+#: view:account.journal.period:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,journal_ids:0
+#: field:account.partner.ledger,journal_ids:0
+#: field:account.pl.report,journal_ids:0
+#: view:account.print.journal:0
+#: field:account.print.journal,journal_ids:0
+#: field:account.report.general.ledger,journal_ids:0
+#: field:account.vat.declaration,journal_ids:0
+#: model:ir.actions.act_window,name:account.action_account_journal_form
+#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
+#: model:ir.ui.menu,name:account.menu_account_print_journal
+#: model:ir.ui.menu,name:account.menu_action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_journals
+#: model:ir.ui.menu,name:account.menu_journals_report
+msgid "Journals"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,to_reconcile:0
+msgid "Remaining Partners"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+#: field:account.subscription,lines_id:0
+msgid "Subscription Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+#: model:ir.actions.act_window,name:account.action_account_installer
+#: view:wizard.multi.charts.accounts:0
+msgid "Accounting Application Configuration"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "No Partner Defined !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_period_close
+#: model:ir.actions.act_window,name:account.action_account_period_tree
+#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
+msgid "Close a Period"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Journal:"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: report:account.move.voucher:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Accounting Chart Configuration"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,chart_tax_id:0
+msgid "Chart of Tax"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Search Account Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
+msgid "Pending Invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Authorised Signatory"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move.lines:0
+msgid ""
+"All selected journal entries will be validated and posted. It means you "
+"won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Cannot delete invoice(s) that are already opened or paid !"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: n.a"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Your bank and cash accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Search Move"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: model:process.node,name:account.process_node_draftinvoices0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:0
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
+"or 'Done' state!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"account entries!"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+msgid "Counterpart"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,state:0
+msgid "Invoice State"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.move.line:0
+#: field:account.move.line,narration:0
+msgid "Narration"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
+msgid "Create Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_type_sales
+msgid "Report of the Sales by Account Type"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid ""
+"Supplier Invoices allows you to enter and manage invoices issued by your "
+"suppliers. OpenERP generates draft of supplier invoices automatically so "
+"that you can control what you received from your supplier according to what "
+"you purchased or received."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account
+#: field:account.installer,charts:0
+#: model:ir.actions.act_window,name:account.action_account_chart
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.tax.chart:0
+msgid "(If you do not select period it will take all open periods)"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_reconcile_process
+msgid "Reconcilation Process partner by partner"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "2"
+msgstr ""
+
+#. module: account
+#: view:account.chart:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: report:account.analytic.account.journal:0
+#: selection:account.balance.report,filter:0
+#: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
+#: selection:account.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: view:account.entries.report:0
+#: field:account.entries.report,date:0
+#: selection:account.general.journal,filter:0
+#: report:account.general.ledger:0
+#: field:account.invoice.report,date:0
+#: report:account.journal.period.print:0
+#: view:account.move:0
+#: field:account.move,date:0
+#: field:account.move.line.reconcile.writeoff,date_p:0
+#: report:account.overdue:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.pl.report,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.print.journal,sort_selection:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.report.general.ledger,sortby:0
+#: field:account.subscription.generate,date:0
+#: field:account.subscription.line,date:0
+#: report:account.tax.code.entries:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: selection:account.vat.declaration,filter:0
+#: field:analytic.entries.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' of model '%s' is "
+"based on partner payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Some entries are already reconciled !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot validate a Journal Entry unless all journal items are in same "
+"chart of accounts !"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
+msgid "Budgets"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: selection:account.common.report,filter:0
+#: selection:account.general.journal,filter:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.pl.report,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: selection:account.vat.declaration,filter:0
+msgid "No Filters"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+#: help:account.tax.template,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_qty:0
+msgid "Qty"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,address_contact_id:0
+msgid "Contact Address Name"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierpaymentorder0
+msgid "Payment Order"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,reconcile:0
+msgid ""
+"Check this option if you want the user to reconcile entries in this account."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Unable to change tax !"
+msgstr ""
+
+#. module: account
+#: field:analytic.entries.report,nbr:0
+msgid "#Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+"defined !"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_tax:0
+msgid "Multipication factor Tax code"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+msgid "Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.chart.template,name:0
+#: field:account.model.line,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
+#: field:account.subscription,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_aged_trial_balance
+msgid "Account Aged Trial balance Report"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#, python-format
+msgid "Standard Encoding"
+msgstr ""
+
+#. module: account
+#: help:account.journal,analytic_journal_id:0
+msgid "Journal for analytic entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: help:account.central.journal,amount_currency:0
+#: help:account.common.journal.report,amount_currency:0
+#: help:account.general.journal,amount_currency:0
+#: help:account.print.journal,amount_currency:0
+msgid ""
+"Print Report with the currency column if the currency is different then the "
+"company currency"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "General Accounting"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,journal_id:0
+msgid ""
+"The best practice here is to use a journal dedicated to contain the opening "
+"entries of all fiscal years. Note that you should define it with default "
+"debit/credit accounts, of type 'situation' and with a centralized "
+"counterpart."
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+#: view:wizard.multi.charts.accounts:0
+msgid "title"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+msgid "Recurring Lines"
+msgstr ""
+
+#. module: account
+#: field:account.partner.balance,display_partner:0
+msgid "Display Partners"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.confirm:0
+msgid "Confirm Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_from:0
+#: field:account.balance.report,period_from:0
+#: field:account.bs.report,period_from:0
+#: field:account.central.journal,period_from:0
+#: field:account.chart,period_from:0
+#: field:account.common.account.report,period_from:0
+#: field:account.common.journal.report,period_from:0
+#: field:account.common.partner.report,period_from:0
+#: field:account.common.report,period_from:0
+#: field:account.general.journal,period_from:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.pl.report,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.report.general.ledger,period_from:0
+#: field:account.vat.declaration,period_from:0
+msgid "Start period"
+msgstr ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: report:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term
+#: model:account.payment.term,note:account.account_payment_term
+msgid "30 Days End of Month"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
+msgid "Analytic Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_balance_sheet.py:0
+#: code:addons/account/report/account_profit_loss.py:0
+#, python-format
+msgid "Net Loss"
+msgstr ""
+
+#. module: account
+#: help:account.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the account "
+"without removing it."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Search Tax Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
+msgid "Draft Entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: view:account.balance.report:0
+#: model:ir.actions.act_window,name:account.action_account_balance_menu
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.ui.menu,name:account.menu_general_Balance_report
+msgid "Trial Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "3"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Acc.Type"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Global taxes defined, but are not in invoice lines !"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,month:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,month:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,month:0
+#: field:report.account.sales,month:0
+#: field:report.account_type.sales,month:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Overdue Account"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: field:account.tax,base_code_id:0
+msgid "Account Base Code"
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entry are usually in the state 'Unposted', "
+"but you can set the option to skip that state on the related journal. In "
+"that case, they will be behave as journal entries automatically created by "
+"the system on document validation (invoices, bank statements...) and will be "
+"created in 'Posted' state."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:0
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Accounting Properties"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.bs.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.pl.report,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Statement %s is confirmed, journal items are created."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The duration of the Fiscal Year is invalid. "
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.balance,empty_acc:0
+msgid "Check if you want to display Accounts with 0 balance too."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Default taxes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Free Reference"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,state:0
+msgid ""
+"When new move line is created the state will be 'Draft'.\n"
+"* When all the payments are done it will be in 'Valid' state."
+msgstr ""
+
+#. module: account
+#: field:account.journal,view_id:0
+msgid "Display Mode"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Statement from invoice or payment"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  day of the month: 0"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart
+msgid "Account chart"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+#: report:account.analytic.account.balance:0
+#: report:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close,report_name:0
+msgid "Give name of the new entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Bank statements are entered in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_reconcile.py:0
+#, python-format
+msgid "Reconcile Writeoff"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,balance_end_real:0
+msgid "Closing Balance"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/common_report_header.py:0
+#, python-format
+msgid "Not implemented"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_select
+msgid "Account Journal Select"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "Unable to find a valid period !"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Voucher No"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile:0
+msgid "Unreconciliate transactions"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid ""
+"A recurring entry is a payment related entry that occurs on a recurrent "
+"basis from a specific date corresponding to the signature of a contract or "
+"an agreement with a customer or a supplier. With Define Recurring Entries, "
+"you can create them in the system in order to automate their entries in the "
+"system."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Account Statistics"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid ""
+"This will automatically configure your chart of accounts, bank accounts, "
+"taxes and journals according to the selected template"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+#: field:account.tax.template,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
+msgid "Account Analytic Cost Ledger For Journal Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_model_form
+#: model:ir.ui.menu,name:account.menu_action_model_form
+msgid "Recurring Models"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "4"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Change"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_automatic_reconcile.py:0
+#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_credit_account_id:0
+msgid "It acts as a default account for credit amount"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,reconcil:0
+msgid "Consider reconciled entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_validate_account_move_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Post Journal Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:report.invoice.created,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end_cash:0
+msgid "Closing balance based on cashBox"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.actions.act_window,name:account.action_account_subscription_generate
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Generate Entries"
+msgstr ""
+
+#. module: account
+#: help:account.vat.declaration,chart_tax_id:0
+msgid "Select Charts of Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
+#: field:account.fiscal.position.template,account_ids:0
+msgid "Account Mapping"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "You must define an analytic journal of type '%s' !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"Couldn't create move with currency different from the secondary currency of "
+"the account \"%s - %s\". Clear the secondary currency field of the account "
+"definition if you want to accept all currencies."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,date:0
+msgid "Operation date"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_code_id:0
+#: field:account.tax.template,ref_tax_code_id:0
+msgid "Refund Tax Code"
+msgstr "Case pour taxe de note de crédit"
+
+#. module: account
+#: view:validate.account.move:0
+msgid ""
+"All draft account entries in this journal and period will be validated. It "
+"means you won't be able to modify their accounting fields anymore."
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice "
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date1:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were reconciled last time"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,based_on:0
+#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
+#: model:ir.actions.act_window,name:account.action_invoice_tree
+#: model:ir.actions.report.xml,name:account.account_invoices
+#: view:report.invoice.created:0
+#: field:res.partner,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,user_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "No"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Add"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr ""
+
+#. module: account
+#: view:account.period.close:0
+msgid "Are you sure ?"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Draft invoices are validated. "
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: code:addons/account/wizard/account_move_journal.py:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
+#: model:ir.actions.act_window,name:account.action_account_moves_all_a
+#: model:ir.actions.act_window,name:account.action_account_moves_bank
+#: model:ir.actions.act_window,name:account.action_account_moves_purchase
+#: model:ir.actions.act_window,name:account.action_account_moves_sale
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+#: model:ir.model,name:account.model_account_move_line
+#: model:ir.ui.menu,name:account.menu_action_account_moves_all
+#: model:ir.ui.menu,name:account.menu_action_account_moves_bank
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase
+#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
+#, python-format
+msgid "Journal Items"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Assets Accounts)"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "Third Party (Country)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/report/common_report_header.py:0
+#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0
+#: code:addons/account/wizard/account_report_common.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.Journal.report,date2:0
+#: field:account.analytic.balance,date2:0
+#: field:account.analytic.cost.ledger,date2:0
+#: field:account.analytic.cost.ledger.journal.report,date2:0
+#: field:account.analytic.inverted.balance,date2:0
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Taxes missing !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
+msgid ""
+"To print an analytics (or costs) journal for a given period. The report give "
+"code, move name, account number, general amount and analytic amount."
+msgstr ""
+
+#. module: account
+#: help:account.journal,refund_journal:0
+msgid "Fill this if the journal is to be used for refunds of invoices."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group Invoice Lines"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: view:account.invoice.confirm:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_vat_declaration
+#: model:ir.model,name:account.model_account_vat_declaration
+msgid "Account Vat Declaration"
+msgstr ""
+
+#. module: account
+#: view:account.period:0
+msgid "To Close"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date not in the Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You can not modify a posted entry of this journal !\n"
+"You should set the journal to allow cancelling entries if you want to do "
+"that."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Start period should be smaller then End period"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "5"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,target_move:0
+#: field:account.balance.report,target_move:0
+#: field:account.bs.report,target_move:0
+#: report:account.central.journal:0
+#: field:account.central.journal,target_move:0
+#: field:account.chart,target_move:0
+#: field:account.common.account.report,target_move:0
+#: field:account.common.journal.report,target_move:0
+#: field:account.common.partner.report,target_move:0
+#: field:account.common.report,target_move:0
+#: report:account.general.journal:0
+#: field:account.general.journal,target_move:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.move.journal,target_move:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,target_move:0
+#: field:account.partner.ledger,target_move:0
+#: field:account.pl.report,target_move:0
+#: field:account.print.journal,target_move:0
+#: field:account.report.general.ledger,target_move:0
+#: field:account.tax.chart,target_move:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,target_move:0
+msgid "Target Moves"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_compute_inv:0
+#: field:account.tax.template,python_compute_inv:0
+msgid "Python Code (reverse)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
+msgid ""
+"Define your company's fiscal year depending on the period you have chosen to "
+"follow. A fiscal year is a 1 year period over which a company budgets its "
+"spending. It may run over any period of 12 months. The fiscal year is "
+"referred to by the date in which it ends. For example, if a company's fiscal "
+"year ends November 30, 2011, then everything between December 1, 2010 and "
+"November 30, 2011  would be referred to as FY 2011. Not using the actual "
+"calendar year gives many companies an advantage, allowing them to close "
+"their books at a time which is most convenient for them."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_payment_term_form
+#: model:ir.ui.menu,name:account.menu_action_payment_term_form
+msgid "Payment Terms"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+msgid ""
+"This report gives you an overview of the situation of your general journals"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,year:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,year:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,year:0
+#: field:report.account.sales,name:0
+#: field:report.account_type.sales,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,starting_details_ids:0
+msgid "Opening Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Line 1:"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Journal Item \"%s\" is not valid"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,next_partner_id:0
+msgid "Next Partner to Reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid "Reconciliation result"
+msgstr ""
+
+#. module: account
+#: view:account.bs.report:0
+#: model:ir.actions.act_window,name:account.action_account_bs_report
+#: model:ir.ui.menu,name:account.menu_account_bs_report
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.final_accounting_reports
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: account
+#: field:account.move,line_id:0
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
+#: model:ir.actions.act_window,name:account.action_move_line_form
+msgid "Entries"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "This Period"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid "No Period found on Invoice!"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: view:account.journal:0
+#: selection:account.journal,type:0
+#: view:account.model:0
+#: selection:account.tax,type_tax_use:0
+#: view:account.tax.template:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement.line,amount:0
+#: report:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: view:account.move:0
+#: field:account.move,amount:0
+#: view:account.move.line:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+#: model:process.transition,name:account.process_transition_statemententries0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Validation"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"The Journal Entry of the invoice have been totally reconciled with one or "
+"several Journal Entries of payment."
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "No period found !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+msgid "Coefficent for parent"
+msgstr ""
+
+#. module: account
+#: report:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Transaction"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Debit/Credit"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Analytic Entries Stats"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_installer
+msgid "account.installer"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days:0
+msgid ""
+"Number of days to add before computation of the day of month.If Date=15/01, "
+"Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Bank Journal "
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:project.account.analytic.line:0
+msgid "(Keep empty to open the current situation)"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.Journal.report,date1:0
+#: field:account.analytic.balance,date1:0
+#: field:account.analytic.cost.ledger,date1:0
+#: field:account.analytic.cost.ledger.journal.report,date1:0
+#: field:account.analytic.inverted.balance,date1:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid ""
+"You can not do this modification on a reconciled entry ! Please note that "
+"you can just change some non important fields !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_account_report
+msgid "Account Common Account Report"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"expenses for the current product"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Customer Refund"
+msgstr "Note de Crédit Client"
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.tax,ref_tax_sign:0
+#: field:account.tax,tax_sign:0
+#: field:account.tax.template,ref_tax_sign:0
+#: field:account.tax.template,tax_sign:0
+msgid "Tax Code Sign"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_move_journal.py:0
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,to_reconcile:0
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,quantity:0
+msgid "Products Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+msgid "Unposted"
+msgstr ""
+
+#. module: account
+#: view:account.change.currency:0
+#: model:ir.actions.act_window,name:account.action_account_change_currency
+#: model:ir.model,name:account.model_account_change_currency
+msgid "Change Currency"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Accounting entries."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "6"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.actions.act_window,name:account.action_analytic_open
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"According value related accounts will be display on respective reports "
+"(Balance Sheet Profit & Loss Account)"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort By"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,amount_currency:0
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid ""
+"Specified Journal does not have any account move entries in draft state for "
+"this period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_move_line
+msgid "Lines to reconcile"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,unit_amount:0
+#: field:report.account.sales,quantity:0
+#: field:report.account_type.sales,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice Options"
+msgstr ""
+
+#. module: account
+#: help:account.automatic.reconcile,power:0
+msgid ""
+"Number of partial amounts that can be combined to find a balance point can "
+"be chosen as the power of the automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,sequence:0
+msgid ""
+"The sequence field is used to order the payment term lines from the lowest "
+"sequences to the higher ones"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.chart:0
+#: view:account.chart:0
+#: view:account.tax.chart:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid ""
+"If no additional entries should be recorded on a fiscal year, you can close "
+"it from here. It will close all opened periods in this year that will make "
+"impossible any new entry record. Close a fiscal year when you need to "
+"finalize your end of year results definitive "
+msgstr ""
+
+#. module: account
+#: field:account.central.journal,amount_currency:0
+#: field:account.common.journal.report,amount_currency:0
+#: field:account.general.journal,amount_currency:0
+#: field:account.partner.ledger,amount_currency:0
+#: field:account.print.journal,amount_currency:0
+#: field:account.report.general.ledger,amount_currency:0
+msgid "With Currency"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Open CashBox"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Valid Up to"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged Receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
+msgid "Account Automatic Reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Journal Item"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_journal
+msgid "Move journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close
+msgid "Generate Opening Entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Already Reconciled!"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr ""
+
+#. module: account
+#: help:account.installer.modules,account_anglo_saxon:0
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by changing "
+"the accounting logic with stock transactions."
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
+#: model:ir.ui.menu,name:account.account_def_analytic_journal
+msgid "Analytic Journals"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "March"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: help:account.installer.modules,account_payment:0
+msgid ""
+"Streamlines invoice payment and creates hooks to plug automated payment "
+"systems in."
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value:0
+msgid "Valuation"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+msgid "Receivable and Payable Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account.template,position_id:0
+msgid "Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_state_open
+#: model:ir.model,name:account.model_account_state_open
+msgid "Account State Open"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice"
+msgstr "Note de crédit"
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_entries_report_all
+msgid ""
+"From this view, have an analysis of your different financial accounts. The "
+"document shows your debit and credit taking in consideration some criteria "
+"you can choose by using the search tool."
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,progress:0
+msgid ""
+"Shows you the progress made today on the reconciliation process. Given by \n"
+"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value:0
+msgid ""
+"Select here the kind of valuation related to this payment term line. Note "
+"that you should have your last line with the type 'Balance' to ensure that "
+"the whole amount will be threated."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+#: field:account.invoice.report,period_id:0
+#: field:report.account.sales,period_id:0
+#: field:report.account_type.sales,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:0
+#, python-format
+msgid "New currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,filter:0
+#: field:account.balance.report,filter:0
+#: field:account.bs.report,filter:0
+#: field:account.central.journal,filter:0
+#: field:account.common.account.report,filter:0
+#: field:account.common.journal.report,filter:0
+#: field:account.common.partner.report,filter:0
+#: field:account.common.report,filter:0
+#: field:account.general.journal,filter:0
+#: field:account.partner.balance,filter:0
+#: field:account.partner.ledger,filter:0
+#: field:account.pl.report,filter:0
+#: field:account.print.journal,filter:0
+#: field:account.report.general.ledger,filter:0
+#: field:account.vat.declaration,filter:0
+msgid "Filter by"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Entries are not of the same account or already reconciled ! "
+msgstr ""
+
+#. module: account
+#: field:account.tax,account_collected_id:0
+#: field:account.tax.template,account_collected_id:0
+msgid "Invoice Tax Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_general_journal
+#: model:ir.model,name:account.model_account_general_journal
+msgid "Account General Journal"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "None"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "  365 Days  "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
+msgid "Customer Refunds"
+msgstr "Notes de Crédit Client"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,factor_base:0
+msgid "Multipication factor for Base code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_common.py:0
+#, python-format
+msgid "not implemented"
+msgstr ""
+
+#. module: account
+#: help:account.journal,company_id:0
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_state.py:0
+#, python-format
+msgid ""
+"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
+"Forma' state!"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+#: model:ir.actions.act_window,name:account.action_analytic_entries_report
+#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
+msgid "Analytic Entries Analysis"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid ""
+"A bank statement is a summary of all financial transactions occurring over a "
+"given period of time on a deposit account, a credit card, or any other type "
+"of account. Start by encoding the starting and closing balance, then record "
+"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 ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
+msgid "Statements reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Analytic Entry"
+msgstr ""
+
+#. module: account
+#: view:res.company:0
+#: field:res.company,overdue_msg:0
+msgid "Overdue Payments Message"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_created:0
+msgid "Date Created"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+msgstr ""
+
+#. module: account
+#: help:account.journal,code:0
+msgid ""
+"The code will be used to generate the numbers of the journal entries of this "
+"journal."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "is validated."
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Reconciliation Date"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+msgid "Create an Account based on this template"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+#: view:account.tax.code:0
+msgid "Reporting Configuration"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_template_form
+msgid "Account Templates"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+msgid "Tax Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot modify Company of account as its related record exist in Entry "
+"Lines"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear.close.state,fy_id:0
+msgid "Select a fiscal year to close"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,tax_template_ids:0
+msgid "List of all the taxes that have to be installed by the wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Information addendum"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: field:account.balance.report,fiscalyear_id:0
+#: field:account.bs.report,fiscalyear_id:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.chart,fiscalyear:0
+#: field:account.common.account.report,fiscalyear_id:0
+#: field:account.common.journal.report,fiscalyear_id:0
+#: field:account.common.partner.report,fiscalyear_id:0
+#: field:account.common.report,fiscalyear_id:0
+#: field:account.general.journal,fiscalyear_id:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
+#: field:account.pl.report,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
+#: field:account.vat.declaration,fiscalyear_id:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Partial Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: view:account.addtmpl.wizard:0
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.Journal.report:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.chart:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.automatic.reconcile:0
+#: view:account.bank.statement:0
+#: view:account.change.currency:0
+#: view:account.chart:0
+#: view:account.common.report:0
+#: view:account.fiscalyear.close:0
+#: view:account.fiscalyear.close.state:0
+#: view:account.invoice:0
+#: view:account.invoice.refund:0
+#: selection:account.invoice.refund,filter_refund:0
+#: view:account.journal.select:0
+#: view:account.move:0
+#: view:account.move.bank.reconcile:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: view:account.move.line.reconcile.writeoff:0
+#: view:account.move.line.unreconcile.select:0
+#: view:account.open.closed.fiscalyear:0
+#: view:account.partner.reconcile.process:0
+#: view:account.period.close:0
+#: view:account.subscription.generate:0
+#: view:account.tax.chart:0
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+#: view:account.use.model:0
+#: view:account.vat.declaration:0
+#: view:project.account.analytic.line:0
+#: view:validate.account.move:0
+#: view:validate.account.move.lines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,name:0
+msgid "Acc. Type Name"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.account_type_receivable
+#: selection:account.entries.report,type:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Other Info"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_credit_account_id:0
+msgid "Default Credit Account"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Configure Your Accounting Chart"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  number of days: 30"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Current"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,type:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: selection:account.report.general.ledger,sortby:0
+msgid "Journal & Partner"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Type"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: view:project.account.analytic.line:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Balance Sheet (Liability Accounts)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,internal_number:0
+#: field:report.invoice.created,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicates if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
+msgid "Reconciliation: Go to Next Partner"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
+#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
+msgid "Inverted Analytic Balance"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from lower sequences to "
+"higher ones. The order is important if you have a tax that has several tax "
+"children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: view:account.journal:0
+msgid "Liquidity"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
+#: model:ir.ui.menu,name:account.account_analytic_journal_entries
+msgid "Analytic Journal Items"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid ""
+"This wizard will generate the end of year journal entries of selected fiscal "
+"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 ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
+msgid "Bank and Cash"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_analytic_entries_report
+msgid ""
+"From this view, have an analysis of your different analytic entries "
+"following the analytic account you defined matching your business need. Use "
+"the tool search to analyse information about analytic entries generated in "
+"the system."
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,nocreate:0
+msgid "Optional create"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Can not find account chart for this company, Please Create account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#, python-format
+msgid "Enter a Start date !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Refund"
+msgstr "Note de Crédit Fournisseur"
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_dashboard_acc
+msgid "Dashboard"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Accounting Chart from a Chart Template"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.analytic.account:0
+#: view:account.analytic.journal:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: view:account.chart.template:0
+#: view:account.entries.report:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: view:account.journal:0
+#: view:account.model:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+#: view:account.tax.code.template:0
+#: view:analytic.entries.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_pl_report
+msgid "Account Profit And Loss Report"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: constraint:account.payment.term.line:0
+msgid ""
+"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
+"2% "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Reconciled"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: field:account.invoice.tax,base:0
+msgid "Base"
+msgstr ""
+
+#. module: account
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Cash Transactions"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_state_open.py:0
+#, python-format
+msgid "Invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_analytic_entries_report
+msgid "Analytic Entries Statistics"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:0
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Entries: "
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create manual recurring entries in a chosen journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Couldn't create move between different companies"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
+msgid ""
+"Bank Reconciliation consists of verifying that your bank statement "
+"corresponds with the entries (or records) of that account in your accounting "
+"system."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "State is draft"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Entry \"%s\" is not valid !"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,based_on:0
+msgid "Based On"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used instead of the default one as the receivable "
+"account for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.tax,python_applicable:0
+#: field:account.tax,python_compute:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,applicable_type:0
+#: field:account.tax.template,python_applicable:0
+#: field:account.tax.template,python_compute:0
+#: selection:account.tax.template,type:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#, python-format
+msgid ""
+"Please define the Reserve and Profit/Loss account for current user company !"
+msgstr ""
+
+#. module: account
+#: help:account.journal,update_posted:0
+msgid ""
+"Check this box if you want to allow the cancellation the entries related to "
+"this journal or of the invoice related to this journal"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: percent"
+msgstr ""
+
+#. module: account
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_analytic_line.py:0
+#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print:0
+msgid ""
+"o.journal_id.currency and formatLang((sum_debit(o.period_id.id, "
+"o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ "
+"o.journal_id.currency and o.journal_id.currency.symbol"
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+#: model:ir.actions.report.xml,name:account.account_vat_declaration
+#: model:ir.ui.menu,name:account.menu_account_vat_declaration
+msgid "Taxes Report"
+msgstr ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+msgid ""
+"For an invoice to be considered as paid, the invoice entries must be "
+"reconciled with counterparts, usually payments. With the automatic "
+"reconciliation functionality, OpenERP makes its own search for entries to "
+"reconcile in a series of accounts. It finds entries for each partner where "
+"the amounts correspond."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,to_check:0
+msgid "To Review"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.move:0
+#: model:ir.actions.act_window,name:account.action_move_journal_line
+#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Journal Entries"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,page_split:0
+msgid "Display Ledger Report with One partner per page"
+msgstr ""
+
+#. module: account
+#: view:account.partner.balance:0
+#: view:account.partner.ledger:0
+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 ""
+
+#. module: account
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid ""
+"Selected Entry Lines does not have any account move enties in draft state"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,target_move:0
+#: selection:account.balance.report,target_move:0
+#: selection:account.bs.report,target_move:0
+#: selection:account.central.journal,target_move:0
+#: selection:account.chart,target_move:0
+#: selection:account.common.account.report,target_move:0
+#: selection:account.common.journal.report,target_move:0
+#: selection:account.common.partner.report,target_move:0
+#: selection:account.common.report,target_move:0
+#: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
+#: selection:account.partner.balance,target_move:0
+#: selection:account.partner.ledger,target_move:0
+#: selection:account.pl.report,target_move:0
+#: selection:account.print.journal,target_move:0
+#: selection:account.report.general.ledger,target_move:0
+#: selection:account.tax.chart,target_move:0
+#: selection:account.vat.declaration,target_move:0
+#: model:ir.actions.report.xml,name:account.account_move_line_list
+msgid "All Entries"
+msgstr ""
+
+#. module: account
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Journal Select"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:0
+#, python-format
+msgid "Currnt currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Taxes Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: view:account.report.general.ledger:0
+#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
+#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+msgid "The payment order is sent to the bank."
+msgstr ""
+
+#. module: account
+#: view:account.balance.report:0
+#: view:account.bs.report:0
+msgid ""
+"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"
+msgstr ""
+
+#. module: account
+#: help:account.move,to_check:0
+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 ""
+
+#. module: account
+#: help:account.installer.modules,account_voucher:0
+msgid ""
+"Account Voucher module includes all the basic requirements of Voucher "
+"Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_chart
+msgid "Account tax chart"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Select entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You can specify year, month and date in the name of the model using the "
+"following labels:\n"
+"\n"
+"%(year)s: To Specify Year \n"
+"%(month)s: To Specify Month \n"
+"%(date)s: Current Date\n"
+"\n"
+"e.g. My model on %(date)s"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: help:report.invoice.created,origin:0
+msgid "Reference of the document that generated this invoice report."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid "Data Insufficient !"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree1
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Sales"
+msgstr ""
+
+#. module: account
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "A statement with manual entries becomes a draft statement."
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+msgid ""
+"Aged Partner Balance is a more detailed report of your receivables by "
+"intervals. When opening that report, OpenERP asks for the name of the "
+"company, the fiscal period and the size of the interval to be analyzed (in "
+"days). OpenERP then calculates a table of credit balance by period. So if "
+"you request an interval of 30 days OpenERP generates an analysis of "
+"creditors for the past month, past two months, and so on. "
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+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 ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:report.invoice.created,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid ""
+"Here, you can define a period, an interval of time between successive "
+"closings of the books of your company. An accounting period typically is a "
+"month or a quarter, corresponding to the tax year used by the business. "
+"Create and manage them from here and decide whether a period should be left "
+"open or closed depending on your company's activities over a specific period."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_menu_Bank_process
+msgid "Statements Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: help:account.tax,amount:0
+msgid "For taxes of type percentage, enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,product_uom_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_uom_id:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "9"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,date:0
+msgid ""
+"This date will be used as the invoice date for Refund Invoice and Period "
+"will be chosen accordingly!"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_length:0
+msgid "Period length (days)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"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."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Can not find account chart for this company in invoice line account, Please "
+"Create account."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: view:account.journal.select:0
+msgid "Are you sure you want to open Journal Entries?"
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: help:account.journal,default_debit_account_id:0
+msgid "It acts as a default account for debit amount"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Financial and accounting module that covers:\n"
+"    General accountings\n"
+"    Cost / Analytic accounting\n"
+"    Third party accounting\n"
+"    Taxes management\n"
+"    Budgets\n"
+"    Customer and Supplier Invoices\n"
+"    Bank statements\n"
+"    Reconciliation process by partner\n"
+"    Creates a dashboard for accountants that includes:\n"
+"    * List of uninvoiced quotations\n"
+"    * Graph of aged receivables\n"
+"    * Graph of aged incomes\n"
+"\n"
+"The processes like maintaining of general ledger is done through the defined "
+"financial Journals (entry move line or\n"
+"grouping is maintained through journal) for a particular financial year and "
+"for preparation of vouchers there is a\n"
+"module named account_voucher.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice,date_invoice:0
+#: view:account.invoice.report:0
+#: field:report.invoice.created,date_invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_ir_sequence
+msgid "ir.sequence"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid ""
+"Cash Register allows you to manage cash entries in your cash journals."
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.use.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_partner_balance.py:0
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box to determine that each entry of this journal won't create a "
+"new counterpart but will share the same counterpart. This is used in fiscal "
+"year closing."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,closing_date:0
+msgid "Closed On"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,date2:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Default UoM"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,purchase_tax:0
+msgid "Default Purchase Tax"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"Bank Account Number, Company bank account if Invoice is customer or supplier "
+"refund, otherwise Partner bank account number."
+msgstr ""
+
+#. module: account
+#: help:account.tax,domain:0
+#: help:account.tax.template,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You should have chosen periods that belongs to the same company"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: view:account.use.model:0
+msgid "Create Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,ending_details_ids:0
+msgid "Closing Cashbox"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paidinvoice0
+#: model:process.node,name:account.process_node_supplierpaidinvoice0
+msgid "Paid invoice"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,next_partner_id:0
+msgid ""
+"This field shows you the next partner that will be automatically chosen by "
+"the system to go through the reconciliation process, based on the latest day "
+"it have been reconciled."
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_use_model
+msgid "Use model"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+#: model:ir.actions.act_window,help:account.action_account_moves_purchase
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a supplier invoice, start by recording the "
+"line of the expense account, OpenERP will propose to you automatically the "
+"Tax related to this account and the counter-part \"Account Payable\"."
+msgstr ""
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+msgid ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be deducted.), Which is calculated from "
+"Profit & Loss Report"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
+#: model:ir.model,name:account.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.bs.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.pl.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display accounts"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:0
+#, python-format
+msgid "You can not have two open register for the same journal"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Must be after setLang()"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  day of the month= -1"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for Sale journal to be used at the time of making invoice. "
+"Select 'Purchase' for Purchase Journal to be used at the time of approving "
+"purchase order. Select 'Cash' to be used at the time of making payment. "
+"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
+"Situation' to be used at the time of new fiscal year creation or end of year "
+"entries generation."
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: report:account.move.voucher:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account
+#: help:account.installer.modules,account_followup:0
+msgid ""
+"Helps you generate reminder letters for unpaid invoices, including multiple "
+"levels of reminding and customized per-partner policies."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,move_line_state:0
+#: view:account.move.line:0
+#: selection:account.move.line,state:0
+msgid "Unbalanced"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Optional Information"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+msgid ":"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable journal entries. You can put "
+"the limit date for the payment of this line."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Bad account !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Sales Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "No piece number !"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_manual_reconcile
+msgid "Manual Reconciliation"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,to_date:0
+#: field:project.account.analytic.line,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,fy_id:0
+#: field:account.fiscalyear.close.state,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.cancel:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
+msgid "Cancel Selected Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "May"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: view:validate.account.move:0
+msgid "Post Journal Entries of a Journal"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_moves
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.accounts.wizard,account_type:0
+#: selection:account.entries.report,type:0
+#: selection:account.journal,type:0
+msgid "Cash"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.account,account_dest_id:0
+#: field:account.fiscal.position.account.template,account_dest_id:0
+msgid "Account Destination"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,sequence:0
+#: field:account.invoice.tax,sequence:0
+#: view:account.journal:0
+#: field:account.journal.column,sequence:0
+#: field:account.model.line,sequence:0
+#: field:account.payment.term.line,sequence:0
+#: field:account.sequence.fiscalyear,sequence_id:0
+#: field:account.tax,sequence:0
+#: field:account.tax.template,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bs_report
+msgid "Account Balance Sheet Report"
+msgstr ""
+
+#. module: account
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+
+#. module: account
+#: view:account.state.open:0
+msgid "Yes"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "Sales by Account type"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated Journal Items."
+msgstr ""
+
+#. module: account
+#: selection:account.installer,period:0
+msgid "Monthly"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  number of days: 14"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "    7 Days    "
+msgstr ""
+
+#. module: account
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_id:0
+#: view:account.analytic.account:0
+msgid "Parent"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_analytic_plans:0
+msgid "Multiple Analytic Plans"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,days2:0
+msgid ""
+"Day of the month, set -1 for the last day of the current month. If it's "
+"positive, it gives the day of the next month. Set 0 for net days (otherwise "
+"it's based on the beginning of the month)."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Reports"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the tax lines from the lowest sequences "
+"to the higher ones. The order is important if you have a tax with several "
+"tax children. In this case, the evaluation order is important."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_cashbox_line
+msgid "CashBox Line"
+msgstr ""
+
+#. module: account
+#: view:account.partner.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
+#: model:ir.ui.menu,name:account.menu_account_partner_ledger
+msgid "Partner Ledger"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance.landscape:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,move_line_state:0
+msgid "State of Move Line"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_line_reconcile
+#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
+msgid "Account move line reconcile"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.generate:0
+#: model:ir.model,name:account.model_account_subscription_generate
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Amount (in words) :"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,partner_id:0
+#: report:account.general.ledger:0
+#: view:account.invoice:0
+#: field:account.invoice,partner_id:0
+#: field:account.invoice.line,partner_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,partner_id:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,partner_id:0
+#: view:account.move:0
+#: field:account.move,partner_id:0
+#: view:account.move.line:0
+#: field:account.move.line,partner_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,partner_id:0
+#: model:ir.model,name:account.model_res_partner
+#: field:report.invoice.created,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.change.currency,currency_id:0
+msgid "Select a currency to apply on the invoice"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:0
+#, python-format
+msgid "Can not %s draft/proforma/cancel invoice."
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "No Invoice Lines !"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,state:0
+#: field:account.entries.report,move_state:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,state:0
+#: view:account.invoice:0
+#: field:account.invoice,state:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: view:account.move.line:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: view:account.subscription:0
+#: field:account.subscription,state:0
+#: field:report.invoice.created,state:0
+msgid "State"
+msgstr ""
+
+#. module: account
+#: help:account.open.closed.fiscalyear,fyear_id:0
+msgid ""
+"Select Fiscal Year which you want to remove entries for its End of year "
+"entries journal"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid ""
+"Create and manage your company's financial journals from this menu. A "
+"journal is a business diary in which all financial data related to the day "
+"to day business transactions of your company is recorded using double-entry "
+"book keeping system. Depending on the nature of its activities and number of "
+"daily transactions, a company may keep several  types of specialized "
+"journals such as a cash journal, purchases journal, and sales journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "The account entries lines are not in valid state."
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice '%s' is paid."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Automatic entry"
+msgstr ""
+
+#. module: account
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Line"
+msgstr ""
+
+#. module: account
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used for invoices instead of the default one to value "
+"sales for the current product"
+msgstr ""
+
+#. module: account
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is checked, the system will try to group the accounting lines "
+"when generating them from invoices."
+msgstr ""
+
+#. module: account
+#: help:account.period,state:0
+msgid ""
+"When monthly periods are created. The state is 'Draft'. At the end of "
+"monthly period it is in 'Done' state."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: view:account.move.bank.reconcile:0
+msgid "Open for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "You must first select a partner !"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: view:account.installer:0
+msgid "Bank and Cash Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: field:account.invoice.report,residual:0
+msgid "Total Residual"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_invoiceinvoice0
+#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
+msgid "Invoice's state is Open"
+msgstr ""
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Add extra Accounting functionalities to the ones already installed."
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+msgid "J.C. /Move name"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_open_closed_fiscalyear
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Purchase Refund Journal"
+msgstr "Journal Remboursements Achats"
+
+#. module: account
+#: help:account.tax.template,amount:0
+msgid "For Tax Type percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,power:0
+msgid "8"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid ""
+"Modify Invoice: Cancels the current invoice and creates a new copy of it "
+"ready for editing."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and Financial Management"
+msgstr ""
+
+#. module: account
+#: field:account.automatic.reconcile,period_id:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement,period_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,period_id:0
+#: view:account.fiscalyear:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: field:account.journal.period,period_id:0
+#: view:account.move:0
+#: field:account.move,period_id:0
+#: view:account.move.line:0
+#: field:account.move.line,period_id:0
+#: view:account.period:0
+#: field:account.subscription,period_nbr:0
+#: field:account.tax.chart,period_id:0
+#: field:validate.account.move,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
+msgid "Generic Reporting"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile.writeoff,journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for the current "
+"partner"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
+msgid "Fiscal Position Templates"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Int.Type"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_vat_declaration
+msgid ""
+"This menu print a VAT declaration based on invoices or payments. You can "
+"select one or several periods of the fiscal year. Information required for a "
+"tax declaration is automatically generated by OpenERP from invoices (or "
+"payments, in some countries). This data is updated in real time. That’s very "
+"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 ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Chart of Account"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+msgid "Payment"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
+msgid ""
+"You can look up individual account entries by searching for useful "
+"information. To search for account entries, open a journal, then select a "
+"record line."
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+msgid ""
+"This account will be used for invoices to value sales for the current "
+"product category"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: view:account.move.line.reconcile:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_inverted_balance
+msgid "Account Analytic Inverted Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_common_report
+msgid "Account Common Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid ""
+"This menu helps you manage the credit notes issued/to be issued for your "
+"customers. A refund invoice is a document that cancels an invoice or a part "
+"of it. You can easily generate refunds and reconcile them from the invoice "
+"form."
+msgstr ""
+"Ce menu permet de gérer les notes de crédit clients. Une note de crédit est "
+"un document qui annule une facture ou une partie de facture. Les actions "
+"contextuelles sur une facture permettent facilement de générer une note de "
+"crédit et de la réconcilier avec la facture."
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "Automatic import of the bank sta"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_journal_view
+#: model:ir.ui.menu,name:account.menu_action_account_journal_view
+msgid "Journal Views"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_bank_reconcile
+msgid "Move bank reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_type_form
+#: model:ir.ui.menu,name:account.menu_action_account_type_form
+msgid "Account Types"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Cannot create invoice move on centralised journal"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.move.line.reconcile:0
+#: view:account.move.line.reconcile.select:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:0
+#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "CashBox Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close_state
+msgid "Fiscalyear Close state"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,journal_id:0
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr "Journal des Remboursements"
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.partner.balance:0
+msgid "Filter By"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_company_analysis_tree
+msgid "Company Analysis"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,parent_id:0
+#: view:account.tax.code.template:0
+#: field:account.tax.code.template,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Purchase Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Refund Invoice: Creates the refund invoice, ready for editing."
+msgstr ""
+"Note de crédit: crée la note de crédit brouillon, prête à être modifiée"
+
+#. module: account
+#: field:account.invoice.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Partner Ref."
+msgstr ""
+
+#. module: account
+#: view:account.vat.declaration:0
+msgid "Print Tax Statement"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Journal Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: field:account.invoice,date_due:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,date_due:0
+#: field:report.invoice.created,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_payables
+msgid "Suppliers"
+msgstr ""
+
+#. module: account
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  valuation: balance"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Statistics"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.chart,from_date:0
+#: field:project.account.analytic.line,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscalyear_close
+msgid "Fiscalyear Close"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid ""
+"An account type is a name or code given to an account that indicates its "
+"purpose. 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 to be used for your company management."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.move.line.reconcile,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_treasory_graph
+msgid "Treasury"
+msgstr ""
+
+#. module: account
+#: view:account.aged.trial.balance:0
+#: view:account.analytic.Journal.report:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.cost.ledger.journal.report:0
+#: view:account.analytic.inverted.balance:0
+#: view:account.common.report:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic Costs"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+#: report:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark this journal item as a litigation with the "
+"associated partner"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,internal_number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_expense
+msgid "Expense"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Bad account!"
+msgstr ""
+
+#. module: account
+#: help:account.chart,fiscalyear:0
+msgid "Keep empty for all open fiscal years"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "The account move (%s) for centralisation has been confirmed!"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: report:account.analytic.account.journal:0
+#: field:account.bank.statement,currency:0
+#: report:account.central.journal:0
+#: view:account.entries.report:0
+#: field:account.entries.report,currency_id:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.invoice.report,currency_id:0
+#: field:account.journal,currency:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,currency_id:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: field:account.move.line,currency_id:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:analytic.entries.report,currency_id:0
+#: field:report.account.sales,currency_id:0
+#: field:report.account_type.sales,currency_id:0
+#: field:report.invoice.created,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.line,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of bank statement lines."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Accountant validates the accounting entries coming from the invoice."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
+msgid "Reconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"Invoice.             \n"
+"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have "
+"an invoice number.             \n"
+"* The 'Open' state is used when user create invoice,a invoice number is "
+"generated.Its in open state till user does not pay invoice.             \n"
+"* The 'Paid' state is set automatically when invoice is paid.            \n"
+"* The 'Cancelled' state is used when user cancel invoice."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.refund,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_partner_balance
+msgid "Print Account Partner Balance"
+msgstr ""
+
+#. module: account
+#: field:res.partner,contract_ids:0
+msgid "Contracts"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,ending_id:0
+#: field:account.cashbox.line,starting_id:0
+#: field:account.entries.report,reconcile_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear.close,journal_id:0
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+msgid "Draft invoices are checked, validated and printed."
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,property_reserve_and_surplus_account:0
+msgid ""
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss: Amount will be deducted.), Which is calculated from "
+"Profilt & Loss Report"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr ""
+
+#. module: account
+#: help:account.bs.report,reserve_account_id:0
+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
+#: view:account.analytic.cost.ledger.journal.report:0
+msgid "Cost Ledger for period"
+msgstr ""
+
+#. module: account
+#: help:account.tax,child_depend:0
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Set if the tax computation is based on the computation of child taxes rather "
+"than on the total amount."
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+msgid "Given by Python Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,code:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: help:account.tax.code,sign:0
+msgid ""
+"You can specify here the coefficient that will be used when consolidating "
+"the amount of this case into its parent. For example, set 1/-1 if you want "
+"to add/substract it."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Residual Amount"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.invoice,move_lines:0
+#: field:account.move.reconcile,line_id:0
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_open_journal_button
+#: model:ir.actions.act_window,name:account.action_validate_account_move
+msgid "Open Journal"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+msgid "KI"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.journal:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Period from"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "Sales Refund Journal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot modify company of this period as its related record exist in "
+"Entry Lines"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.payment.term:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+msgid "Registered payment"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear.close.state:0
+msgid "Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Product Information"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: model:ir.ui.menu,name:account.next_id_40
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.installer,purchase_tax:0
+msgid "Purchase Tax(%)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Please create some invoice lines."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid ""
+"A tax code is a reference of a tax that will be taken out of a gross income "
+"depending on the country and sometimes industry sector. OpenERP allows you "
+"to define and manage them from this menu."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid ""
+"Create and manage accounts you will need to record financial entries in. "
+"Accounts are financial records of your company that register all financial "
+"transactions. Companies present their annual accounts in two main parts: the "
+"balance sheet and the income statement (profit and loss account). The annual "
+"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 ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#: code:addons/account/installer.py:0
+#, python-format
+msgid "SCNJ"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft invoices."
+msgstr ""
+
+#. module: account
+#: help:account.journal,view_id:0
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tells OpenERP which fields should be visible, required or readonly and "
+"in which order. You can create your own view for a faster encoding in each "
+"journal."
+msgstr ""
+
+#. module: account
+#: field:account.period,date_stop:0
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_followup:0
+msgid "Followups Management"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+msgid "Start Period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "Cannot locate parent code for template account!"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+#: field:account.journal.column,view_id:0
+#: view:account.journal.view:0
+#: field:account.journal.view,name:0
+#: model:ir.model,name:account.model_account_journal_view
+msgid "Journal View"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+msgid "Accountant validates the accounting entries coming from the invoice. "
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"You cannot cancel the Invoice which is Partially Paid! You need to "
+"unreconcile concerned payment entries!"
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Best regards."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Unpaid"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid ""
+"The chart of taxes is used to generate your periodic tax statement. You will "
+"see here the taxes with codes related to your legal statement according to "
+"your country."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:0
+#, python-format
+msgid "Current currency is not confirured properly !"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Receivale Accounts"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Particulars"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Document"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,report_type:0
+msgid "Profit & Loss (Income Accounts)"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: field:account.account,balance:0
+#: report:account.account.balance:0
+#: report:account.account.balance.landscape:0
+#: selection:account.account.type,close_method:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,balance_end:0
+#: field:account.bank.statement,balance_end_cash:0
+#: report:account.central.journal:0
+#: field:account.entries.report,balance:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: report:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:report.account.receivable,balance:0
+#: field:report.aged.receivable,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Manually or automatically entered in the system"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+msgid "Display Account"
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid "("
+msgstr ""
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify"
+msgstr ""
+
+#. module: account
+#: view:account.account.type:0
+msgid "Closing Method"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_partner_balance
+msgid ""
+"This report is analysis by partner. It is a PDF report containing one line "
+"per partner representing the cumulative credit balance."
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.account_type_payable
+#: selection:account.entries.report,type:0
+msgid "Payable"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "This Year"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_sale
+msgid ""
+"This view is used by accountants in order to record entries massively in "
+"OpenERP. If you want to record a customer invoice, select the journal and "
+"the period in the search toolbar. Then, start by recording the entry line of "
+"the income account. OpenERP will propose to you automatically the Tax "
+"related to this account and the counter-part \"Account receivable\"."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:0
+#, python-format
+msgid "Cannot delete bank statement(s) which are already confirmed !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_automatic_reconcile.py:0
+#, python-format
+msgid "You must select accounts to reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+msgid "Accounting entries are the first input of the reconciliation."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Receiver's Signature"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Filters By"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manual entry"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.move.line,move_id:0
+#: field:analytic.entries.report,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not change the tax, you should remove and recreate lines !"
+msgstr ""
+
+#. module: account
+#: report:account.central.journal:0
+msgid "A/C No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: help:account.addtmpl.wizard,cparent_id:0
+msgid ""
+"Creates an account with the selected template under this existing parent."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile:0
+msgid "Reconciliation transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_common_menu
+msgid "Common Report"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#, python-format
+msgid ""
+"The journal must have centralised counterpart without the Skipping draft "
+"state option checked!"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment entries"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "July"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Chart of accounts"
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,subscription_id:0
+msgid "Subscription"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_balance
+msgid "Account Analytic Balance"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+msgid "End Period"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.bs.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.pl.report,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+msgid "Chart of account"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date_maturity:0
+msgid "Due date"
+msgstr ""
+
+#. module: account
+#: view:account.move.journal:0
+msgid "Standard entries"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_from:0
+#: field:account.balance.report,date_from:0
+#: field:account.bs.report,date_from:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_from:0
+#: field:account.common.account.report,date_from:0
+#: field:account.common.journal.report,date_from:0
+#: field:account.common.partner.report,date_from:0
+#: field:account.common.report,date_from:0
+#: field:account.fiscalyear,date_start:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_from:0
+#: report:account.general.ledger:0
+#: field:account.installer,date_start:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_from:0
+#: field:account.partner.ledger,date_from:0
+#: field:account.pl.report,date_from:0
+#: field:account.print.journal,date_from:0
+#: field:account.report.general.ledger,date_from:0
+#: field:account.subscription,date_start:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+#: view:account.entries.report:0
+#: view:account.move.line:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Bad total !"
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_tree
+msgid ""
+"A period is a fiscal period of time during which accounting entries should "
+"be recorded for accounting related activities. Monthly period is the norm "
+"but depending on your countries or company needs, you could also have "
+"quarterly periods. Closing a period will make it impossible to record new "
+"accounting entries, all new entries should then be made on the following "
+"open period. Close a period when you do not want to record new entries and "
+"want to lock this period for tax related calculation."
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts"
+msgstr ""
+
+#. module: account
+#: field:account.installer.modules,account_payment:0
+msgid "Suppliers Payment Management"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.journal.period,active:0
+#: field:account.payment.term,active:0
+#: field:account.tax,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Unknown Error"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You cannot validate a non-balanced entry !\n"
+"Make sure you have configured Payment Term properly !\n"
+"It should contain atleast one Payment Term Line with type \"Balance\" !"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used instead of the default one as the payable account "
+"for the current partner"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_id:0
+#: field:account.account.template,currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+msgid "Secondary Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move
+msgid "Validate Account Move"
+msgstr ""
+
+#. module: account
+#: field:account.account,credit:0
+#: report:account.account.balance:0
+#: report:account.account.balance.landscape:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,credit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: report:account.move.voucher:0
+#: report:account.partner.balance:0
+#: report:account.tax.code.entries:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,journal_id:0
+msgid ""
+"You can select here the journal to use for the refund invoice that will be "
+"created. If you leave that field empty, it will use the same journal as the "
+"current invoice."
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "Through :"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Journal Entry Model"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_use_model.py:0
+#, python-format
+msgid ""
+"Maturity date of entry line generated by model line '%s' is based on partner "
+"payment term!\n"
+"Please define partner on it!"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,number:0
+#: field:account.invoice,number:0
+#: field:account.move,name:0
+msgid "Number"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.journal:0
+#: selection:account.analytic.journal,type:0
+#: selection:account.bank.statement.line,type:0
+#: selection:account.journal,type:0
+msgid "General"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,filter:0
+#: selection:account.balance.report,filter:0
+#: selection:account.bs.report,filter:0
+#: selection:account.central.journal,filter:0
+#: view:account.chart:0
+#: selection:account.common.account.report,filter:0
+#: selection:account.common.journal.report,filter:0
+#: selection:account.common.partner.report,filter:0
+#: view:account.common.report:0
+#: selection:account.common.report,filter:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: selection:account.general.journal,filter:0
+#: field:account.installer,period:0
+#: selection:account.partner.balance,filter:0
+#: selection:account.partner.ledger,filter:0
+#: selection:account.pl.report,filter:0
+#: selection:account.print.journal,filter:0
+#: selection:account.report.general.ledger,filter:0
+#: report:account.vat.declaration:0
+#: view:account.vat.declaration:0
+#: selection:account.vat.declaration,filter:0
+#: model:ir.actions.act_window,name:account.action_account_period_form
+#: model:ir.ui.menu,name:account.menu_action_account_period_form
+#: model:ir.ui.menu,name:account.next_id_23
+msgid "Periods"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,currency_rate:0
+msgid "Currency Rate"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For Value percent enter % ratio between 0-1."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "April"
+msgstr ""
+
+#. module: account
+#: view:account.move.line.reconcile.select:0
+msgid "Open for Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund invoice base on this type. You can not Modify and Cancel if the "
+"invoice is already reconciled"
+msgstr ""
+
+#. module: account
+#: help:account.installer.modules,account_analytic_plans:0
+msgid ""
+"Allows invoice lines to impact multiple analytic accounts simultaneously."
+msgstr ""
+
+#. module: account
+#: field:account.installer,sale_tax:0
+msgid "Sale Tax(%)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+msgid "Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: field:account.analytic.line,product_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,product_id:0
+#: field:account.invoice.line,product_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,product_id:0
+#: field:account.move.line,product_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,product_id:0
+#: field:report.account.sales,product_id:0
+#: field:report.account_type.sales,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_validate_account_move
+msgid ""
+"The validation of journal entries process is also called 'ledger posting' "
+"and is the process of transferring debit and credit amounts from a journal "
+"of original entry to a ledger book."
+msgstr ""
+
+#. module: account
+#: report:account.tax.code.entries:0
+msgid ")"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr ""
+
+#. module: account
+#: view:account.report.general.ledger:0
+msgid ""
+"This report allows you to print or generate a pdf of your general ledger "
+"with details of all your account journals"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.entries.report,type:0
+msgid "Regular"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: field:account.account,type:0
+#: view:account.account.template:0
+#: field:account.account.template,type:0
+#: field:account.entries.report,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "State:"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+#: view:report.account_type.sales:0
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "This Month"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.Journal.report:0
+#: view:account.analytic.balance:0
+#: view:account.analytic.cost.ledger:0
+#: view:account.analytic.inverted.balance:0
+#: model:ir.actions.act_window,name:account.action_account_partner_ledger
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+#: selection:account.entries.report,move_state:0
+#: view:account.move:0
+#: selection:account.move,state:0
+#: view:account.move.line:0
+#: report:account.move.voucher:0
+msgid "Posted"
+msgstr ""
+
+#. module: account
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,date_to:0
+#: field:account.balance.report,date_to:0
+#: field:account.bs.report,date_to:0
+#: report:account.central.journal:0
+#: field:account.central.journal,date_to:0
+#: field:account.common.account.report,date_to:0
+#: field:account.common.journal.report,date_to:0
+#: field:account.common.partner.report,date_to:0
+#: field:account.common.report,date_to:0
+#: field:account.fiscalyear,date_stop:0
+#: report:account.general.journal:0
+#: field:account.general.journal,date_to:0
+#: report:account.general.ledger:0
+#: field:account.installer,date_stop:0
+#: report:account.journal.period.print:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,date_to:0
+#: field:account.partner.ledger,date_to:0
+#: field:account.pl.report,date_to:0
+#: field:account.print.journal,date_to:0
+#: field:account.report.general.ledger,date_to:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: field:account.vat.declaration,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Opening Entries"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr ""
+
+#. module: account
+#: field:account.fiscal.position.tax,tax_src_id:0
+#: field:account.fiscal.position.tax.template,tax_src_id:0
+msgid "Tax Source"
+msgstr ""
+
+#. module: account
+#: code:addons/account/report/account_balance_sheet.py:0
+#: code:addons/account/report/account_profit_loss.py:0
+#, python-format
+msgid "Net Profit"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_analytic_line.py:0
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JNRL"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  value amount: 0.02"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.period:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: view:account.analytic.line:0
+#: view:account.bank.statement:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
+#: field:report.account.sales,amount_total:0
+#: field:report.account_type.sales,amount_total:0
+#: field:report.invoice.created,amount_total:0
+msgid "Total"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: field:account.analytic.journal,company_id:0
+#: field:account.bank.statement,company_id:0
+#: field:account.bank.statement.line,company_id:0
+#: view:account.entries.report:0
+#: field:account.entries.report,company_id:0
+#: field:account.fiscal.position,company_id:0
+#: field:account.fiscalyear,company_id:0
+#: field:account.installer,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.invoice.line,company_id:0
+#: view:account.invoice.report:0
+#: field:account.invoice.report,company_id:0
+#: field:account.invoice.tax,company_id:0
+#: view:account.journal:0
+#: field:account.journal,company_id:0
+#: field:account.journal.period,company_id:0
+#: field:account.model,company_id:0
+#: field:account.move,company_id:0
+#: field:account.move.line,company_id:0
+#: field:account.period,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,company_id:0
+#: field:wizard.multi.charts.accounts,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Define Recurring Entries"
+msgstr ""
+
+#. module: account
+#: field:account.entries.report,date_maturity:0
+msgid "Date Maturity"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,total_entry_encoding:0
+msgid "Total cash transactions"
+msgstr ""
+
+#. module: account
+#: help:account.partner.reconcile.process,today_reconciled:0
+msgid ""
+"This figure depicts the total number of partners that have gone throught the "
+"reconciliation process today. The current partner is counted as already "
+"processed."
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code.template,sign:0
+msgid "Sign For Parent"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_balance_report
+msgid "Trial Balance Report"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid ""
+"Manual or automatic creation of payment entries according to the statements"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Invoice lines"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,period_to:0
+#: field:account.balance.report,period_to:0
+#: field:account.bs.report,period_to:0
+#: field:account.central.journal,period_to:0
+#: field:account.chart,period_to:0
+#: field:account.common.account.report,period_to:0
+#: field:account.common.journal.report,period_to:0
+#: field:account.common.partner.report,period_to:0
+#: field:account.common.report,period_to:0
+#: field:account.general.journal,period_to:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.pl.report,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.report.general.ledger,period_to:0
+#: field:account.vat.declaration,period_to:0
+msgid "End period"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#: code:addons/account/wizard/account_state_open.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal
+msgid "account.analytic.journal"
+msgstr ""
+
+#. module: account
+#: report:account.move.voucher:0
+msgid "On Account of :"
+msgstr ""
+
+#. module: account
+#: view:account.automatic.reconcile:0
+#: view:account.move.line.reconcile.writeoff:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+msgid "Invoice's state is Done"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_sales
+msgid "Report of the Sales by Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Accounts Fiscal Position"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: selection:account.invoice,type:0
+#: selection:account.invoice.report,type:0
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+#: selection:report.invoice.created,type:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,debit:0
+#: report:account.account.balance:0
+#: report:account.account.balance.landscape:0
+#: report:account.analytic.account.balance:0
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.inverted.balance:0
+#: report:account.central.journal:0
+#: field:account.entries.report,debit:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: report:account.move.voucher:0
+#: report:account.partner.balance:0
+#: report:account.tax.code.entries:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+#: report:account.vat.declaration:0
+#: field:report.account.receivable,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+msgid ""
+"This account will be used for invoices to value expenses for the current "
+"product category"
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Recurring"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "Entry is already reconciled"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece !\n"
+"\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: selection:account.balance.report,display_account:0
+#: selection:account.bs.report,display_account:0
+#: selection:account.common.account.report,display_account:0
+#: selection:account.pl.report,display_account:0
+#: selection:account.report.general.ledger,display_account:0
+msgid "With movements"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Account Data"
+msgstr ""
+
+#. module: account
+#: view:account.tax.code.template:0
+msgid "Account Tax Code Template"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "December"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
+#: model:ir.ui.menu,name:account.account_analytic_journal_print
+msgid "Print Analytic Journals"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+msgid "Applicability"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:0
+#, python-format
+msgid "This period is already closed !"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,currency_id:0
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoiceimport0
+msgid ""
+"Import of the statement in the system from a supplier or customer invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
+msgid "Billing"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Parent Account"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_chart
+msgid "Account Analytic Chart"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
+msgid "Statistic Reports"
+msgstr ""
+
+#. module: account
+#: field:account.installer,progress:0
+#: field:account.installer.modules,progress:0
+#: field:wizard.multi.charts.accounts,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Invoice '%s' is waiting for validation."
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "November"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "The date of your Journal Entry is not in the defined period!"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: report:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Search Invoice"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: view:account.invoice.refund:0
+#: selection:account.invoice.refund,filter_refund:0
+#: view:account.invoice.report:0
+#: model:ir.actions.act_window,name:account.action_account_invoice_refund
+msgid "Refund"
+msgstr "Rembourser"
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Bank Accounts"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Accounting Documents"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_validate_account_move_lines
+msgid "Validate Account Move Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
+#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
+msgid "Cost Ledger (Only quantities)"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+msgid "Invoice's state is Done."
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_reconcilepaid0
+msgid "As soon as the reconciliation is done, the invoice can be paid."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Search Account Templates"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: report:account.central.journal:0
+#: report:account.general.journal:0
+#: report:account.invoice:0
+#: report:account.partner.balance:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_addtmpl_wizard
+msgid "account.addtmpl.wizard"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,result_selection:0
+#: field:account.common.partner.report,result_selection:0
+#: report:account.general.ledger:0
+#: report:account.partner.balance:0
+#: field:account.partner.balance,result_selection:0
+#: field:account.partner.ledger,result_selection:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "Partner's"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
+#: view:ir.sequence:0
+#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
+msgid "Fiscal Years"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the analytic "
+"journal without removing it."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.use.model,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: selection:account.entries.report,month:0
+#: selection:account.invoice.report,month:0
+#: selection:analytic.entries.report,month:0
+#: selection:report.account.sales,month:0
+#: selection:report.account_type.sales,month:0
+msgid "February"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: view:account.chart.template:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank_id:0
+#: field:account.invoice.report,partner_bank_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account
+#: 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 ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Search Journal Items"
+msgstr ""
+
+#. module: account
+#: help:account.tax,base_sign:0
+#: help:account.tax,ref_base_sign:0
+#: help:account.tax,ref_tax_sign:0
+#: help:account.tax,tax_sign:0
+#: help:account.tax.template,base_sign:0
+#: help:account.tax.template,ref_base_sign:0
+#: help:account.tax.template,ref_tax_sign:0
+#: help:account.tax.template,tax_sign:0
+msgid "Usually 1 or -1."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#, python-format
+msgid "You must enter a period length that cannot be 0 or below !"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You cannot remove an account which has account entries!. "
+msgstr ""
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 444e9c4cd8a..d80eb5e46fc 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 8b830dd6662..bcc84d5d800 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index 12b561f2a70..179c2e1d777 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index 44a12e35dea..db6ece7f8b6 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7844,9 +7844,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index 7afaec736eb..4b8a8f007c4 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7872,9 +7872,9 @@ msgstr "Tip veze"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index d72269a3630..a28dc0e5246 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-25 18:32+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 07:59+0000\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4575,7 +4575,7 @@ msgstr ""
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr "Adó számla"
+msgstr "Adószámla"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -4678,7 +4678,7 @@ msgstr ""
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Gyermekek utáni adó"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -6965,6 +6965,9 @@ msgid ""
 "positive, it gives the day of the next month. Set 0 for net days (otherwise "
 "it's based on the beginning of the month)."
 msgstr ""
+"Hónap napja, állíts -1 -et az utolsó napnak az aktuális hónapban. Ha ez "
+"pozitív, akkor megadja a következő hónap napját. Állíts 0 -t netto napoknak "
+"(máskülönben a hónap eleje  alapján lesz meghatározva )"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -7109,7 +7112,7 @@ msgstr ""
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr ""
+msgstr "Használt adó"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -7846,9 +7849,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 6a4543117ea..50ef835d67b 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7847,9 +7847,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index f7d74941c9a..6957f6c6768 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8139,9 +8139,9 @@ msgstr "Tipo riferimento"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index 17cb3908f17..5ba12ec7af7 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 31435872c44..d1949cd6e3c 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 6b8fa6eae0d..bd097563434 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7886,9 +7886,9 @@ msgstr "Nuorodos tipas"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index e8455d0549f..f3fc8690527 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7855,9 +7855,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index 4d46104cfdb..f30185907e6 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8039,9 +8039,9 @@ msgstr "Дугаарлалтын төрөл"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 2886d174b15..96abe8aec24 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index ed55fea12cc..16dbefd36c5 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7968,9 +7968,9 @@ msgstr "Referentietype"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 7f1500287f8..bf40cfe5975 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7874,9 +7874,9 @@ msgstr "Referentietype"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index f7c8e1f9354..52681a5c75f 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index 3ce5a1f48f4..615e47f8381 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-29 07:48+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 21:50+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.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:21+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -51,7 +51,7 @@ msgstr "Uzgodnienie zapisu dziennika"
 #. module: account
 #: field:account.installer.modules,account_voucher:0
 msgid "Voucher Management"
-msgstr ""
+msgstr "Polecenia kięgowania"
 
 #. module: account
 #: view:account.account:0
@@ -104,6 +104,8 @@ msgid ""
 "The Profit and Loss report gives you an overview of your company profit and "
 "loss in a single document"
 msgstr ""
+"Raport zysków i strat pokaże ci obraz zysków i strat twojej firmy w jednym "
+"dokumencie"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -176,12 +178,14 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Jeśli pole Aktywne jest niezaznaczone, to płatność będzie ukryta (nie musisz "
+"jej wtedy usuwać)."
 
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Uwaga!"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -375,7 +379,7 @@ msgstr ""
 #: view:account.installer:0
 #: view:account.installer.modules:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguruj"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -554,7 +558,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Konto stosowane w tym dzienniku"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -677,7 +681,7 @@ msgstr "Dziennik centralizowany"
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "Główna numeracja musi być inna niż aktualna !"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -869,6 +873,8 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Nie można %s faktury, która jest uzgodniona. Trzeba najpierw skasować "
+"uzgodnienie. Możesz korygować tylko takie faktury."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -962,7 +968,7 @@ msgstr "Rozszerzone filtry..."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "Dziennik scentralizowany"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -986,6 +992,9 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
+"Jeśli konto podatku jest kontem rejestru podatku, to pole zawiera wartość "
+"podatku. Jeśli konto jest kontem rejestru podstawy, to pole zawiera wartość "
+"podstawy (bez podatku)."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1073,11 +1082,13 @@ msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
+"Te typy definiuje się zależnie od kraju. Typ zawiera więcej informacji o "
+"koncie i jego specyfice."
 
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Opcje stosowania"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1433,6 +1444,7 @@ msgstr "Faktury korygujące od dostawców"
 msgid ""
 "Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
 msgstr ""
+"Przykład: w ciągu 14 dni 2 procent, pozostałość do 30 dni od końca miesiąca."
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -1442,6 +1454,8 @@ msgid ""
 "The payment term defined gives a computed amount greater than the total "
 "invoiced amount."
 msgstr ""
+"Nie można utworzyć faktury !\n"
+"Warunki płatności generują wartość przekraczającą wartość faktury."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -1450,11 +1464,13 @@ msgid ""
 "customers. OpenERP generates draft of invoices automatically so that you "
 "only have to confirm them before sending them to your customers."
 msgstr ""
+"OpenERP generuje projekty faktur automatycznie, abyś mógł tylko je "
+"potwierdzać przed wysłaniem do klientów."
 
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
 msgid "Anglo-Saxon Accounting"
-msgstr ""
+msgstr "Ksiągowość anglosaska"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1528,6 +1544,8 @@ msgstr "Wyszukaj wyciąg bankowy"
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
+"Błędna wartość Winien lub Ma w modelu (Winien + Ma musi być większe od "
+"\"0\")!"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1550,7 +1568,7 @@ msgstr "Pozycje wyciągu"
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Data/Kod"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
@@ -1578,7 +1596,7 @@ msgstr "Faktura"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Koszt analityczny do fakturowania"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1603,7 +1621,7 @@ msgstr "Suma częściowa :"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Sprzedaż wg typów kont"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1611,6 +1629,8 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Anulowanie faktury: Tworzy fakturę korygującą, zatwierdza ją i uzgadnia, aby "
+"wyzerować bieżącą fakturę."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1636,12 +1656,12 @@ msgstr "Suma roku"
 #. module: account
 #: model:ir.actions.report.xml,name:account.report_account_voucher_new
 msgid "Print Voucher"
-msgstr ""
+msgstr "Drukuj polecenie"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Ten kreator zmieni walutę faktury"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1650,11 +1670,13 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Wyświetl plan kont twojej firmy dla roku podatkowego i filtruj wg okresów. "
+"Otwierając konto uzyskasz widok zapisów na wybranym koncie."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! You cannot define overlapping fiscal years"
-msgstr ""
+msgstr "Błąd! Nie możesz tworzyć lat podatkowych zachodzących na siebie"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -1673,6 +1695,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Jeśli pole Aktywne jest niezaznaczone, to okres będzie ukryty (nie musisz go "
+"wtedy usuwać)."
 
 #. module: account
 #: view:res.partner:0
@@ -1698,7 +1722,7 @@ msgstr "Musisz podać konto dla zapisu odpisu !"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Uniwersalny raport kont"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
@@ -1744,7 +1768,7 @@ msgstr "Projekt wyciągu"
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr ""
+msgstr "Deklaracja podatkowa: Noty kredytowe"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -1760,7 +1784,7 @@ msgstr "Kwota Ma"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Nie możesz tworzyć zapisów na zamkniętym koncie."
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -1774,19 +1798,19 @@ msgstr ""
 #. module: account
 #: view:res.company:0
 msgid "Reserve And Profit/Loss Account"
-msgstr ""
+msgstr "Konto rezerwy i zysków/strat"
 
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Nipoprawna wartość Winien lub Ma w zapisie !"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "Analiza faktur"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
@@ -1806,7 +1830,7 @@ msgstr "Zapisy wg pozycji"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "Kod konta"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1817,7 +1841,7 @@ msgstr "Zapis dziennika"
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr ""
+msgstr "Deklaracja podatkowa: Faktury"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
@@ -1832,7 +1856,7 @@ msgstr ""
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1870,18 +1894,18 @@ msgstr ""
 #. module: account
 #: field:account.bs.report,reserve_account_id:0
 msgid "Reserve & Profit/Loss Account"
-msgstr ""
+msgstr "Konto rezerwy i zysków/strat"
 
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Closing balance based on Starting Balance and Cash Transactions"
-msgstr ""
+msgstr "Bilans zamknięcia na podstawie Bilansu początkowego i płatności"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr ""
+msgstr "Porównanie pomiędzy zapisami księgowymi i płątnościami"
 
 #. module: account
 #: view:account.tax:0
@@ -1904,7 +1928,7 @@ msgstr ""
 msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
-msgstr ""
+msgstr "To dodaje kolumnę waluty, jeśli waluta jest inna niż waluta firmy."
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1912,6 +1936,7 @@ msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
 msgstr ""
+"Jeśli ustawione, to nie będą akceptowane zapisy z datą nie zawartą w okresie."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_pl_report
@@ -1942,6 +1967,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Jeśli pole Aktywne jest niezaznaczone, to podatek będzie ukryty (nie "
+"będziesz go musiał usuwać)."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -1982,12 +2009,12 @@ msgstr "Konta do uzgodnienia"
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Importuj wyciąg z pliku."
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Importuj z faktury"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2043,6 +2070,8 @@ msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Brak domyślnego konta Winien \n"
+"w dzienniku \"%s\""
 
 #. module: account
 #: help:account.account,type:0
@@ -2059,7 +2088,7 @@ msgstr ""
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr ""
+msgstr "Przeszukaj szablon planu kont"
 
 #. module: account
 #: view:account.installer:0
@@ -2234,7 +2263,7 @@ msgstr "Otwarty"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Stan projekt faktury"
 
 #. module: account
 #: help:account.account,reconcile:0
@@ -2247,7 +2276,7 @@ msgstr ""
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "Uzgoenienie partnera"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2274,7 +2303,7 @@ msgstr "Rejestr podstawy"
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "Określa kolejność wyświetlania podatków w listach"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -2282,6 +2311,8 @@ msgid ""
 "A supplier refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
+"Korekta od dostawcy jest fakturą korygującą przysłaną przez dostawcę, która "
+"niweluje część lub całość faktury przysłanej wcześniej."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2301,6 +2332,11 @@ 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 ""
+"To menu drukuje deklarację VAT na podstawie faktur i płatności. Wybierz "
+"jeden lub więcej okresów. Informacja do deklaracji jest generowana przez "
+"OpenERP na podstawie faktur (i płatności w niektórych krajach). Te dane są "
+"cały czas modyfikowane na podstawie bieżących działań w systemie. Możesz "
+"więc przeglądać podglądać bieżący stan swoich wymagań podatkowych."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2380,17 +2416,19 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"Obszar podatkowy określa podatki i konta dla partnerów, jeśli podlegają oni "
+"innym prawom niż partnerzy standardowi (np. jeśli są z innych krajów)"
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr ""
+msgstr "Ten raport pozwala ci oglądać stan zapisów danego dziennika."
 
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych kategorii."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2447,16 +2485,18 @@ msgid ""
 "You cannot modify company of this journal as its related record exist in "
 "Entry Lines"
 msgstr ""
+"Nie możesz modyfikować firmy dziennika ponieważ jest ona zapisana równieź w "
+"jego pozycjach zapisów."
 
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Etykieta"
 
 #. module: account
 #: view:account.tax:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Informacje księgowe"
 
 #. module: account
 #: view:account.tax:0
@@ -2487,7 +2527,7 @@ msgstr "Odnośnik"
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
-msgstr ""
+msgstr "Konto może być zarówno rejestrem podstawy jak i rejestrem podatku."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2537,6 +2577,8 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"Automatycznie generuje zapisy na podstawie tego co było wprowadzone do "
+"systemu przed konkretną datą."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -2572,12 +2614,16 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Zaznacz to pole jeśli nie chcesz, aby nowe zapisy od razu wchodziły w stan "
+"'Zaksięgowano' (bez ręcznego księgowania ze stanu 'Projekt').  \n"
+"Dotyczy to tylko ręcznych zapisów. Zapisy automatyczne zawsze od razu są w "
+"stanie 'Zaksięgowano'."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr ""
+msgstr "Ustawienia finansowe nowej firmy"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -2589,7 +2635,7 @@ msgstr "Sprzedaż wg kont"
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Ten kreator utworzy zapisy powtarzalne"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -2672,11 +2718,13 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
+"Nieobowiązkowa ilość dotycząca tego zapisu. Np. ilość sprzedanych produktów. "
+"Ilość nie jest formalnie wymagana, ale może być bardzo wygodna w raportach."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr ""
+msgstr "Pozycja 2:"
 
 #. module: account
 #: field:account.journal.column,required:0
@@ -2750,7 +2798,7 @@ msgstr "Obszar podatkowy"
 msgid ""
 "It adds initial balance row on report which display previous sum amount of "
 "debit/credit/balance"
-msgstr ""
+msgstr "To dodaje wiersz sumy z poprzedniej strony."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -2809,7 +2857,7 @@ msgstr "Warunki"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr ""
+msgstr "Transakcje gotówkowe"
 
 #. module: account
 #: view:res.partner:0
@@ -2849,7 +2897,7 @@ msgstr "Nazwa pozycji"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "Przeszukaj rok podatkowy"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -2921,12 +2969,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Konto rejestru partnera"
 
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Ustala kolejność kolumn w dzienniku"
 
 #. module: account
 #: view:account.tax.template:0
@@ -2938,7 +2986,7 @@ msgstr "Rejestry podatkowe"
 #: help:account.account.template,currency_id:0
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
-msgstr ""
+msgstr "Wymusza, aby wszystkie zapisy na koncie miały tę walutę jako drugą."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -2946,6 +2994,8 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
+"Ten kreator zatwierdzi wszystkie zapisy tego dziennika i okresu. Kiedy "
+"zapisy są zatwierdzone, to nie możesz ich więcej zmieniać."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -2961,7 +3011,7 @@ msgstr "Wygeneruj plan kont z szablonu"
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "Kasowanie uzgodnień"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3083,7 +3133,7 @@ msgstr "VAT:"
 msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
-msgstr ""
+msgstr "Kwota wyrażona w walucie konta, jeśli waluta inna niż firmowa."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -3125,12 +3175,12 @@ msgstr "Rejestry podatkowe"
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "Przeszukaj dziennik"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Oczekujące faktury"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -3140,7 +3190,7 @@ msgstr "rok"
 #. module: account
 #: report:account.move.voucher:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "Podpis ososby upoważnionej"
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3148,6 +3198,8 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
+"Wszystkie zapisy zostaną zatwierdzone i zaksięgowane. Oznacza to, że nie "
+"będziesz ich mógł zmieniać."
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -3168,7 +3220,7 @@ msgstr "Przelewy"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  value amount: n.a"
-msgstr ""
+msgstr "  wartość: n.d"
 
 #. module: account
 #: view:account.chart:0
@@ -3209,6 +3261,8 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
+"Wybrane faktury nie mogą być anulowane ponieważ są już w stanie 'Anulowano' "
+"lub 'Wykonano' !"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -3223,7 +3277,7 @@ msgstr ""
 #. module: account
 #: report:account.general.ledger:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Strona przeciwna"
 
 #. module: account
 #: view:account.journal:0
@@ -3273,6 +3327,9 @@ msgid ""
 "that you can control what you received from your supplier according to what "
 "you purchased or received."
 msgstr ""
+"Faktury od dostawców pozwala ci przeglądać te faktury. OpenERP generuje "
+"faktury od dostawców automatycznie według tego co zamawiasz, kupujesz lub "
+"przyjmujesz."
 
 #. module: account
 #: report:account.invoice:0
@@ -3291,6 +3348,8 @@ msgstr "Plan kont"
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
 msgstr ""
+"(jeśli nie wybierzesz okresu, to system weźmie pod uwagę wszystkie otwarte "
+"okresy)"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3300,7 +3359,7 @@ msgstr "Centralizacja przeciwnej strony"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Proces uzgodnienia kolejno dla partnerów"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3392,6 +3451,7 @@ msgid ""
 "You cannot validate a Journal Entry unless all journal items are in same "
 "chart of accounts !"
 msgstr ""
+"Nie możesz zatwierdzać zapisów, w których pozycje są z różnych planów kont !"
 
 #. module: account
 #: view:account.tax:0
@@ -3420,7 +3480,7 @@ msgstr "Budżety"
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.vat.declaration,filter:0
 msgid "No Filters"
-msgstr ""
+msgstr "Brak filtrów"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3457,7 +3517,7 @@ msgstr "Il."
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr ""
+msgstr "Nazwa adresu"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -3467,7 +3527,7 @@ msgstr "Spór sądowy"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Przeszukaj pozycje analityczne"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
@@ -3479,6 +3539,7 @@ msgstr "Konto zobowiązań"
 msgid ""
 "You cannot create entries on different periods/journals in the same move"
 msgstr ""
+"Nie możesz tworzyć zapisów z różnych okresów.dzienników w tym samym zapisie."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3513,14 +3574,14 @@ msgstr "Nie można zmienić podatku !"
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "#Zapisów"
 
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "Wybrałeś jednostkę miary, która jest niekompatybilna z produktem."
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -3538,7 +3599,7 @@ msgstr "Otwórz fakturę"
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Współczynnik dla rejestru podatku"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3561,7 +3622,7 @@ msgstr "Nazwa"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Raport próbny płatności przeterminowanych"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3635,12 +3696,12 @@ msgstr "Ustaw na projekt"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Pozycje powtarzalne"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "Wyświetl partnerów"
 
 #. module: account
 #: view:account.invoice:0
@@ -3650,7 +3711,7 @@ msgstr "Zatwierdź"
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
-msgstr ""
+msgstr "Niepoprawne wartości Winien lub Ma w modelu !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3733,11 +3794,13 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Jeśli pole Aktywne jest niezaznaczone, to konto będzie ukryte (nie musisz go "
+"wtedy usuwać)."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Przeszukaj szablony kont."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -3789,6 +3852,8 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
+"Koszty analityczne (karty czasu pracy, niektóre zakupione produkty, ...) "
+"pochodzące z kont analitycznych. To wygeneruje projekty faktur dostawcy."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3848,7 +3913,7 @@ msgstr "Pozycje podatkowe"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "Rejstr główny"
 
 #. module: account
 #: help:account.move,state:0
@@ -3903,12 +3968,12 @@ msgstr "Wszystkie zaksięgowane zapisy"
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr ""
+msgstr "Wyciąg %s jest potwierdzony, zapisy zostały utworzone."
 
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Błąd! Długość roku podatkowego jest niedozwolona. "
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -3942,6 +4007,8 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Kiedy pozycja jest tworzona, to ma stan 'Projekt'.\n"
+"* Kiedy wykonane są wszystkie płatności, to stan przechodzi w 'Ważna'."
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -3978,12 +4045,12 @@ msgstr "Podaj nazwę nowych zapisów"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Statystyka faktur"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Wyciągi bankowe zostały wprowadzone do systemu."
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:0
@@ -4017,12 +4084,12 @@ msgstr "Niezaimplementowane"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr ""
+msgstr "Wybór dziennika"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Drukuj fakturę"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4100,7 +4167,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "Modele powtarzalne"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4132,12 +4199,12 @@ msgstr "Kontrole typów"
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr ""
+msgstr "To jest domyślne konto dla wartości Winien"
 
 #. module: account
 #: help:account.partner.ledger,reconcil:0
 msgid "Consider reconciled entries"
-msgstr ""
+msgstr "Rozważ uzgodnione zapisy"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4217,6 +4284,9 @@ msgid ""
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Nie można utworzyć zapisu z walutą inną niż druga waluta konta \"%s - %s\". "
+"Jeśli chcesz stosować dowolną walutę na tym koncie, to musisz usunąć zapis o "
+"drugiej walucie."
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -4235,6 +4305,8 @@ msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accounting fields anymore."
 msgstr ""
+"Wszystkie projekty zapisów w dzienniku i okresie zostaną zatwierdzone. To "
+"oznacza, że nie będziesz mogła nic w nich modyfikować."
 
 #. module: account
 #: report:account.account.balance.landscape:0
@@ -4261,7 +4333,7 @@ msgstr "Konto dochodu w szablonie produktu"
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
-msgstr ""
+msgstr "Data ostatniego uzgodnienia konta partnera."
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -4392,7 +4464,7 @@ msgstr "Bilans (konta aktywów)"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "Third Party (Country)"
-msgstr ""
+msgstr "Trzecia strona (Kraj)"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4437,7 +4509,7 @@ msgstr ""
 #. module: account
 #: help:account.journal,refund_journal:0
 msgid "Fill this if the journal is to be used for refunds of invoices."
-msgstr ""
+msgstr "Zaznacz to, jeśli dziennik ma być stosowany do korekt faktur."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -4579,6 +4651,13 @@ msgid ""
 "calendar year gives many companies an advantage, allowing them to close "
 "their books at a time which is most convenient for them."
 msgstr ""
+"Zdefiniuj firmowy rok podatkowy według swoich okresów rozliczeniowych. Rok "
+"podatkowy jest okresem, dla którego w firmie tworzony jest budżet. Może to "
+"być dowolne 12 miesięcy. Rok podatkowy jest oznaczany rokiem, w którym się "
+"kończy. Tzn. Jeśli rok kończy się 30 listopada 2011, to powinien być "
+"nazywany \"RPod. 2011\" lub podobnie. Nie stosowanie roku kalendarzowego "
+"może firmie przynieść korzyści wynikające z zamykania ksiąg w wygodniejszym "
+"dla nich momencie."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
@@ -4595,7 +4674,7 @@ msgstr "Nazwa kolumny"
 #: view:account.general.journal:0
 msgid ""
 "This report gives you an overview of the situation of your general journals"
-msgstr ""
+msgstr "Ten raport zawiera informacje sytuacyjne z głównych dzienników."
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4616,7 +4695,7 @@ msgstr "Otwarcie kasy"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 1:"
-msgstr ""
+msgstr "Pozycja 1:"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4638,7 +4717,7 @@ msgstr "miesiąc"
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "Journal Item \"%s\" is not valid"
-msgstr ""
+msgstr "Pozycja \"%s\" jest niepoprawna"
 
 #. module: account
 #: view:account.payment.term:0
@@ -4648,7 +4727,7 @@ msgstr "Opis do faktur"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Następny partner do uzgodnień"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -4752,6 +4831,8 @@ msgid ""
 "The Journal Entry of the invoice have been totally reconciled with one or "
 "several Journal Entries of payment."
 msgstr ""
+"Zapis faktury został całkowicie uzgodniony z jednym lub kilkoma zapisami "
+"płatności."
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -4764,6 +4845,7 @@ msgstr "Podatek na podrzędnych"
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Nie możesz tworzyć zapisów bez partnera na kontach należności/płatności."
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4879,7 +4961,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr ""
+msgstr "Raport księgowy ogólny"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
@@ -4897,6 +4979,8 @@ msgid ""
 "This account will be used for invoices instead of the default one to value "
 "expenses for the current product"
 msgstr ""
+"To konto będzie stosowane (zamiast domyślnego) do zapisów wydatków dla "
+"bieżącego produktu."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -4945,6 +5029,8 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"To są pozostali partnerzy, dla których powinieneś sprawdzić uzgodnienia. Ta "
+"liczba traktuje obecnego partnera jak uzgodnionego."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5015,6 +5101,8 @@ msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Brak domyślnego konta Ma \n"
+"w dzienniku \"%s\""
 
 #. module: account
 #: field:account.entries.report,amount_currency:0
@@ -5130,12 +5218,12 @@ msgstr "Kwota stała"
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr ""
+msgstr "Ważne do"
 
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr ""
+msgstr "Przeterminowane należności"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5297,6 +5385,8 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Z tego widoku możesz analizować różne konta. Dokument pokazuje strony Winien "
+"i Ma biorąc pod uwagę różne kryteria, które możesz ustalać."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5304,6 +5394,9 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Pokazuje dzsiejszy postęp w uzgodnieniach. Jest obliczany jako \n"
+"Partnerzy uzgodnieni dzisiaj \\ (Pozostali partnerzy + Partnerzy uzgodnieni "
+"dzisiaj)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5374,7 +5467,7 @@ msgstr "Konto podatku dla faktur"
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr ""
+msgstr "Dziennik główny"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -5430,7 +5523,7 @@ msgstr "Faktury korygujące dla klienta"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "Obliczanie kwoty"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5440,13 +5533,13 @@ msgstr "Dziennik - nazwa okresu"
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr ""
+msgstr "Współczynnik dla rejestru podstawy"
 
 #. module: account
 #: code:addons/account/wizard/account_report_common.py:0
 #, python-format
 msgid "not implemented"
-msgstr ""
+msgstr "nie zaimplementowane"
 
 #. module: account
 #: help:account.journal,company_id:0
@@ -5460,6 +5553,8 @@ msgid ""
 "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state!"
 msgstr ""
+"Wybrane faktury nie mogą być potwierdzone ponieważ nie są w stanie "
+"\"Projekt' lub 'Pro-Forma' !"
 
 #. module: account
 #: report:account.invoice:0
@@ -5471,7 +5566,7 @@ msgstr "Uwaga do obszaru podatkowego :"
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Analiza zapisów analitycznych"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -5482,6 +5577,11 @@ 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 ""
+"Wyciąg bankowy jest spisem transakcji finansowych związanych kontem "
+"bankowym, kartą kredytową lub innym kontem finansowym w danym okresie. "
+"Rozpocznij wpisując stan początkowy i końcowy, a następnie wpisuj kolejne "
+"pozycje. W kolumnie Płatność możesz nacisnąć F11, aby otworzyć formularz "
+"uzgodnienia."
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -5519,7 +5619,7 @@ msgstr "Kwota"
 msgid ""
 "The code will be used to generate the numbers of the journal entries of this "
 "journal."
-msgstr ""
+msgstr "Ten kod będzie stosowany do generowania numerów zapisów dziennika."
 
 #. module: account
 #: view:account.invoice:0
@@ -5532,6 +5632,8 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
+"Kiedy uzgodnienie zostanie wykonane, to stan faktury zmieni się na "
+"'Wykonano'."
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -5548,7 +5650,7 @@ msgstr "Konto główne"
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr ""
+msgstr "Data ostatniego uzgodnienia"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
@@ -5563,7 +5665,7 @@ msgstr "Podatki klienta"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account based on this template"
-msgstr ""
+msgstr "Utwórz konto według tego szablonu"
 
 #. module: account
 #: view:account.account.type:0
@@ -5574,7 +5676,7 @@ msgstr "Konfiguracja raportowania"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Firma musi odpowiednia do konta i okresu."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5591,7 +5693,7 @@ msgstr "Szablony kont"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr ""
+msgstr "Deklaracja podatkowa"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
@@ -5605,6 +5707,7 @@ msgid ""
 "You cannot modify Company of account as its related record exist in Entry "
 "Lines"
 msgstr ""
+"Nie możesz zmieniać firmy konta ponieważ jest ona związana z pozycja zapisów."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -5719,7 +5822,7 @@ msgstr "Domyślne konto Ma"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Accounting Chart"
-msgstr ""
+msgstr "Konfiguruj swój plan kont"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5729,7 +5832,7 @@ msgstr "  liczba dni: 30"
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "Waluta powiązanego konta nie jest zgodna z walutą firmy."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5793,6 +5896,8 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Określa, czy podatek ma być wliczony w podstawę do obliczenia następnego "
+"podatku"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
@@ -5832,7 +5937,7 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr ""
+msgstr "Likwidacja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
@@ -5847,6 +5952,9 @@ 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 ""
+"Ten kreator generuje zapisy końca roku. Możesz uruchamiać go wielokrotnie "
+"dla tego samego roku: Kreator po prostu podmieni poprzednie zapisy otwarcia "
+"na nowe."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -5876,7 +5984,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
-msgstr ""
+msgstr "Nie ma planu kont dla tej firmy. Utwórz go."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:0
@@ -5910,7 +6018,7 @@ msgstr "Centralizacja"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr ""
+msgstr "Wygeneruj plan kont z szablonu planu kont."
 
 #. module: account
 #: view:account.account:0
@@ -6032,7 +6140,7 @@ msgstr "Zapisy: "
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Utwórz ręcznie powtarzalne zapisy w wybranym dzienniku."
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -6047,6 +6155,8 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
+"Uzgodnienie bankowe jest weryfikacją, że wyciągi bankowe zgadzają się z "
+"zapisami w twojej księgowości."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -6108,6 +6218,8 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
+"Zaznacz to pole, jeśli chcesz pozwolić na anulowanie zapisów związanych z "
+"tego dziennika lub faktur tego dziennika."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6244,7 +6356,7 @@ msgstr "Wszystkie zapisy"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Błąd: domyślna JM i zakupowa JM muszą być tej samej kategorii."
 
 #. module: account
 #: view:account.journal.select:0
@@ -6343,7 +6455,7 @@ msgstr "Konta dochodowe"
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Odnośnik do dokumentu, który wygenerował te fakturę."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -6391,7 +6503,7 @@ msgstr "Wykonano"
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Wyciąg z ręcznymi zapisami zostanie projektem wyciągu."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6403,6 +6515,11 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
+"Raport przeterminowanych należności sporządza wykaz należności wg "
+"interwałów. OpenERP zapyta cię nazwę firmy, okres i wielkość interwałów w "
+"dniach. Następnie system obliczy tabelę należności. Jeśli podasz interwał 30 "
+"dni, to system wygeneruje wartości należności za ostatni miesiąc, za "
+"przedostatni miesiąc itd. "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -6494,6 +6611,11 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"Podstawowy plan kont ma strukturę wymaganą przez prawo twojego kraju. "
+"Analityczny plan kont powinien odpowiadać twoim potrzebom raportowania "
+"kosztów i przychodów. Zwykle jest układany wg umów, projektów, produktów lub "
+"departamentów. Większość operacji OpenERP (faktury, karty czasu pracy, "
+"wydatki, ...) generuje zapisy analityczne."
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
@@ -6541,7 +6663,7 @@ msgstr "Wyciąg"
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Jest to domyślne konto dla wartości Winien."
 
 #. module: account
 #: model:ir.module.module,description:account.module_meta_information
@@ -6567,6 +6689,23 @@ msgid ""
 "module named account_voucher.\n"
 "    "
 msgstr ""
+"Moduł finasowo-księgowy który obejmuje:\n"
+"    Księgowość ogólną \n"
+"    Księgowość kosztową i analityczną\n"
+"    Księgowość podniotów zewnętrznych\n"
+"    Wyliczanie podatków\n"
+"    Budżetowanie\n"
+"    Obsługę faktur klientów i dostawców\n"
+"    Wyciągi bankowe\n"
+"    Procesy uzgadniania zapisów\n"
+"    Tworzenie konsol księgowych\n"
+"    * Lista wartości niezafakturowanych\n"
+"    * Wykresy zaległych należności\n"
+"    * Wykres dochodów\n"
+"\n"
+"Proces utrzymania księgi głównej jest prowadzony przez definiowanie "
+"dzienników. dla lat podatkowych.\n"
+"    "
 
 #. module: account
 #: report:account.invoice:0
@@ -6663,6 +6802,8 @@ msgid ""
 "Bank Account Number, Company bank account if Invoice is customer or supplier "
 "refund, otherwise Partner bank account number."
 msgstr ""
+"Konto bankowe, Konto firmy kiedy faktura jest dostawcy, a konto bankowe "
+"partnera w pozostałych przypadkach."
 
 #. module: account
 #: help:account.tax,domain:0
@@ -6703,7 +6844,7 @@ msgstr "Kod dziennika musi być unikalny w ramach firmy !"
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr ""
+msgstr "Zamknięcie kasy"
 
 #. module: account
 #: view:account.journal:0
@@ -6723,6 +6864,9 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
+"To pole pokazuje następnego partnera wybieranego automatycznie przez system "
+"w trakcie uzgodnień. System zrobi to na podstawie daty ostatniego "
+"uzgodnienia."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -6738,7 +6882,7 @@ msgstr "Domena"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Stosuj model"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -6749,6 +6893,10 @@ msgid ""
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
+"Ten widok jest stosowany przez księgowych do tworzenia masowych zapisów. "
+"Jeśli chcesz wprowadzić fakturę od dostawcy, to zacznij od konta wydatków. "
+"OpenERP automatycznie zaproponuje ci podatek związany z tym kontem i konto "
+"przeciwstawne do płatności."
 
 #. module: account
 #: help:res.company,property_reserve_and_surplus_account:0
@@ -6799,6 +6947,7 @@ msgstr "  dzień miesiąca= -1"
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
 msgstr ""
+"Błąd ! Tworzenie rekursywnych elementów skojarzonych jest zabronione."
 
 #. module: account
 #: help:account.journal,type:0
@@ -6810,6 +6959,11 @@ msgid ""
 "Situation' to be used at the time of new fiscal year creation or end of year "
 "entries generation."
 msgstr ""
+"Wybierz 'Sprzedaż' dla dziennika sprzedaży stosowanego do faktur. Wybierz "
+"'Zakup' dla dzienników stosowanych w zakupach. Wybierz 'Gotówka' do "
+"rejestracji płatności. Wybierz 'Ogólny' dla innych operacji. Wybierz "
+"'Sytuacja Otwarcia/Zamknięcia' do stosowania w trakcie tworzenia lub "
+"zamykania lat podatkowych."
 
 #. module: account
 #: report:account.invoice:0
@@ -6868,6 +7022,8 @@ msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
+"To pole jest stosowane do zapisów zobowiązań i należności. Możesz wstawić tu "
+"datę graniczną płatności."
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -7047,7 +7203,7 @@ msgstr "Środek trwały"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 Dni    "
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
@@ -7178,7 +7334,7 @@ msgstr "Partner"
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Wybierz walutę dla faktury"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:0
@@ -7218,6 +7374,8 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
+"Wybierz rok podatkowy, dla którego chcesz usunąć zapisy dziennika zapisów "
+"końca roku."
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -7234,6 +7392,9 @@ msgid ""
 "daily transactions, a company may keep several  types of specialized "
 "journals such as a cash journal, purchases journal, and sales journal."
 msgstr ""
+"W tym menu możesz zarządzać dziennikami. Dziennik jest miejscem "
+"porządkowania zapisów księgowych. W zależności od złożoności operacji "
+"księgowych firma może prowadzić wiele dzienników księgowych."
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
@@ -7260,7 +7421,7 @@ msgstr "Zapis automatyczny"
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych rejestrów podatkowych."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7273,6 +7434,8 @@ msgid ""
 "This account will be used for invoices instead of the default one to value "
 "sales for the current product"
 msgstr ""
+"To konto będzie stosowane dla produktu (zamiast domyślnego) do zapisów "
+"sprzedaży."
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -7289,6 +7452,8 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
+"Kiedy utworzone zostały okresy miesięczne, to stan jest 'Projekt'. Na koniec "
+"miesiąca stan zmienia się na \"Wykonano'."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
@@ -7348,7 +7513,7 @@ msgstr "Stan faktury jest Otwarte"
 #. module: account
 #: view:account.installer.modules:0
 msgid "Add extra Accounting functionalities to the ones already installed."
-msgstr ""
+msgstr "Dodaje funkcjonalność księgową do tej już zainstalowanej."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7396,6 +7561,8 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
+"Modyfikuj fakturę: Anuluje bieżącą fakturę (korektą do zera) i tworzy nową "
+"kopię faktury do edycji."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -7482,6 +7649,10 @@ 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 ""
+"To menu drukuje deklarację VAT na podstawie faktur (lub płatności). Możesz "
+"wybrać kilka okresów. Informacja do deklaracji jest w OpenERP generowana "
+"automatycznie na podstawie faktur (i w niektórych krajach również "
+"płatności). Te dane są dostępne na bieżąco po każdej operacji."
 
 #. module: account
 #: report:account.invoice:0
@@ -7513,7 +7684,7 @@ msgid ""
 "You can look up individual account entries by searching for useful "
 "information. To search for account entries, open a journal, then select a "
 "record line."
-msgstr ""
+msgstr "Możesz przeglądać zapisy. Do tego celu otwórz dziennik."
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -7610,7 +7781,7 @@ msgstr "Bilans kasy"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Stan zamknięcia roku podatkowego"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -7680,7 +7851,7 @@ msgstr "Drukuj deklarację VAT"
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Pozycja modelu zapisów"
 
 #. module: account
 #: view:account.invoice:0
@@ -7742,6 +7913,8 @@ msgid ""
 "expense account or payable account. From this view, you can create and "
 "manage the account types you need to be used for your company management."
 msgstr ""
+"Typ konta jest nazwą lub kodem nadanym do określania zastosowania konta. Na "
+"przykład, typ może być konto środków trwałych, wydatków, płatności itp."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
@@ -7970,15 +8143,15 @@ msgstr "Typ odnośnika"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 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"
+"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
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for period"
-msgstr ""
+msgstr "Rejestr kosztów dla okresu"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -8052,6 +8225,8 @@ msgid ""
 "You cannot modify company of this period as its related record exist in "
 "Entry Lines"
 msgstr ""
+"Nie możesz modyfikować firmy dla okresu ponieważ jest ona wpisana już do "
+"pozycji zapisów."
 
 #. module: account
 #: view:account.move:0
@@ -8073,7 +8248,7 @@ msgstr "Zamknij stany roku podatkowego i okresów"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr ""
+msgstr "Informacja o produkcie"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8107,6 +8282,8 @@ msgid ""
 "depending on the country and sometimes industry sector. OpenERP allows you "
 "to define and manage them from this menu."
 msgstr ""
+"Rejestry podatkowe służą do rozdzielania kwot brutto w zależności od kraju i "
+"czasem sektora firmy. Możesz nimi zarządzać w tym menu."
 
 #. module: account
 #: report:account.overdue:0
@@ -8116,7 +8293,7 @@ msgstr "Droga(i) Pani(e)"
 #. module: account
 #: view:account.installer.modules:0
 msgid "Configure Your Accounting Application"
-msgstr ""
+msgstr "Konfiguruj aplikację księgową"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -8127,7 +8304,7 @@ msgid ""
 "balance sheet and the income statement (profit and loss account). The annual "
 "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 ""
+msgstr "Tutaj możesz operować kontami księgowymi."
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -8151,6 +8328,10 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Ten widok służy do określania widoków dla dzienników. Możesz tu określać, "
+"które pola mają być widoczne, wymagane lub tylko do odczytu. Możesz również "
+"określać kolejność kolumn i inne ustawienia, aby przyśpieszyć wprowadzanie "
+"danych."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8238,6 +8419,8 @@ msgid ""
 "see here the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
+"Rejestry podatkowe pozwalają ci oglądać hierarchię rejestrów i ich stan na "
+"bieżący okres."
 
 #. module: account
 #: report:account.overdue:0
@@ -8247,7 +8430,7 @@ msgstr "Dokument: Zestawienie kont klienta"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
-msgstr ""
+msgstr "Nie możesz tworzyć zapisów na koncie widokowym."
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
@@ -8434,7 +8617,7 @@ msgstr ""
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "Konto nr"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -8655,7 +8838,7 @@ msgstr "Oczekujący"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Z kont analitycznych"
 
 #. module: account
 #: field:account.installer.modules,account_payment:0
@@ -8685,7 +8868,7 @@ msgstr "Aktywne"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Unknown Error"
-msgstr ""
+msgstr "Nieznany błąd"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -8695,6 +8878,9 @@ msgid ""
 "Make sure you have configured Payment Term properly !\n"
 "It should contain atleast one Payment Term Line with type \"Balance\" !"
 msgstr ""
+"Nie możesz zatwierdzić zapisu niebilansującego się !\n"
+"Upewnij się, że skonfigurowałeś poprawnie warunki płatności !\n"
+"Zapis powinien zawierać co najmniej jedną pozycję z typem \"Bilans\" !"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -8753,6 +8939,8 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Możesz wybrać dziennik dla faktur korygujących. Jeśli zostawisz to pole "
+"puste, to będzie zastosowany ten sam dziennik jak dla faktury pierwotnej."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -8778,6 +8966,9 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Data płatności w pozycji generowana przez pozycję modelu '%s' jest tworzona "
+"na podstawie warunków płatności!\n"
+"Zdefiniuj partnera!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -9110,17 +9301,17 @@ msgstr "Firma"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Definiuj powtarzalne zapisy"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Data płatności"
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr ""
+msgstr "Suma transakcji gotówkowych"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -9129,6 +9320,8 @@ msgid ""
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
+"Określa liczbę partnerów przejrzanych dzisiaj w procesie uzgodnień. Bieżący "
+"partner jest traktowany jako już przejrzany."
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9155,6 +9348,7 @@ msgstr "Projekty wyciągów"
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
+"Ręczne lub automatyczne tworzenie zapisów płatności w zależności od wyciągów."
 
 #. module: account
 #: view:account.invoice:0
@@ -9267,11 +9461,13 @@ msgid ""
 "This account will be used for invoices to value expenses for the current "
 "product category"
 msgstr ""
+"To konto będzie stosowane w fakturach do zapisów wydatkowych dla bieżącej "
+"kategorii produktów."
 
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnego szablonu kont."
 
 #. module: account
 #: view:account.subscription:0
@@ -9355,7 +9551,7 @@ msgstr "Drukuj dzienniki analityczne"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Konto fin."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -9527,7 +9723,7 @@ msgstr "Jak tylko uzgodnienie jest wykonane, to faktura może być zapłacona."
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Przeszukaj szablony kont"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -9564,7 +9760,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr ""
+msgstr "Partnerzy"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
@@ -9579,6 +9775,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Niezaznaczenie tego pola pozwala ukryć dziennik analityczny bez konieczności "
+"usuwania go."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -9598,7 +9796,7 @@ msgstr "Model konta"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -9613,7 +9811,7 @@ msgstr "Konto bankowe"
 #: 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 "Dziennik główny"
 
 #. module: account
 #: report:account.overdue:0
@@ -9628,7 +9826,7 @@ msgstr "Przyszłość"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Szukaj pozycji zapisów"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -9655,7 +9853,7 @@ msgstr "Konto wydatków dla szablonu produktu"
 #. module: account
 #: field:account.analytic.line,amount_currency:0
 msgid "Amount currency"
-msgstr ""
+msgstr "Kwota w walucie"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:0
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index e4987b74c53..b9a96aa1b9d 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7985,9 +7985,9 @@ msgstr "Tipo de referência"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 95b041cfe4e..9ef76060f0a 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7938,9 +7938,9 @@ msgstr "Tipo de referência"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 7e388ec9e1f..2a6e49c1f1a 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7919,9 +7919,9 @@ msgstr "Tipul referinţei"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index e34e9be6358..d74b482ea62 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 14:14+0000\n"
+"PO-Revision-Date: 2010-12-29 12:38+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:25+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -3828,7 +3828,7 @@ msgstr "Счет расходов не определен для этого то
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr "Настройки бух. учета для заказчика"
+msgstr "Настройки бухучета для заказчика"
 
 #. module: account
 #: field:account.invoice.tax,name:0
@@ -4741,7 +4741,7 @@ msgstr ""
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr "Имя счета/контрагента"
+msgstr "Название  счета/партнера"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7645,7 +7645,7 @@ msgstr "Разрешенные типы счетов (оставьте пуст
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr "Настройки бухгалтерского учета для контрагента-поставщика"
+msgstr "Настройки бухучета для поставщика"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -7897,9 +7897,9 @@ msgstr "Тип ссылки"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 3c1027c59dc..fe3a33a6a66 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index e2968ffaeb2..8c5f78a04ed 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7846,9 +7846,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index e2c0082c3c8..97d3a69e52e 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7864,9 +7864,9 @@ msgstr "Vrsta sklica"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index 9ed78c77c82..e1aba62b2bd 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7859,9 +7859,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 781d08b832f..a1450282190 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7901,9 +7901,9 @@ msgstr "Tip reference"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index 86ce9ff25a4..d760cb8e40c 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7901,9 +7901,9 @@ msgstr "Tip reference"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index b1208d79002..25e596f3621 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-16 17:16+0000\n"
+"PO-Revision-Date: 2010-12-31 09:55+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2181,7 +2181,7 @@ msgstr "Betalningsvillkor"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr "Momsredovisningsnummer"
+msgstr "Skatteregion"
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2720,7 +2720,7 @@ msgstr "Vinst och förlust"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Momsredovisningsnummer"
+msgstr "Fiscal Position"
 
 #. module: account
 #: help:account.partner.ledger,initial_balance:0
@@ -5064,7 +5064,7 @@ msgstr "Sekvensfältet används för att sortera rader med betalningsvillkor"
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "Förlaga för momsredovisningsnummer"
+msgstr "Skatteregionsmall"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -7444,7 +7444,7 @@ msgstr "Intäktskontokategori"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Position Templates"
-msgstr "Förlaga för momsredovisningsnummer"
+msgstr "Skatteregionsmall"
 
 #. module: account
 #: view:account.entries.report:0
@@ -7946,9 +7946,9 @@ msgstr "Referenstyp"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 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"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index d55e950ab25..848c0398d10 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index 23778ab9ee0..8739b0bd292 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 5577baa72b8..cbe7921a871 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 5aa34d6ab1e..1f525bd463a 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7842,9 +7842,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index d8a9e382942..1e980932b85 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-02 07:52+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 19:06+0000\n"
+"Last-Translator: François Degrave (OpenERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -8115,13 +8115,13 @@ msgstr "Referans Tipi"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index ed3f77b708e..e542713e728 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 7f83feb9b0f..9389b56fecd 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7848,9 +7848,9 @@ msgstr "Тип посилання"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 5949c81ca45..e254fa3f2bf 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 14:38+0000\n"
+"PO-Revision-Date: 2010-12-29 12:28+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:25+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2428,7 +2428,7 @@ msgstr ""
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Lỗi ! Bạn không thể tạo ra loại đệ quy."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -4112,7 +4112,7 @@ msgstr "Account Journal Select"
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "In hóa đơn"
 
 #. module: account
 #: view:account.tax.template:0
@@ -8238,13 +8238,13 @@ msgstr "Lọai tham chiếu"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 81b29a22a73..8ffa9ee557d 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-25 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7849,9 +7849,9 @@ msgstr "关联类型"
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index be9a359125a..10611a2ec06 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:24+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7843,9 +7843,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index bb287c8aefd..e7e047b0940 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:25+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -7842,9 +7842,9 @@ msgstr ""
 #. module: account
 #: help:account.bs.report,reserve_account_id:0
 msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount will "
-"be added, Loss : Amount will be duducted.), Which is calculated from Profilt "
-"& Loss Report"
+"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
+"will be added, Loss : Amount will be duducted.), Which is calculated from "
+"Profilt & Loss Report"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index f094e1c5f3b..f9bf0b26efc 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -88,32 +88,14 @@ class account_invoice(osv.osv):
         return [('none', _('Free Reference'))]
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
-        res = {}
-        if context is None:
-            context = {}
-
-        cur_obj = self.pool.get('res.currency')
-        data_inv = self.browse(cr, uid, ids, context=context)
-        for inv in data_inv:
-            if inv.reconciled:
-                res[inv.id] = 0.0
-                continue
-            inv_total = inv.amount_total
-            context_unreconciled = context.copy()
-            for lines in inv.move_lines:
-                if lines.currency_id and lines.currency_id.id == inv.currency_id.id:
-                    if inv.type in ('out_invoice','in_refund'):
-                        inv_total += lines.amount_currency
-                    else:
-                        inv_total -= lines.amount_currency
-                else:
-                   context_unreconciled.update({'date': lines.date})
-                   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
-            res[inv.id] =  self.pool.get('res.currency').round(cr, uid, inv.currency_id, result)
-        return res
+        result = {}
+        for invoice in self.browse(cr, uid, ids, context=context):
+            result[invoice.id] = 0.0
+            if invoice.move_id:
+                for m in invoice.move_id.line_id:
+                    if m.account_id.type in ('receivable','payable'):
+                        result[invoice.id] = m.amount_residual_currency
+        return result
 
     # Give Journal Items related to the payment reconciled to this invoice
     # Return ids of partial and total payments related to the selected invoices
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 74b3bf81190..680c7d4bb43 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -253,13 +253,13 @@
       </tr>
       <tr>
         <td>
-          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font></para>
+          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('liability'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] </font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance'])) ]] [[ company.currency_id.symbol ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font></para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index d29ee5abffd..f9942c41b95 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -205,13 +205,15 @@
           <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(abs(a['balance1'])) ]] [[ company.currency_id.symbol ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font></para>
+          <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines(), 'a') ]]</font> <font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]]</font><font>[[ a['code'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font></para>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font')  ]][[ a['name'] ]]</font><font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font><font>[[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
+          <para style="terp_default_Right_9"><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font')  ]]</font>
+<font>[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]]</font>
+<font> [[(a['code'] and a['name']) and formatLang(abs(a['balance'])) or removeParentNode('font')]] [[ company.currency_id.symbol ]]</font></para>
         </td>
      </tr>
      </blockTable>
diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 320a38370a2..33566083652 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -233,7 +233,7 @@
         <td><para style="terp_header"><font color="white"> </font></para></td>
       </tr>
     </blockTable>
-	<blockTable colWidths="90.0,80.0,100.0,130.0,100.0" style="Table2">
+	<blockTable colWidths="130.0,80.0,100.0,130.0,100.0" style="Table2">
 		<tr>
 		<td><para style="terp_tblheader_General_Centre">[[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]]</para>
       	 <para style="terp_tblheader_General_Centre"> [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]]</para></td>
@@ -274,7 +274,7 @@
     <para style="P9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Account_detail_Title">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Account_detail_Title">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_tblheader_Details">A/C No.</para></td>
         <td><para style="terp_tblheader_Details">Account Name</para></td>
@@ -293,7 +293,7 @@
 		<td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -314,7 +314,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
-      <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,240.0,85.0,85.0,90.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="terp_default_9">[[ line['code'] ]]</para></td>
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index d3da592e085..15614444822 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -479,7 +479,7 @@
             <para style="terp_default_Bold_9_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
+            <para style="terp_default_Bold_9_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -616,4 +616,4 @@
     </section>
     </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 56624256300..22712af0f8c 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -263,11 +263,11 @@
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_7" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_7_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <images/>
   </stylesheet>
@@ -313,7 +313,7 @@
 	          <para style="terp_tblheader_Details_Right">Currency</para>
 	        </td>
 	      </tr>
-	    </blockTable>  
+	    </blockTable>
   		<blockTable colWidths="45.0,35.0,30.0,105.0,80.0,55.0,130.0,95.0,65.0,65.0,75.0" style="Table10">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
 	      <tr>
 	        <td>
@@ -496,19 +496,19 @@
       <blockTable rowHeights="0.55cm" colWidths="490.0,65.0,65.0,75.0,75.0" style="Table8">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
         <tr>
           <td>
-            <para style="terp_default_Bold_8"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+            <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.code or '' ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ o.currency_id and formatLang(sum_currency_amount_account(o), digits=get_digits(dp='Account')) + o.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -526,7 +526,7 @@
               <para style="terp_default_7">[[ line['lcode'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_7">[[ strip_name(line['partner_name'],21) ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['partner_name'],20) ]]</para>
             </td>
             <td>
               <para style="terp_default_7">[[ strip_name(line['lref'],17) ]]</para>
@@ -535,7 +535,7 @@
               <para style="terp_default_7">[[ line['move'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_7">[[ strip_name(line['lname'],26) ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['lname'],22) ]]</para>
             </td>
             <td>
               <para style="terp_default_7">[[ strip_name(line['line_corresp'],18) ]]</para>
@@ -598,16 +598,16 @@
       <blockTable rowHeights="0.55cm" colWidths="575.0,65.0,65.0,75.0" style="Table11">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
-            <para style="terp_default_Bold_8"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
+            <para style="terp_default_Bold_7"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_debit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_credit_account(o), digits=get_digits(dp='Account')) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_8_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Bold_7_Right">[[ formatLang(sum_balance_account(o), digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -625,7 +625,7 @@
               <para style="terp_default_7">[[ line['lcode'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_7">[[ strip_name(line['partner_name'],25) ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['partner_name'],24) ]]</para>
             </td>
             <td>
               <para style="terp_default_7">[[ strip_name(line['lref'],21) ]]</para>
@@ -634,7 +634,7 @@
               <para style="terp_default_7">[[ line['move'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_7">[[ strip_name(line['lname'],35) ]]</para>
+              <para style="terp_default_7">[[ strip_name(line['lname'],28) ]]</para>
             </td>
             <td>
               <para style="terp_default_7">[[ strip_name(line['line_corresp'],23) ]]</para>
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index a81c634ddc8..9b0ac55bb56 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -229,7 +229,7 @@
      <para style="P9">
       <font color="white"> </font>
     </para>
-    <blockTable rowHeights="0.55cm" colWidths="40.0,75.0,50.0,50.0,72.0,131.0,68.0,68.0" style="Table1" repeatRows="1">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable rowHeights="0.55cm" colWidths="45.0,55.0,55.0,50.0,80.0,120.0,70.0,70.0" style="Table1" repeatRows="1">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="P10a">Date</para></td>
         <td><para style="P10a">Ref</para></td>
@@ -256,14 +256,14 @@
         <td><para style="terp_default_8">[[ strip_name(line.ref,20) ]]</para></td>
         <td><para style="terp_default_8">[[ line.move_id.name &lt;&gt; '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td> 
         <td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
-        <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,16) ]]</para></td>
-        <td><para style="terp_default_8">[[ strip_name(line.name,35) ]]</para></td>
+        <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,17) ]]</para></td>
+        <td><para style="terp_default_8">[[ strip_name(line.name,27) ]]</para></td>
         <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
         <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
       </tr>
     </blockTable>
 
-    <blockTable rowHeights="0.55cm" colWidths="40.0,75.0,50.0,50.0,72.0,66.0,68.0,68.0,68.0" style="Table1" repeatRows="1">[[ display_currency(data)  or removeParentNode('blockTable') ]]
+    <blockTable rowHeights="0.55cm" colWidths="45.0,50.0,52.0,50.0,70.0,80.0,70.0,70.0,70.0" style="Table1" repeatRows="1">[[ display_currency(data)  or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="P10a">Date</para></td>
         <td><para style="P10a">Ref</para></td>
@@ -293,7 +293,7 @@
         <td><para style="terp_default_8">[[ strip_name(line.ref,20) ]]</para></td>
         <td><para style="terp_default_8">[[ line.move_id.name &lt;&gt; '/' and line.move_id.name or ('*'+str(line.move_id.id)) ]]</para></td> 
         <td><para style="terp_default_8">[[ line.account_id.code ]]</para></td>
-        <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,16) ]]</para></td>
+        <td><para style="terp_default_8">[[ line.partner_id and strip_name(line.partner_id.name,15) ]]</para></td>
         <td><para style="terp_default_8">[[ strip_name(line.name,17) ]]</para></td>
         <td><para style="P8">[[ formatLang(line.debit) ]] [[ company.currency_id.symbol ]]</para></td>
         <td><para style="P8">[[ formatLang(line.credit) ]] [[ company.currency_id.symbol ]]</para></td>
diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py
index ab3cfd70970..eacafb02eda 100644
--- a/addons/account/report/account_partner_balance.py
+++ b/addons/account/report/account_partner_balance.py
@@ -28,8 +28,6 @@ from common_report_header import common_report_header
 class partner_balance(report_sxw.rml_parse, common_report_header):
 
     def __init__(self, cr, uid, name, context=None):
-        if context is None:
-            context = {}
         super(partner_balance, self).__init__(cr, uid, name, context=context)
         self.account_ids = []
         self.localcontext.update( {
@@ -276,6 +274,7 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return temp_res
 
     def _sum_litige(self):
+        #gives the total of move lines with blocked boolean set to TRUE for the report selection
         move_state = ['draft','posted']
         if self.target_move == 'posted':
             move_state = ['posted']
@@ -296,12 +295,15 @@ class partner_balance(report_sxw.rml_parse, common_report_header):
         return temp_res
 
     def _get_partners(self):
+        cr, uid = self.cr, self.uid
+        context = self.localcontext # all of it?
+
         if self.result_selection == 'customer':
-            return 'Receivable Accounts'
+            return _('Receivable Accounts')
         elif self.result_selection == 'supplier':
-            return 'Payable Accounts'
+            return _('Payable Accounts')
         elif self.result_selection == 'customer_supplier':
-            return 'Receivable and Payable Accounts'
+            return _('Receivable and Payable Accounts')
         return ''
 
 report_sxw.report_sxw('report.account.partner.balance', 'res.partner', 'account/report/account_partner_balance.rml',parser=partner_balance, header="internal")
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 1a32bc13bde..69faa977da1 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -262,11 +262,11 @@
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <images/>
@@ -274,67 +274,65 @@
   <story>
   	<pto>
   	<pto_header>
-  		<blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
-  			[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-	        <tr>
-	          <td>
-	            <para style="terp_tblheader_Details">Date</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details">JNRL</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Centre">Ref</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Centre">Account</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details">Entry Label</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Debit</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Credit</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Balance</para>
-	          </td>
-	        </tr>
-	      </blockTable>
-  		<blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
-  			[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-	        <tr>
-	          <td>
-	            <para style="terp_tblheader_Details">Date</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details">JNRL</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Centre">Ref</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Centre">Account</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details">Entry Label</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Debit</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Credit</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Balance</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Currency</para>
-	          </td>
-	        </tr>
-	      </blockTable>
+  	<blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Date</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">JNRL</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Ref</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Account</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Entry Label</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Debit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Credit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Balance</para>
+          </td>
+        </tr>
+      </blockTable>
+  	<blockTable colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table8">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Date</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">JNRL</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Ref</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Account</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Entry Label</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Debit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Credit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Balance</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Currency</para>
+          </td>
+        </tr>
+      </blockTable>
   	</pto_header>
     <para style="terp_default_8">[[ repeatIn(objects, 'p') ]]</para>
     <para style="terp_default_8">[[ setLang(p.lang) ]]</para>
@@ -439,7 +437,7 @@
       <para style="terp_default_2">
         <font face="Helvetica" color="white">[[ display_currency(data) == False or removeParentNode('section') ]]</font>
       </para>
-      <blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
+      <blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Date</para>
@@ -490,47 +488,47 @@
         <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table5">
           <tr>
             <td>
-              <para style="terp_default_9">Initial Balance</para>
+              <para style="terp_default_8">Initial Balance</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table6">
+        <blockTable rowHeights="0.55cm" colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table6">
           <tr>
             <td>
-              <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
+              <para style="terp_default_8">[[ formatLang(line['date'],date=True) ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ line['code'] ]]</para>
+              <para style="terp_default_8">[[ line['code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
+              <para style="terp_default_8">[[ line['move_name'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
+              <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+              <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -540,7 +538,7 @@
       <para style="terp_default_2">
         <font face="Helvetica" color="white">[[ display_currency(data) == True or removeParentNode('section') ]]</font>
       </para>
-      <blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
+      <blockTable colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table8">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Date</para>
@@ -571,7 +569,7 @@
           </td>
         </tr>
       </blockTable>
-      <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table12">
+      <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table12">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para>
@@ -594,7 +592,7 @@
       </blockTable>
       <section>
         <para style="terp_default_2"><font color="white">[[ data['form']['initial_balance']==True or removeParentNode('section') ]]</font></para>
-        <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table13">
+        <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table13">
           <tr>
             <td>
               <para style="terp_default_9">Initial Balance</para>
@@ -618,35 +616,35 @@
       </section>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table14">
+        <blockTable rowHeights="0.55cm" colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table14">
           <tr>
             <td>
-              <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
+              <para style="terp_default_8">[[ formatLang(line['date'],date=True) ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ line['code'] ]]</para>
+              <para style="terp_default_8">[[ line['code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
+              <para style="terp_default_8">[[ line['move_name'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
+              <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]]</para>
+              <para style="terp_default_8">[[ strip_name(line['ref'],8) ]] - [[ strip_name(line['name'],7) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="8.0">[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
+                <font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
               </para>
             </td>
           </tr>
@@ -655,4 +653,4 @@
     </section>
     </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index b3dec993cdb..22942e15c78 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -262,11 +262,11 @@
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
     <images/>
@@ -274,67 +274,67 @@
   <story>
   	<pto>
   	<pto_header>
-  		<blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
-  			[[ display_currency(data) == False or removeParentNode('blockTable') ]]
-	        <tr>
-	          <td>
-	            <para style="terp_tblheader_Details">Date</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details">JNRL</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Centre">Ref</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Centre">Account</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details">Entry Label</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Debit</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Credit</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Balance</para>
-	          </td>
-	        </tr>
-	      </blockTable>
-  		<blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
-  			[[ display_currency(data) == True or removeParentNode('blockTable') ]]
-	        <tr>
-	          <td>
-	            <para style="terp_tblheader_Details">Date</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details">JNRL</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Centre">Ref</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Centre">Account</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details">Entry Label</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Debit</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Credit</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Balance</para>
-	          </td>
-	          <td>
-	            <para style="terp_tblheader_Details_Right">Currency</para>
-	          </td>
-	        </tr>
-	      </blockTable>
+  		<blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2">
+    [[ display_currency(data) == False or removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Date</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">JNRL</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Ref</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Account</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Entry Label</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Debit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Credit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Balance</para>
+          </td>
+        </tr>
+      </blockTable>
+  		<blockTable colWidths="50.0,30.0,60.0,50.0,70.0,64.0,64.0,79.0,70.0" style="Table8">
+    [[ display_currency(data) == True or removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Date</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">JNRL</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Ref</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Account</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details">Entry Label</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Debit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Credit</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Balance</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Currency</para>
+          </td>
+        </tr>
+      </blockTable>
   	</pto_header>
 
     <para style="terp_default_8">
@@ -434,7 +434,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table2">
+    <blockTable colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table2">
     [[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
@@ -493,53 +493,53 @@
         <blockTable rowHeights="0.55cm" colWidths="332.0,64.0,64.0,79.0" style="Table5">
           <tr>
             <td>
-              <para style="terp_default_9">Initial Balance</para>
+              <para style="terp_default_8">Initial Balance</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,133.0,64.0,64.0,79.0" style="Table6">
+        <blockTable rowHeights="0.55cm" colWidths="50.0,30.0,60.0,60.0,130.0,64.0,64.0,79.0" style="Table6">
           <tr>
             <td>
-              <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
+              <para style="terp_default_8">[[ formatLang(line['date'],date=True) ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ line['code'] ]]</para>
+              <para style="terp_default_8">[[ line['code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
+              <para style="terp_default_8">[[ line['move_name'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
+              <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
+              <para style="terp_default_8">[[ strip_name(line['ref'],10) ]] - [[ strip_name(line['name'],15) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table8">
+    <blockTable colWidths="50.0,30.0,60.0,50.0,70.0,64.0,64.0,79.0,70.0" style="Table8">
     [[ display_currency(data) == True or removeParentNode('blockTable') ]]
         <tr>
           <td>
@@ -578,7 +578,7 @@
         <font face="Helvetica" color="white">[[ display_currency(data) == True or removeParentNode('section') ]]</font>
       </para>
 
-      <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table12">
+      <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table12">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ p.ref ]] - [[ p.name ]]</para>
@@ -601,22 +601,22 @@
       </blockTable>
       <section>
         <para style="terp_default_2"><font color="white">[[ data['form']['initial_balance']==True or removeParentNode('section') ]]</font></para>
-        <blockTable rowHeights="0.55cm" colWidths="261.0,64.0,64.0,79.0,71.0" style="Table13">
+        <blockTable rowHeights="0.55cm" colWidths="262.0,64.0,64.0,79.0,70.0" style="Table13">
           <tr>
             <td>
-              <para style="terp_default_9">Initial Balance</para>
+              <para style="terp_default_8">Initial Balance</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][0])]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][1]) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang(get_intial_balance(p)[0][2]) ]] [[ company.currency_id.symbol ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">
+              <para style="terp_default_Right_8">
                 <font color="white"> </font>
               </para>
             </td>
@@ -625,35 +625,35 @@
       </section>
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(p), 'line') ]]</para>
-        <blockTable rowHeights="0.55cm" colWidths="42.0,31.0,62.0,62.0,62.0,64.0,64.0,79.0,71.0" style="Table14">
+        <blockTable rowHeights="0.55cm" colWidths="45.0,30.0,60.0,50.0,75.0,64.0,64.0,79.0,70.0" style="Table14">
           <tr>
             <td>
-              <para style="terp_default_9">[[ formatLang(line['date'],date=True) ]]</para>
+              <para style="terp_default_8">[[ formatLang(line['date'],date=True) ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ line['code'] ]]</para>
+              <para style="terp_default_8">[[ line['code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line['move_name'] ]]</para>
+              <para style="terp_default_8">[[ line['move_name'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Centre_9">[[ line['a_code'] ]]</para>
+              <para style="terp_default_8">[[ line['a_code'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ strip_name(line['ref'],5) ]] - [[ strip_name(line['name'],5) ]]</para>
+              <para style="terp_default_8">[[ strip_name(line['ref'],8) ]] - [[ strip_name(line['name'],7) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['debit'])) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['debit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['credit'])) ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['credit'])) ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_8">[[ formatLang((line['progress'])) ]] [[ company.currency_id.symbol ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="8.0">[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
+                <font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[ formatLang(line['amount_currency'] ) ]] [[ line['currency_code'] or '' ]]</font>
               </para>
             </td>
           </tr>
@@ -662,4 +662,4 @@
     </section>
     </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 80ccd2aabae..0bab362e578 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -27,6 +27,10 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_General_Detail_Content">
       <blockAlignment value="LEFT"/>
@@ -41,6 +45,10 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
@@ -178,20 +186,23 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="177.0,177.0,177.0" style="Table_Invoice_General_Header">
+    <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_Invoice_General_Header">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Document</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
+	<td>
+          <para style="terp_tblheader_General_Centre">Origin</para>
+        </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+          <para style="terp_tblheader_General_Centre">Your Reference</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content">
+    <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_General_Detail_Content">
       <tr>
         <td>
           <para style="terp_default_Centre_9">[[ o.name or ' ' ]]</para>
@@ -199,6 +210,9 @@
         <td>
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
+	<td>
+          <para style="terp_default_Centre_9">[[ o.origin or '' ]]</para>
+        </td>
         <td>
           <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
         </td>
@@ -207,31 +221,31 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
+    <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table7">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Description</para>
+          <para style="terp_tblheader_General">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Taxes</para>
+          <para style="terp_tblheader_General_Centre">Taxes</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
+          <para style="terp_tblheader_General_Right">Quantity</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price </para>
+          <para style="terp_tblheader_General_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
+          <para style="terp_tblheader_General_Right">Disc.(%)</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
+          <para style="terp_tblheader_General_Right">Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
-      <blockTable colWidths="202.0,88.0,71.0,57.0,42.0,71.0" style="Table8">
+      <blockTable colWidths="185.0,70.0,80.0,60.0,50.0,85.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_9">[[ l.name ]]</para>
@@ -246,10 +260,10 @@
             <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.discount, digits=get_digits(dp='Account')) ]] </para>
+            <para style="terp_default_Centre_9">[[ formatLang(l.discount, dp='Account') ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
           </td>
         </tr>
         <tr>
@@ -284,7 +298,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="391.0,54.0,85.0" style="Table10">
+    <blockTable colWidths="385.0,60.0,85.0" style="Table10">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -308,7 +322,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -354,7 +368,7 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
@@ -393,4 +407,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
index 33e69d02e96..582885d89dc 100644
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@@ -231,7 +231,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Loss' and company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and  formatLang(abs(final_result()['balance'])) ]] [[ final_result()['balance'] and final_result()['type'] == 'Net Profit' and company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py
index 809cb38e879..48e26e839d3 100644
--- a/addons/account/report/common_report_header.py
+++ b/addons/account/report/common_report_header.py
@@ -64,8 +64,8 @@ class common_report_header(object):
     def _get_target_move(self, data):
         if data.get('form', False) and data['form'].get('target_move', False):
             if data['form']['target_move'] == 'all':
-                return 'All Entries'
-            return 'All Posted Entries'
+                return _('All Entries')
+            return _('All Posted Entries')
         return ''
 
     def _get_end_date(self, data):
@@ -94,10 +94,10 @@ class common_report_header(object):
     def _get_filter(self, data):
         if data.get('form', False) and data['form'].get('filter', False):
             if data['form']['filter'] == 'filter_date':
-                return 'Date'
+                return _('Date')
             elif data['form']['filter'] == 'filter_period':
-                return 'Periods'
-        return 'No Filter'
+                return _('Periods')
+        return _('No Filter')
 
     def _sum_debit_period(self, period_id, journal_id=None):
         journals = journal_id or self.journal_ids
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 68839c8f18c..83efe67f103 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -9,9 +9,7 @@
 "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
@@ -100,6 +98,7 @@
 "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_account_entries_report_employee","account.entries.report employee","model_account_entries_report","base.group_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
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index aaf45de3212..312db44cd0c 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -28,7 +28,6 @@
     (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
-
 -
   In order to test the PDF reports defined on Account Move, we will print the Voucher Report
 -
@@ -37,311 +36,183 @@
     (data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data)
-
 -
   Print the Aged Partner Balance Report
 -
-  !python {model: res.partner}: |
-    import time
-    from datetime import datetime
-    from dateutil.relativedelta import relativedelta
-    start = datetime.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d")))
-    start = datetime(int(start.year), int(start.month), int(start.day))
-    res = {}
-    for i in range(5)[::-1]:
-        stop = start - relativedelta(days=30)
-        res[str(i)] = {
-            'name': (i!=0 and (str((5-(i+1)) * 30) + '-' + str((5-i) * 30)) or ('+'+str(4 * 30))),
-            'stop': start.strftime('%Y-%m-%d'),
-            'start': (i!=0 and stop.strftime('%Y-%m-%d') or False),
-        }
-        start = stop - relativedelta(days=1)
-    obj_move = self.pool.get('account.move.line')
-    ctx = {}
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    ctx['fiscalyear'] = fy_id
-    ctx['journal_ids'] = journal_ids
-    ctx['chart_account_id'] = ref('account.chart0')
-
-    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-
-    data_dict = {'model': 'ir.ui.menu', 'form': \
-            {'chart_account_id':ref('account.chart0'),
-             'initial_balance': 1, 'periods': period_list,
-             'journal_ids':journal_ids, 'page_split': 0, 
-             'date_from': time.strftime('%Y-%m-%d'),
-             'period_length': 30, 'amount_currency': 0,
-             'query_line' : query_line, 'result_selection': 
-             'customer','direction_selection': 
-             'past','fiscalyear_id':fy_id } }
-    data_dict['form'].update(res)
-    from tools.test_reports import try_report
-    try_report(cr, uid, 'report.account.aged_trial_balance', [], data_dict, context={})
+  !python {model: account.account}: |
+    ctx={}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
+    data_dict = {'chart_account_id':ref('account.chart0')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account') 
 -
   Print the Account Balance Sheet in Horizontal mode
 -
   !python {model: account.account}: |
-    import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'reserve_account_id':ref('account.rsa') ,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 1,'journal_ids':[],'fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all'}}
-    (data, format) = netsvc.LocalService('report.account.balancesheet.horizontal').create(cr, uid, [], data_dict, {'periods': []})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance_sheet_horizontal.'+format), 'wb+').write(data)
-
+    ctx={}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')    
 -
   Print the Account Balance Sheet in Normal mode
 -
   !python {model: account.account}: |
-    import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'reserve_account_id':ref('account.rsa') ,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':[],'fiscalyear': ref('account.data_fiscalyear') ,'target_move': 'all'}}
-    (data, format) = netsvc.LocalService('report.account.balancesheet').create(cr, uid, [], data_dict, {'periods': []})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance_sheet.'+format), 'wb+').write(data)
-
+    ctx={}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') 
 -
-  Print the Account Balance Report in Normal mode - From Account Chart
+  Print the Account Balance Report in Normal mode through the wizard - From Account Chart
 -
   !python {model: account.account}: |
-    import netsvc, tools, os, time
-    data_dict = {'model': 'account.account', 'form': {'chart_account_id':ref('account.chart0'),'select_account': False,'display_account':'bal_all','format_perc':0,'filter': 'filter_no','show_columns' :0, 'account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': ref('account.data_fiscalyear') ,'target_move': 'all','periods': [],'id':ref('account.bal'),'context':{'state':'all'}}}
-    (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [ref('account.bal'),ref('account.gpf')], data_dict, {'periods': []})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal.'+format), 'wb+').write(data)
-
-    data_dict.update({'model': 'ir.ui.menu'})
-    data_dict['form'].update({'active_ids':[ref('account.bal'),ref('account.gpf')]})
-
-    (data, format) = netsvc.LocalService('report.account.account.balance').create(cr, uid, [], data_dict, {'periods': []})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-account_balance-normal-menu.'+format), 'wb+').write(data)
-
+    ctx={}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
+    data_dict = {'chart_account_id':ref('account.chart0')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_balance_menu',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Central Journal Report - From Account
 -
   !python {model: account.journal.period}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
-
-    obj_move = self.pool.get('account.move.line')
-    ctx = {}
-    ctx['fiscalyear'] = fy_id
-    ctx['journal_ids'] = journal_ids
-    ctx['chart_account_id'] = ref('account.chart0')
-
-    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
-    (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, journal_period_ids, data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-central_journal.'+format), 'wb+').write(data)
-
-    data_dict.update({'model': 'ir.ui.menu'})
-    data_dict['form'].update({'active_ids':journal_period_ids})
-
-    (data, format) = netsvc.LocalService('report.account.central.journal').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-central_journal-menu.'+format), 'wb+').write(data)
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),
+                         ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    ctx={}
+    ctx.update({'model': 'account.journal.period','active_ids':journal_ids})
+    data_dict = {'chart_account_id':ref('account.chart0')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_central_journal',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the General Journal Report - From Journal
 -
   !python {model: account.journal.period}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
-
-    obj_move = self.pool.get('account.move.line')
-    ctx = {}
-    ctx['fiscalyear'] = fy_id
-    ctx['journal_ids'] = journal_ids
-    ctx['chart_account_id'] = ref('account.chart0')
-
-    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    data_dict = {'model': 'ir.ui.menu','id':journal_period_ids[0], 'form': {'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids, 'active_ids':journal_period_ids}}
-    (data, format) = netsvc.LocalService('report.account.general.journal').create(cr, uid, journal_period_ids, data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-general_journal.'+format), 'wb+').write(data)
-
+    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),
+                         ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
+    ctx={}
+    ctx.update({'model': 'account.journal.period','active_ids':journal_ids})
+    data_dict = {'chart_account_id':ref('account.chart0')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_general_journal',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the General Ledger Report in Normal Mode
 -
   !python {model: account.account}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    acc_ids = [ref('account.bal'),ref('account.gpf')]
-
-    obj_move = self.pool.get('account.move.line')
-    ctx = {}
-    ctx['fiscalyear'] = fy_id
-    ctx['journal_ids'] = journal_ids
-    ctx['chart_account_id'] = ref('account.chart0')
-
-    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-
-    data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query': query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
-    (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, acc_ids, data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger.'+format), 'wb+').write(data)
-
-    data_dict.update({'model': 'ir.ui.menu'})
-    data_dict['form'].update({'active_ids': acc_ids})
-    (data, format) = netsvc.LocalService('report.account.general.ledger').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger-menu.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
+    data_dict = {'chart_account_id':ref('account.chart0'),'landscape':False}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_general_ledger_menu',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the General Ledger Report in Landscape Mode
 -
   !python {model: account.account}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    acc_ids = [ref('account.bal'),ref('account.gpf')]
-
-    obj_move = self.pool.get('account.move.line')
-    ctx = {}
-    ctx['fiscalyear'] = fy_id
-    ctx['journal_ids'] = journal_ids
-    ctx['chart_account_id'] = ref('account.chart0')
-
-    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-
-    data_dict = {'model': 'account.account', 'form': {'initial_balance': 1,'initial_bal_query':query_line,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','sortby': 'sort_date','amount_currency': 0,'landscape':1,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
-    (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, acc_ids, data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger-landscape.'+format), 'wb+').write(data)
-
-    data_dict.update({'model': 'ir.ui.menu'})
-    data_dict['form'].update({'active_ids': acc_ids})
-    (data, format) = netsvc.LocalService('report.account.general.ledger_landscape').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-general_ledger-landscape-menu.'+format), 'wb+').write(data)
-
+    ctx={}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
+    data_dict = {'chart_account_id':ref('account.chart0'),'landscape':True}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_general_ledger_menu',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print Journal Report - From Model
 -
   !python {model: account.journal.period}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
-
-    obj_move = self.pool.get('account.move.line')
-    ctx = {}
-    ctx['fiscalyear'] = fy_id
-    ctx['journal_ids'] = journal_ids
-    ctx['chart_account_id'] = ref('account.chart0')
-
-    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-
-    data_dict = {'model': 'account.journal.period', 'id':journal_period_ids[0], 'form': {'sort_selection': 'date','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'compare_pattern': 'none','account_choice': 'moves','landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':query_line,'target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal') }}
-    (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, journal_period_ids, data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-print_journal.'+format), 'wb+').write(data)
-
-    data_dict.update({'model': 'ir.ui.menu'})
-    data_dict['form'].update({'active_ids':journal_period_ids})
-
-    (data, format) = netsvc.LocalService('report.account.journal.period.print').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-print_journal-menu.'+format), 'wb+').write(data)
-
+    ctx={}
+    ctx.update({'model': 'account.journal.period','active_ids':journal_ids})
+    data_dict = {'chart_account_id':ref('account.chart0')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_print_journal',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Partner Balance Report
 -
-  !python {model: res.partner}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-    journal_period_ids = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', journal_ids), ('period_id', 'in', period_list)], context=context)
-    obj_move = self.pool.get('account.move.line')
-    ctx = {}
-    ctx['fiscalyear'] = fy_id
-    ctx['journal_ids'] = journal_ids
-    ctx['chart_account_id'] = ref('account.chart0')
-
-    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-
-    data_dict = {'model': 'ir.ui.menu', 'form': {'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'active_ids':journal_period_ids,'display_partner': 'all','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
-    (data, format) = netsvc.LocalService('report.account.partner.balance').create(cr, uid, journal_period_ids, data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-partner_balance.'+format), 'wb+').write(data)
-
+  !python {model: account.account}: |
+    ctx={}
+    data_dict = {'chart_account_id':ref('account.chart0')}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_partner_balance',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Partner Ledger Report
 -
-  !python {model: res.partner}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-
-    obj_move = self.pool.get('account.move.line')
-    ctx = {}
-    ctx['fiscalyear'] = fy_id
-    ctx['journal_ids'] = journal_ids
-    ctx['chart_account_id'] = ref('account.chart0')
-
-    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-
-    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': True,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
-    (data, format) = netsvc.LocalService('report.account.third_party_ledger').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-partner_ledger.'+format), 'wb+').write(data)
-
+  !python {model: account.account}: |
+    ctx={}
+    data_dict = {'chart_account_id':ref('account.chart0'),'page_split': True}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_partner_ledger',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Partner Ledger-Other Report
 -
   !python {model: res.partner}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
-
-    obj_move = self.pool.get('account.move.line')
-    ctx = {}
-    ctx['fiscalyear'] = fy_id
-    ctx['journal_ids'] = journal_ids
-    ctx['chart_account_id'] = ref('account.chart0')
-
-    query_line = obj_move._query_get(cr, uid, obj='l', context=ctx)
-    data_dict = {'model': 'ir.ui.menu', 'form': {'initial_bal_query':query_line,'amount_currency': 0,'reconcil': True,'initial_balance':1,'page_split': False,'result_selection': 'customer','chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','display_type': 0,'journal_ids':journal_ids,'display_partner': 'non-zero_balance','fiscalyear': fy_id ,'target_move': 'all','query_line':query_line}}
-    (data, format) = netsvc.LocalService('report.account.third_party_ledger_other').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-partner_ledger-other.'+format), 'wb+').write(data)
-
+    ctx={}
+    data_dict = {'chart_account_id':ref('account.chart0'),'page_split': False}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_partner_ledger',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Profit-Loss Report in Normal Mode
 -
   !python {model: account.account}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = []
-    acc_ids = [ref('account.bal'),ref('account.gpf')]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'display_type': False,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal'),'active_ids':acc_ids }}
-    (data, format) = netsvc.LocalService('report.pl.account').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-profit-loss.'+format), 'wb+').write(data)
-
+    ctx={}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')    
 -
   Print the Profit-Loss Report in Horizontal Mode
 -
   !python {model: account.account}: |
-    import netsvc, tools, os, time
-    fy_id = ref('account.data_fiscalyear')
-    period_list = self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', [fy_id])], context=context)
-    journal_ids = []
-    acc_ids = [ref('account.bal'),ref('account.gpf')]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'display_type': True,'chart_account_id':ref('account.chart0'),'display_account':'bal_all','filter': 'filter_no','amount_currency': 0,'landscape':0,'period_manner': 'actual','fiscalyear_id': fy_id ,'query_line':'True ','target_move': 'all','periods': period_list,'journal_ids':journal_ids,'id':ref('account.bal'),'active_ids':acc_ids }}
-    (data, format) = netsvc.LocalService('report.pl.account.horizontal').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-profit-loss-horizontal.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
+    data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') 
+-
+ Print the Analytic Balance Report through the wizard
+-
+  !python {model: account.analytic.account}: |
+    ctx={}
+    ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
+    data_dict = {}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_analytic_balance',wiz_data=data_dict, context=ctx, our_module='account')
+
+-
+ Print the Cost Ledger Report through the wizard
+-
+  !python {model: account.analytic.account}: |
+    ctx={}
+    ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root'),ref('account.analytic_absences'),ref('account.analytic_internal'),ref('account.analytic_our_super_product')]})
+    data_dict = {}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_analytic_cost',wiz_data=data_dict, context=ctx, our_module='account')
+
+-
+ Print the Cost Ledger(Only Quantities) Report through the wizard
+-
+  !python {model: account.analytic.account}: |
+    ctx={}
+    ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root'),ref('account.analytic_absences'),ref('account.analytic_internal'),ref('account.analytic_our_super_product')]})
+    data_dict = {}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_analytic_cost_ledger_journal',wiz_data=data_dict, context=ctx, our_module='account')
+
+-
+ Print the Analytic Journal Report through the wizard
+-
+  !python {model: account.analytic.journal}: |
+    ctx={}
+    ctx.update({'model': 'account.analytic.journal','active_ids': [ref('account.cose_journal_sale'), ref('account.exp'), ref('account.sit')]})
+    data_dict = {}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_analytic_journal',wiz_data=data_dict, context=ctx, our_module='account')
+
+-
+ Print the Inverted Analytic Balance Report through the wizard
+-
+  !python {model: account.analytic.account}: |
+    ctx={}
+    ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
+    data_dict = {}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')   
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_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 1c3743bf3c7..a72d58dd904 100644
--- a/addons/account/wizard/account_report_account_balance.py
+++ b/addons/account/wizard/account_report_account_balance.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-from lxml import etree
-
 from osv import osv
 
 class account_balance_report(osv.osv_memory):
@@ -38,4 +36,4 @@ class account_balance_report(osv.osv_memory):
 
 account_balance_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_aged_partner_balance.py b/addons/account/wizard/account_report_aged_partner_balance.py
index f76beb6bee1..59784e6e15d 100644
--- a/addons/account/wizard/account_report_aged_partner_balance.py
+++ b/addons/account/wizard/account_report_aged_partner_balance.py
@@ -22,8 +22,6 @@
 import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-from lxml import etree
-
 from osv import osv, fields
 from tools.translate import _
 
@@ -79,7 +77,8 @@ class account_aged_trial_balance(osv.osv_memory):
                 }
                 start = stop + relativedelta(days=1)
         data['form'].update(res)
-
+        if data.get('form',False):
+            data['ids']=[data['form'].get('chart_account_id',False)]
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account.aged_trial_balance',
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index 174c172fdaa..b69c6d65d71 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-from lxml import etree
-
 from osv import osv, fields
 from tools.translate import _
 
@@ -86,4 +84,4 @@ class account_bs_report(osv.osv_memory):
 
 account_bs_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_report_profit_loss.py b/addons/account/wizard/account_report_profit_loss.py
index 444d91fa8fd..c526550e789 100644
--- a/addons/account/wizard/account_report_profit_loss.py
+++ b/addons/account/wizard/account_report_profit_loss.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-from lxml import etree
-
 from osv import osv, fields
 
 class account_pl_report(osv.osv_memory):
@@ -60,4 +58,4 @@ class account_pl_report(osv.osv_memory):
 
 account_pl_report()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_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/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot
index d173ea2eaab..8fb73751247 100644
--- a/addons/account_accountant/i18n/account_accountant.pot
+++ b/addons/account_accountant/i18n/account_accountant.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_accountant/i18n/el.po b/addons/account_accountant/i18n/el.po
index a297e367389..50755f0ed3b 100644
--- a/addons/account_accountant/i18n/el.po
+++ b/addons/account_accountant/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-14 07:49+0000\n"
+"PO-Revision-Date: 2010-12-29 13:17+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,11 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Αυτό το άρθωμα δίνει στον Διαχειριστή πρόσβαση σε όλες τις δυνατότητες της "
+"λογιστικής όπως το ημερολόγιο\n"
+"και το Λογιστικό Σχέδιο.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
diff --git a/addons/account_accountant/i18n/es_EC.po b/addons/account_accountant/i18n/es_EC.po
index 82f45ddb4c0..e78454ba159 100644
--- a/addons/account_accountant/i18n/es_EC.po
+++ b/addons/account_accountant/i18n/es_EC.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-22 20:40+0000\n"
+"PO-Revision-Date: 2010-12-28 05:07+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_accountant
@@ -26,6 +26,11 @@ msgid ""
 "items and the chart of accounts.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo proporciona al usuario admin el acceso a todas las "
+"funcionalidades de contabilidad como\n"
+"los asientos y el plan contable.\n"
+"    "
 
 #. module: account_accountant
 #: model:ir.module.module,shortdesc:account_accountant.module_meta_information
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 9c3034fe127..01c34459289 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -384,7 +384,7 @@ class account_analytic_account(osv.osv):
         'ca_to_invoice': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Amount',
             help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.",
             digits_compute=dp.get_precision('Account')),
-        'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theorical Revenue',
+        'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theoretical Revenue',
             help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.",
             digits_compute=dp.get_precision('Account')),
         'hours_quantity': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Hours Tot',
@@ -410,7 +410,7 @@ class account_analytic_account(osv.osv):
         'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin',
             help="Computed using the formula: Invoiced Amount - Total Costs.",
             digits_compute=dp.get_precision('Account')),
-        'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theorical Margin',
+        'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theoretical Margin',
             help="Computed using the formula: Theorial Revenue - Total Costs",
             digits_compute=dp.get_precision('Account')),
         'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)',
diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
index b32bfc2a40c..38feb5553e5 100644
--- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
+++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,16 +31,12 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
 #, python-format
 msgid "AccessError"
 msgstr ""
 
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theorical Revenue"
-msgstr ""
-
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
@@ -69,13 +65,13 @@ msgid "Computed using the formula: Theorial Revenue - Total Costs"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theorical Margin"
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin_rate:0
-msgid "Real Margin Rate (%)"
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -108,6 +104,11 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
 msgid "Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."
@@ -155,7 +156,8 @@ msgid "Invoiced Amount"
 msgstr ""
 
 #. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
 #, python-format
 msgid "You try to bypass an access rule (Document type: %s)."
 msgstr ""
@@ -175,6 +177,11 @@ msgstr ""
 msgid "Real Margin"
 msgstr ""
 
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index 68ad08c2a35..16604362e51 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-12 10:11+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
-"<lorenzo.battistini@agilebg.com>\n"
+"PO-Revision-Date: 2011-01-01 13:31+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:31+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -64,6 +63,14 @@ msgid ""
 "You can also view the report of account analytic summary\n"
 "user-wise as well as month wise.\n"
 msgstr ""
+"\n"
+"Questo moduli è creato per modificare le viste dei conti analitici per "
+"mostrare\n"
+"dati importanti al manager di progetto per una compagnia di servizi.\n"
+"Aggiunge menu per mostrare informazioni rilevanti ad ogni manager.\n"
+"\n"
+"E' inoltre possibile visulizzare il report riepilogativo di conti analitici\n"
+"in modalità utente così come in modalità mensile.\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot
index f75a5d720e9..4190e00e2d0 100644
--- a/addons/account_analytic_default/i18n/account_analytic_default.pot
+++ b/addons/account_analytic_default/i18n/account_analytic_default.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index 058690a2dcd..88bec7f43a9 100644
--- a/addons/account_analytic_default/i18n/el.po
+++ b/addons/account_analytic_default/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-14 08:17+0000\n"
+"PO-Revision-Date: 2010-12-29 11:33+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -60,7 +60,7 @@ msgstr "Προκαθορισμένη Ημερομηνία Λήξης γι' αυ
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Λίστα Παραλαβής"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -89,7 +89,7 @@ msgstr "Προϊόν"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Αναλυτική Κατανομή"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -155,7 +155,7 @@ msgstr "Αλληλουχία"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Γραμμή Τιμολογίου"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -166,7 +166,7 @@ msgstr "Αναλυτικός Λογαριασμός"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr ""
+msgstr "Λογαριασμοί"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
index a92c5097bbd..73e254d3063 100644
--- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot
+++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:47+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:47+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -66,6 +66,12 @@ msgstr ""
 msgid "Analytic Plan Line"
 msgstr ""
 
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
+#, python-format
+msgid "User Error"
+msgstr ""
+
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
@@ -152,7 +158,7 @@ msgid "Sales Order Line"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
 #: view:analytic.plan.create.model:0
 #, python-format
 msgid "Distribution Model Saved"
@@ -174,13 +180,13 @@ msgid "Percentage"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
 #, python-format
 msgid "A model having this name and code already exists !"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "No analytic plan defined !"
 msgstr ""
@@ -198,9 +204,8 @@ msgid "Analytic Plans"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
-#, python-format
-msgid "User Error"
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -264,7 +269,8 @@ msgid "To Date"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
@@ -359,8 +365,9 @@ msgid "Root account of this plan."
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error"
 msgstr ""
@@ -376,7 +383,7 @@ msgid "Quantity"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model !"
 msgstr ""
@@ -387,7 +394,8 @@ msgid "Print Crossovered Analytic"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
 #, python-format
 msgid "No Analytic Journal !"
 msgstr ""
@@ -424,7 +432,7 @@ msgid "Analytic Distribution Lines"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
 #, python-format
 msgid "The Total Should be Between %s and %s"
 msgstr ""
@@ -501,7 +509,7 @@ msgid "The name of the journal must be unique per company !"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
 #, python-format
 msgid "Value Error"
 msgstr ""
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 5692cc2c680..805481c2693 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-25 10:25+0000\n"
+"PO-Revision-Date: 2010-12-31 10:33+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -406,7 +406,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr "Min. Erlaubt (100%)"
+msgstr "Min. Erlaubt (%)"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index 697cb6dca11..ec8afa6aa97 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-19 13:31+0000\n"
-"Last-Translator: Kontaxis Panagiotis <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 08:59+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:31+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -139,7 +139,7 @@ msgstr "Λογαριασμος Αναλυτικής"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Ο κωδικός του ημερολογίου πρέπει να είναι μοναδικός ανά εταιρία !"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
@@ -155,7 +155,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Γραμμή Παραγγελίας"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
@@ -502,7 +502,7 @@ msgstr "Κώδικας Διανομής"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -548,7 +548,7 @@ msgstr "Αλληλουχία"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Το όνομα του ημερολογίου πρέπει να είναι μοναδικός ανά εταιρία !"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index 0292522206d..6e331ed1b83 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.rml
+++ b/addons/account_analytic_plans/report/crossovered_analytic.rml
@@ -150,7 +150,7 @@
           <para style="terp_tblheader_Details_Right">Amount</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Percentage</para>
+          <para style="terp_tblheader_Details_Right">Perc(%)</para>
         </td>
       </tr>
     </blockTable>
@@ -222,7 +222,7 @@
           <para style="terp_tblheader_Details_Right">Amount</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Percentage</para>
+          <para style="terp_tblheader_Details_Right">Perc(%)</para>
         </td>
       </tr>
     </blockTable>
@@ -301,4 +301,4 @@
     </section>
     </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
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/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
index f96013a9b3a..d72d95f22b1 100644
--- a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
+++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:48+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:48+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgid " Accounting Property"
 msgstr ""
 
 #. module: account_anglo_saxon
-#: model:ir.model,name:account_anglo_saxon.model_product_category
-msgid "Product Category"
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
 msgstr ""
 
 #. module: account_anglo_saxon
@@ -50,6 +50,11 @@ msgstr ""
 msgid "Product Template"
 msgstr ""
 
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr ""
+
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Accounting for Anglo Saxon countries"
diff --git a/addons/account_anglo_saxon/i18n/fr.po b/addons/account_anglo_saxon/i18n/fr.po
index a06d14a6798..2399c9b3827 100644
--- a/addons/account_anglo_saxon/i18n/fr.po
+++ b/addons/account_anglo_saxon/i18n/fr.po
@@ -8,20 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-16 17:53+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-31 11:02+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
 msgid " Accounting Property"
-msgstr ""
+msgstr " Propriété de comptabilité"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
diff --git a/addons/account_anglo_saxon/i18n/fr_BE.po b/addons/account_anglo_saxon/i18n/fr_BE.po
deleted file mode 100644
index 54f33713af6..00000000000
--- a/addons/account_anglo_saxon/i18n/fr_BE.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_anglo_saxon
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-24 12:50:50+0000\n"
-"PO-Revision-Date: 2009-11-24 12:50:50+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_anglo_saxon
-#: view:product.category:0
-msgid " Accounting Property"
-msgstr ""
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
-msgid "This module will support the Anglo-Saxons accounting methodology by \n"
-"    changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries \n"
-"    and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
-"    Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at he moment the goods are shipped.\n"
-"    This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account \n"
-"    when the invoice is created to transfer this amount to the debtor or creditor account."
-msgstr ""
-
-#. module: account_anglo_saxon
-#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
-msgid "Stock Account"
-msgstr ""
-
-#. module: account_anglo_saxon
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_anglo_saxon
-#: field:product.category,property_account_creditor_price_difference_categ:0
-#: field:product.template,property_account_creditor_price_difference:0
-msgid "Price Difference Account"
-msgstr ""
-
-#. module: account_anglo_saxon
-#: help:product.category,property_account_creditor_price_difference_categ:0
-#: help:product.template,property_account_creditor_price_difference:0
-msgid "This account will be used to value price difference between purchase price and cost price."
-msgstr ""
-
diff --git a/addons/account_anglo_saxon/i18n/hi.po b/addons/account_anglo_saxon/i18n/hi.po
index 033a87db618..52c69f63bf1 100644
--- a/addons/account_anglo_saxon/i18n/hi.po
+++ b/addons/account_anglo_saxon/i18n/hi.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 11:14+0000\n"
-"Last-Translator: Sanjay Kumar <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 12:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Hindi <hi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
 msgid " Accounting Property"
-msgstr ""
+msgstr " लेखांकन संपत्ति"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
@@ -56,7 +56,7 @@ msgstr "उत्पाद  प्रारूप"
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
 msgid "Stock Accounting for Anglo Saxon countries"
-msgstr ""
+msgstr "अंग्लो Saxon देशों के लिए भण्डार लेखा"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
@@ -100,6 +100,7 @@ msgid ""
 "This account will be used to value price difference between purchase price "
 "and cost price."
 msgstr ""
+"इस खाता का उपयोग क्रय मूल्य और विक्रय मूल्य का अंतर निकालने में किया जायेगा"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "संरचना देखने के लिए अमान्य XML!"
diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po
index e04b4ca782d..d5c13679c57 100644
--- a/addons/account_anglo_saxon/i18n/it.po
+++ b/addons/account_anglo_saxon/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 07:56+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:17+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index 784dd9367c7..c37a93b4be4 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -21,7 +21,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index e2ea514a5cf..91d987c5d9d 100644
--- a/addons/account_budget/i18n/account_budget.pot
+++ b/addons/account_budget/i18n/account_budget.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:49+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -32,13 +32,14 @@ msgid "Budgetary Positions"
 msgstr ""
 
 #. module: account_budget
-#: view:account.budget.crossvered.summary.report:0
-msgid "This wizard is used to print summary of budgets"
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
 msgstr ""
 
 #. module: account_budget
-#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
-msgid "A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping  track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period."
+#: report:account.budget:0
+msgid "Printed at:"
 msgstr ""
 
 #. module: account_budget
@@ -117,6 +118,16 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid "A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period."
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
@@ -182,6 +193,7 @@ msgid "Practical Amt"
 msgstr ""
 
 #. module: account_budget
+#: view:account.analytic.account:0
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
@@ -201,6 +213,7 @@ msgid "Account Budget report for analytic account"
 msgstr ""
 
 #. module: account_budget
+#: view:account.analytic.account:0
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
@@ -235,12 +248,7 @@ msgid "Budget"
 msgstr ""
 
 #. module: account_budget
-#: report:account.budget:0
-msgid "Printed at:"
-msgstr ""
-
-#. module: account_budget
-#: code:addons/account_budget/account_budget.py:0
+#: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -270,9 +278,8 @@ msgid "Budgets"
 msgstr ""
 
 #. module: account_budget
-#: code:addons/account_budget/account_budget.py:0
-#, python-format
-msgid "The General Budget '%s' has no Accounts!"
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
 msgstr ""
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index 7a4a5fa2c9d..46fee9b01c3 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-08-02 21:08+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 12:28+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -214,7 +214,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "Теоретическая сумма"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -252,7 +252,7 @@ msgstr "Напечатано:"
 #: code:addons/account_budget/account_budget.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка !"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
diff --git a/addons/account_budget/report/crossovered_budget_report.rml b/addons/account_budget/report/crossovered_budget_report.rml
index ef45c1bd2a6..63db53ab5ce 100644
--- a/addons/account_budget/report/crossovered_budget_report.rml
+++ b/addons/account_budget/report/crossovered_budget_report.rml
@@ -163,13 +163,13 @@
             <para style="terp_default_9"><font face="Helvetica" size="10.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc'],digits=2) ]]%</para>
@@ -183,13 +183,13 @@
           <para style="terp_tblheader_Details">[[ repeatIn(funct_total(data['form']),'b') ]] Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_pln'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Centre">[[ formatLang(b['tot_perc'],digits=2) ]]%</para>
@@ -200,4 +200,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account_budget/test/account_budget_report.yml b/addons/account_budget/test/account_budget_report.yml
index d0766e31196..40b0175f045 100644
--- a/addons/account_budget/test/account_budget_report.yml
+++ b/addons/account_budget/test/account_budget_report.yml
@@ -1,27 +1,33 @@
 -
-  Print the Analytic Budget Report in Normal mode
+  Print the Analytic Budget Report through wizard
 -
   !python {model: account.analytic.account}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.analytic.account', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'id':ref('account.analytic_root'),'context':{}}}
-    (data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account.analytic_root')], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account_budget-analytic_budget_report.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
+    data_dict = {}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_budget_analytic',wiz_data=data_dict, context=ctx, our_module='account_budget')
+
 -
-  Print the Budget Report in Normal mode
+  Print the Budget Report through wizard
 -
   !python {model: account.budget.post}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.budget.post', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'id':ref('account_budget.account_budget_post_sales0'),'context':{}}}
-    (data, format) = netsvc.LocalService('report.account.analytic.account.budget').create(cr, uid, [ref('account_budget.account_budget_post_sales0')], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account_budget-budget_report.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'account.budget.post','active_ids': [ref('account_budget.account_budget_post_sales0')]})
+    data_dict = {}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_budget_report',wiz_data=data_dict, context=ctx, our_module='account_budget')
+
 -
-  Print the CrossOvered Budget Report in Normal mode
+  Print the CrossOvered Budget Report mode through wizard
 -
   !python {model: crossovered.budget}: |
     import netsvc, tools, os, time
-    data_dict = {'model': 'account.budget.post', 'form': {'date_from':time.strftime("%Y-01-01"),'date_to':time.strftime('%Y-%m-%d'),'report':'analytic-full','id':ref('account_budget.crossovered_budget_budgetoptimistic0'),'context':{}}}
-    (data, format) = netsvc.LocalService('report.crossovered.budget.report').create(cr, uid, [ref('account_budget.crossovered_budget_budgetoptimistic0')], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account_budget-crossovered_budget_report.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'account.budget.post','active_ids': [ref('account_budget.crossovered_budget_budgetoptimistic0')]})
+    data_dict = {}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_budget_crossvered_report',wiz_data=data_dict, context=ctx, our_module='account_budget')
+
diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot
index ed064edbdf1..4348781ba92 100644
--- a/addons/account_cancel/i18n/account_cancel.pot
+++ b/addons/account_cancel/i18n/account_cancel.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:49+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_cancel/i18n/el.po b/addons/account_cancel/i18n/el.po
index 2e9ec2bc140..a4b857490e8 100644
--- a/addons/account_cancel/i18n/el.po
+++ b/addons/account_cancel/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 16:43+0000\n"
+"PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_cancel
@@ -25,6 +25,11 @@ msgid ""
 "journal. If set to true it allows user to cancel entries & invoices.\n"
 "    "
 msgstr ""
+"\n"
+"    Το άρθρωμα πρσθέτει το πεδίο 'Επιτρέπονται ακυρωτικές εγγραφές' στην "
+"μορφή φόρμας του ημερολογίου του λογαριασμού. Εάν είναι αληθές επιτρέπει τον "
+"χρήστη να ακυρώσει εγγραφές και τιμολόγια.\n"
+"    "
 
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
diff --git a/addons/account_chart/i18n/account_chart.pot b/addons/account_chart/i18n/account_chart.pot
index bd19519e330..15e00d2923f 100644
--- a/addons/account_chart/i18n/account_chart.pot
+++ b/addons/account_chart/i18n/account_chart.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:49+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_chart/i18n/el.po b/addons/account_chart/i18n/el.po
index a0fb6b56699..62e1a455336 100644
--- a/addons/account_chart/i18n/el.po
+++ b/addons/account_chart/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2009-09-08 16:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-29 11:58+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
@@ -25,4 +25,4 @@ msgstr "Αφαιρέστε το ελάχιστο πρότυπο λογιστικ
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "Λογιστικό Σχέδιο"
diff --git a/addons/account_chart/i18n/fr.po b/addons/account_chart/i18n/fr.po
index b13a74a00e9..c51260218a1 100644
--- a/addons/account_chart/i18n/fr.po
+++ b/addons/account_chart/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-17 08:22+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-29 10:23+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
@@ -25,4 +24,4 @@ msgstr "Supprime le plan de compte minimal"
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "Plan comptable"
diff --git a/addons/account_chart/i18n/it.po b/addons/account_chart/i18n/it.po
index 215ddad0224..30b45ee044b 100644
--- a/addons/account_chart/i18n/it.po
+++ b/addons/account_chart/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 08:00+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:17+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/account_coda/i18n/account_coda.pot
index 899ae288af1..54c1996cf93 100644
--- a/addons/account_coda/i18n/account_coda.pot
+++ b/addons/account_coda/i18n/account_coda.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:50+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgid "Coda import"
 msgstr ""
 
 #. module: account_coda
-#: code:addons/account_coda/account_coda.py:0
+#: code:addons/account_coda/account_coda.py:51
 #, python-format
 msgid "Coda file not found for bank statement !!"
 msgstr ""
@@ -137,7 +137,7 @@ msgid "Open Statements"
 msgstr ""
 
 #. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
+#: code:addons/account_coda/wizard/account_coda_import.py:167
 #, python-format
 msgid "The bank account %s is not defined for the partner %s.\n"
 ""
@@ -204,7 +204,7 @@ msgid "Coda Logs"
 msgstr ""
 
 #. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
+#: code:addons/account_coda/wizard/account_coda_import.py:311
 #, python-format
 msgid "Result"
 msgstr ""
diff --git a/addons/account_coda/i18n/fr.po b/addons/account_coda/i18n/fr.po
index 6aba409764a..6a4b94b2866 100644
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/account_coda/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-09 11:43+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-31 10:33+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -171,6 +171,10 @@ msgid ""
 "    bank statements from coda files.\n"
 "    "
 msgstr ""
+"\n"
+"    Module d'importation\n"
+"    des relevés bancaires à partir de fichiers coda.\n"
+"    "
 
 #. module: account_coda
 #: view:account.coda:0
diff --git a/addons/account_coda/i18n/fr_BE.po b/addons/account_coda/i18n/fr_BE.po
deleted file mode 100644
index f9055a016bd..00000000000
--- a/addons/account_coda/i18n/fr_BE.po
+++ /dev/null
@@ -1,163 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_coda
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-24 13:11:29+0000\n"
-"PO-Revision-Date: 2009-11-24 13:11:29+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_coda
-#: field:account.coda,journal_id:0
-#: wizard_field:account.coda_import,init,journal_id:0
-msgid "Bank Journal"
-msgstr ""
-
-#. module: account_coda
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_coda
-#: wizard_field:account.coda_import,extraction,note:0
-msgid "Log"
-msgstr ""
-
-#. module: account_coda
-#: wizard_button:account.coda_import,extraction,open:0
-msgid "_Open Statement"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.module.module,shortdesc:account_coda.module_meta_information
-msgid "Account CODA"
-msgstr ""
-
-#. module: account_coda
-#: field:account.coda,name:0
-msgid "Coda file"
-msgstr ""
-
-#. module: account_coda
-#: wizard_view:account.coda_import,init:0
-msgid "Clic on 'New' to select your file :"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
-msgid "Import Coda File"
-msgstr ""
-
-#. module: account_coda
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: account_coda
-#: field:account.coda,note:0
-msgid "Import log"
-msgstr ""
-
-#. module: account_coda
-#: wizard_field:account.coda_import,init,def_receivable:0
-msgid "Default receivable Account"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.module.module,description:account_coda.module_meta_information
-msgid "Module provides functionality to import\n"
-"    bank statements from .csv file.\n"
-"    Import coda file wizard is used to import bank statements."
-msgstr ""
-
-#. module: account_coda
-#: wizard_button:account.coda_import,extraction,end:0
-msgid "_Close"
-msgstr ""
-
-#. module: account_coda
-#: field:account.coda,statement_id:0
-msgid "Generated Bank Statement"
-msgstr ""
-
-#. module: account_coda
-#: view:account.coda:0
-#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
-#: model:ir.actions.act_window,name:account_coda.action_account_coda
-msgid "Coda import"
-msgstr ""
-
-#. module: account_coda
-#: field:account.coda,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: account_coda
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.model,name:account_coda.model_account_coda
-msgid "coda for an Account"
-msgstr ""
-
-#. module: account_coda
-#: wizard_field:account.coda_import,init,def_payable:0
-msgid "Default Payable Account"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.ui.menu,name:account_coda.menu_account_coda
-msgid "Coda Statements"
-msgstr ""
-
-#. module: account_coda
-#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
-msgid "Import Coda Statements"
-msgstr ""
-
-#. module: account_coda
-#: wizard_button:account.coda_import,init,extraction:0
-msgid "_Ok"
-msgstr ""
-
-#. module: account_coda
-#: wizard_view:account.coda_import,extraction:0
-#: wizard_view:account.coda_import,init:0
-msgid "Import Coda Statement"
-msgstr ""
-
-#. module: account_coda
-#: field:account.bank.statement,coda_id:0
-msgid "Coda"
-msgstr ""
-
-#. module: account_coda
-#: wizard_view:account.coda_import,extraction:0
-msgid "Results :"
-msgstr ""
-
-#. module: account_coda
-#: wizard_field:account.coda_import,init,coda:0
-msgid "Coda File"
-msgstr ""
-
-#. module: account_coda
-#: field:account.coda,date:0
-msgid "Import Date"
-msgstr ""
-
-#. module: account_coda
-#: wizard_view:account.coda_import,init:0
-msgid "Select your bank journal :"
-msgstr ""
-
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index 21661cfbf8e..e106adbec1d 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:51+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:295
 #, python-format
 msgid "Follwoup Summary"
 msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:287
 #, python-format
 msgid "\n"
 "\n"
@@ -183,7 +183,7 @@ msgid "Partners"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:138
 #, python-format
 msgid "Invoices Reminder"
 msgstr ""
@@ -369,7 +369,7 @@ msgid "Due"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
 msgstr ""
@@ -430,7 +430,7 @@ msgid "Send email confirmation"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:284
 #, python-format
 msgid "All E-mails have been successfully sent to Partners:.\n"
 "\n"
@@ -615,7 +615,7 @@ msgid "Maturity"
 msgstr ""
 
 #. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:286
 #, python-format
 msgid "E-Mail not sent to following Partners, Email not available !\n"
 "\n"
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 9193ace3705..e9eed9be747 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-26 08:12+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-29 07:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
@@ -88,6 +88,10 @@ msgid ""
 "E-Mail sent to following Partners successfully. !\n"
 "\n"
 msgstr ""
+"\n"
+"\n"
+"Courriel envoyé avec succès aux partenaires suivants. !\n"
+"\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -308,7 +312,7 @@ msgstr ""
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr ""
+msgstr "Envoyer un courriel dans la langue du partenaire"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -490,6 +494,8 @@ msgid ""
 "All E-mails have been successfully sent to Partners:.\n"
 "\n"
 msgstr ""
+"Tous les couriels ont bien été envoyés aux partenaires :.\n"
+"\n"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -584,7 +590,7 @@ msgstr "Lignes de Relances"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr ""
+msgstr "Litige"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
@@ -635,6 +641,8 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
+"Ne changez pas ce message si vous voulez envoyer des courriels dans la "
+"langue du partenaire, ou configurez-le à partir des données de la société"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
@@ -719,7 +727,7 @@ msgstr "Séquence"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(company_name)s : Nom de la société de l'utilisateur"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
diff --git a/addons/account_invoice_layout/account_invoice_layout_demo.xml b/addons/account_invoice_layout/account_invoice_layout_demo.xml
index e49079c9656..96f285caabf 100644
--- a/addons/account_invoice_layout/account_invoice_layout_demo.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_demo.xml
@@ -4,11 +4,7 @@
 
         <record id="demo_message1" model="notify.message">
             <field name="name">OpenERP SA</field>
-            <field name="msg">ERP &amp; CRM Solutions....</field>
-        </record>
-        <record id="demo_message1" model="notify.message">
-            <field name="name">Tiny sprl</field>
-            <field name="msg">Be Expert with the Experts...</field>
+            <field name="msg">ERP &amp; CRM Solutions...</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/account_invoice_layout/i18n/account_invoice_layout.pot b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
index f274428d5e0..abd84e47d10 100644
--- a/addons/account_invoice_layout/i18n/account_invoice_layout.pot
+++ b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:51+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr ""
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
-msgid "Document"
+msgid "Tel. :"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -125,8 +125,9 @@ msgid "Product"
 msgstr ""
 
 #. module: account_invoice_layout
-#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
-msgid "Write Messages"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -148,7 +149,6 @@ msgstr ""
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
-#: report:notify_account.invoice:0
 msgid "Taxes:"
 msgstr ""
 
@@ -158,8 +158,8 @@ msgid "Source Account"
 msgstr ""
 
 #. module: account_invoice_layout
-#: view:account.invoice.special.msg:0
-msgid "Cancel"
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -193,19 +193,17 @@ msgstr ""
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: account_invoice_layout
-#: report:account.invoice.layout:0
-#: model:ir.model,name:account_invoice_layout.model_account_invoice
-#: report:notify_account.invoice:0
-msgid "Invoice"
+msgid "Refund"
 msgstr ""
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
 msgid "Total:"
 msgstr ""
 
@@ -237,9 +235,18 @@ msgid "Amount"
 msgstr ""
 
 #. module: account_invoice_layout
-#: report:account.invoice.layout:0
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr ""
+
+#. module: account_invoice_layout
 #: report:notify_account.invoice:0
-msgid "Tel. :"
+msgid "Net Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -261,7 +268,7 @@ msgstr ""
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
-msgid "Refund"
+msgid "Origin"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -274,6 +281,12 @@ msgstr ""
 msgid "Separator Line"
 msgstr ""
 
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "Invoices Layout Improvement"
@@ -303,7 +316,6 @@ msgstr ""
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
-#: report:notify_account.invoice:0
 msgid "Net Total:"
 msgstr ""
 
@@ -314,13 +326,14 @@ msgstr ""
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
 #: report:notify_account.invoice:0
-msgid "Fax :"
+msgid "Invoice"
 msgstr ""
 
 #. module: account_invoice_layout
-#: model:notify.message,msg:account_invoice_layout.demo_message1
-msgid "Be Expert with the Experts..."
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -334,6 +347,11 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr ""
+
 #. module: account_invoice_layout
 #: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
 msgid "All Notification Messages"
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index 7841a3a0d47..4e6bdfd0aa0 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -27,6 +27,10 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_General_Detail_Content">
       <blockAlignment value="LEFT"/>
@@ -41,6 +45,10 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Tableau6">
       <blockAlignment value="LEFT"/>
@@ -237,20 +245,23 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
+    <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_Invoice_General_Header">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Document</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
+	<td>
+          <para style="terp_tblheader_General_Centre">Origin</para>
+        </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+          <para style="terp_tblheader_General_Centre">Your Reference</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
+    <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_General_Detail_Content">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ o.name ]]</para>
@@ -258,6 +269,9 @@
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
+	<td>
+          <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
+        </td>
         <td>
           <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
         </td>
@@ -389,7 +403,7 @@
           <para style="terp_default_9">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -404,7 +418,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -419,7 +433,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -455,10 +469,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">
@@ -493,4 +507,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index ab7f02f0b6d..eabb8efe9c2 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -27,6 +27,10 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table_General_Detail_Content">
       <blockAlignment value="LEFT"/>
@@ -41,6 +45,10 @@
       <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Tableau6">
       <blockAlignment value="LEFT"/>
@@ -241,20 +249,23 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
+    <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_Invoice_General_Header">
       <tr>
         <td>
-          <para style="terp_tblheader_General_Centre">Document</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Invoice Date</para>
         </td>
+	<td>
+          <para style="terp_tblheader_General_Centre">Origin</para>
+        </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+          <para style="terp_tblheader_General_Centre">Your Reference</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
+    <blockTable colWidths="132.50,132.50,132.50,132.50" style="Table_General_Detail_Content">
       <tr>
         <td>
           <para style="terp_default_Centre_9">[[ o.name ]]</para>
@@ -262,6 +273,9 @@
         <td>
           <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
         </td>
+	<td>
+          <para style="terp_default_Centre_9">[[ o.name or '' ]]</para>
+        </td>
         <td>
           <para style="terp_default_Centre_9">[[ (o.address_invoice_id and o.address_invoice_id.partner_id and o.address_invoice_id.partner_id.ref) or ' ' ]]</para>
         </td>
@@ -382,7 +396,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="395.0,59.0,85.0" style="Tableau3">
+    <blockTable colWidths="390.0,64.0,85.0" style="Tableau3">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -390,14 +404,14 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Net Total:</para>
+          <para style="terp_default_9">Net Total : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="395.0,59.0,85.0" style="Table4">
+    <blockTable colWidths="390.0,64.0,85.0" style="Table4">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -405,14 +419,14 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Taxes:</para>
+          <para style="terp_default_9">Taxes : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="395.0,59.0,85.0" style="Table6">
+    <blockTable colWidths="390.0,64.0,85.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -420,10 +434,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Bold_9">Total:</para>
+          <para style="terp_default_Bold_9">Total : </para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -459,10 +473,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, dp='Account') ]] [[ o.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_8">
@@ -511,4 +525,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/account_invoice_layout/test/account_invoice_layout_report.yml b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
index cdaccf0630c..91967358a3d 100644
--- a/addons/account_invoice_layout/test/account_invoice_layout_report.yml
+++ b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
@@ -19,12 +19,14 @@
     (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('test_invoice_1')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout.'+format), 'wb+').write(data)
+
 -
-  Print the Invoice Layout Report with Message in Normal mode
+  Print the Invoice Layout Report with Message through wizard
 -
   !python {model: account.invoice}: |
-    import netsvc, tools, os, time
-    data_dict = {'model': 'account.invoice', 'form': {'message':ref('account_invoice_layout.demo_message1'),'id':ref('test_invoice_1'),'context':{}}}
-    (data, format) = netsvc.LocalService('report.notify_account.invoice').create(cr, uid, [ref('test_invoice_1')], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout_message_report.'+format), 'wb+').write(data)
\ No newline at end of file
+    ctx={}
+    ctx.update({'model': 'account.invoice','active_ids': [ref('test_invoice_1')]})
+    data_dict = {'message':ref('account_invoice_layout.demo_message1')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_account_invoice_special_msg',wiz_data=data_dict, context=ctx, our_module='account_invoice_layout')
+
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index 0a27f881a59..aa930d5ecf2 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:52+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -246,7 +246,7 @@ msgid "Choose an option for the Payment Order:'Fixed' stands for a date specifie
 msgstr ""
 
 #. module: account_payment
-#: code:addons/account_payment/account_move_line.py:0
+#: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -394,7 +394,7 @@ msgid "The successor message of Communication."
 msgstr ""
 
 #. module: account_payment
-#: code:addons/account_payment/account_move_line.py:0
+#: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "No partner defined on entry line"
 msgstr ""
@@ -450,6 +450,12 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
 #. module: account_payment
 #: field:payment.line,date:0
 msgid "Payment Date"
@@ -552,9 +558,8 @@ msgid "Information"
 msgstr ""
 
 #. module: account_payment
-#: model:ir.actions.report.xml,name:account_payment.payment_order1
-#: model:ir.model,name:account_payment.model_payment_order
-msgid "Payment Order"
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid "A payment order is a payment request from your company to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for."
 msgstr ""
 
 #. module: account_payment
@@ -662,11 +667,6 @@ msgstr ""
 msgid "Total"
 msgstr ""
 
-#. module: account_payment
-#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
-msgid "A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for."
-msgstr ""
-
 #. module: account_payment
 #: view:account.payment.make.payment:0
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index 9e31a75334e..17e488e88c0 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/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-24 14:18+0000\n"
+"PO-Revision-Date: 2010-12-31 10:59+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-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -648,7 +648,7 @@ msgstr "Betriebl. Währung"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment"
-msgstr "Zahlungsausgleich"
+msgstr "Zahlungsverkehr"
 
 #. module: account_payment
 #: report:payment.order:0
diff --git a/addons/account_payment/report/order.rml b/addons/account_payment/report/order.rml
index e47691f54d7..9198b12db25 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -210,7 +210,7 @@
           <para style="terp_default_Centre_8">[[ o.date_prefered == 'fixed' and 'Fixed date' or removeParentNode('para') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ get_company_currency() ]]</para>
+          <para style="terp_default_Centre_8">[[ o.user_id and o.user_id.company_id and o.user_id.company_id.currency_id and o.user_id.company_id.currency_id.name or '' ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -287,4 +287,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
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_sequence/i18n/account_sequence.pot b/addons/account_sequence/i18n/account_sequence.pot
index 4d32e3e4cc2..780ca71b05d 100644
--- a/addons/account_sequence/i18n/account_sequence.pot
+++ b/addons/account_sequence/i18n/account_sequence.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:52+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 4e08ad9112b..12c8383445c 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -27,30 +27,12 @@ from osv import osv, fields
 import decimal_precision as dp
 from tools.translate import _
 
-class account_move_line(osv.osv):
-    _inherit = 'account.move.line'
-
-    def _unreconciled(self, cr, uid, ids, prop, unknow_none, context=None):
-        res = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            res[line.id] = line.debit - line.credit
-            if line.reconcile_partial_id:
-                res[line.id] = 0
-                for partial in line.reconcile_partial_id.line_partial_ids:
-                    res[line.id] += partial.debit - partial.credit
-            res[line.id] = abs(res[line.id])
-        return res
-
-    _columns = {
-        'amount_unreconciled': fields.function(_unreconciled, method=True, string='Unreconciled Amount'),
-    }
-
-account_move_line()
 
 class account_voucher(osv.osv):
 
-    def _get_type(self, cr, uid, ids, context=None):
-        if context is None: context = {}
+    def _get_type(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         return context.get('type', False)
 
     def _get_period(self, cr, uid, context=None):
@@ -164,6 +146,8 @@ class account_voucher(osv.osv):
         return abs(amount - abs(credit - debit))
 
     def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount):
+        if not line_dr_ids and not line_cr_ids:
+            return {'value':{}}
         line_dr_ids = [x[2] for x in line_dr_ids]
         line_cr_ids = [x[2] for x in line_cr_ids]
         return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount)}}
@@ -490,31 +474,32 @@ class account_voucher(osv.osv):
                 continue
             total_credit += line.credit or 0.0
             total_debit += line.debit or 0.0
-
         for line in moves:
             if line.credit and line.reconcile_partial_id and ttype == 'receipt':
                 continue
             if line.debit and line.reconcile_partial_id and ttype == 'payment':
                 continue
-
             original_amount = line.credit or line.debit or 0.0
+            amount_unreconciled = currency_pool.compute(cr, uid, line.currency_id and line.currency_id.id or company_currency, currency_id, abs(line.amount_residual_currency), context=context_multi_currency)
             rs = {
                 'name':line.move_id.name,
                 'type': line.credit and 'dr' or 'cr',
                 'move_line_id':line.id,
                 'account_id':line.account_id.id,
-                'amount_original':currency_pool.compute(cr, uid, company_currency, currency_id, original_amount, context=context_multi_currency),
+                'amount_original': currency_pool.compute(cr, uid, line.currency_id and line.currency_id.id or company_currency, currency_id, line.currency_id and abs(line.amount_currency) or original_amount, context=context_multi_currency),
                 'date_original':line.date,
                 'date_due':line.date_maturity,
-                'amount_unreconciled':currency_pool.compute(cr, uid, company_currency, currency_id, line.amount_unreconciled, context=context_multi_currency)
+                'amount_unreconciled': amount_unreconciled,
+
             }
+
             if line.credit:
-                amount = min(line.amount_unreconciled, total_debit)
-                rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount, context=context_multi_currency)
+                amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_debit), context=context_multi_currency))
+                rs['amount'] = amount
                 total_debit -= amount
             else:
-                amount = min(line.amount_unreconciled, total_credit)
-                rs['amount'] = currency_pool.compute(cr, uid, company_currency, currency_id, amount, context=context_multi_currency)
+                amount = min(amount_unreconciled, currency_pool.compute(cr, uid, company_currency, currency_id, abs(total_credit), context=context_multi_currency))
+                rs['amount'] = amount
                 total_credit -= amount
 
             default['value']['line_ids'].append(rs)
@@ -686,6 +671,7 @@ class account_voucher(osv.osv):
                 debit = -credit
                 credit = 0.0
             sign = debit - credit < 0 and -1 or 1
+            #create the first line of the voucher
             move_line = {
                 'name': inv.name or '/',
                 'debit': debit,
@@ -700,9 +686,7 @@ class account_voucher(osv.osv):
                 'date': inv.date,
                 'date_maturity': inv.date_due
             }
-            if (debit == 0.0 or credit == 0.0 or debit+credit > 0) and (debit > 0.0 or credit > 0.0):
-                master_line = move_line_pool.create(cr, uid, move_line)
-
+            move_line_pool.create(cr, uid, move_line)
             rec_list_ids = []
             line_total = debit - credit
             if inv.type == 'sale':
@@ -711,9 +695,14 @@ class account_voucher(osv.osv):
                 line_total = line_total + currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.tax_amount, context=context_multi_currency)
 
             for line in inv.line_ids:
+                #create one move line per voucher line where amount is not 0.0
                 if not line.amount:
                     continue
-                amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount, context=context_multi_currency)
+                #we check if the voucher line is fully paid or not and create a move line to balance the payment and initial invoice if needed
+                if line.amount == line.amount_unreconciled:
+                    amount = line.move_line_id.amount_residual #residual amount in company currency 
+                else:
+                    amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount, context=context_multi_currency)
                 move_line = {
                     'journal_id': inv.journal_id.id,
                     'period_id': inv.period_id.id,
@@ -752,9 +741,9 @@ class account_voucher(osv.osv):
                         raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name))
                 sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1
                 move_line['amount_currency'] = company_currency <> current_currency and sign * line.amount or 0.0
-                master_line = move_line_pool.create(cr, uid, move_line)
+                voucher_line = move_line_pool.create(cr, uid, move_line)
                 if line.move_line_id.id:
-                    rec_ids = [master_line, line.move_line_id.id]
+                    rec_ids = [voucher_line, line.move_line_id.id]
                     rec_list_ids.append(rec_ids)
 
             if not currency_pool.is_zero(cr, uid, inv.currency_id, line_total):
@@ -763,7 +752,6 @@ class account_voucher(osv.osv):
                 if inv.payment_option == 'with_writeoff':
                     account_id = inv.writeoff_acc_id.id
                 elif inv.type in ('sale', 'receipt'):
-#                if inv.journal_id.type in ('sale','sale_refund', 'cash', 'bank'):
                     account_id = inv.partner_id.property_account_receivable.id
                 else:
                     account_id = inv.partner_id.property_account_payable.id
@@ -775,12 +763,11 @@ class account_voucher(osv.osv):
                     'date': inv.date,
                     'credit': diff > 0 and diff or 0.0,
                     'debit': diff < 0 and -diff or 0.0,
-		    'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0,
-                    'currency_id': company_currency <> current_currency and current_currency or False,
+                    #'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0,
+                    #'currency_id': company_currency <> current_currency and current_currency or False,
                 }
 
                 move_line_pool.create(cr, uid, move_line)
-
             self.write(cr, uid, [inv.id], {
                 'move_id': move_id,
                 'state': 'posted',
@@ -816,6 +803,8 @@ class account_voucher_line(osv.osv):
         currency_pool = self.pool.get('res.currency')
         rs_data = {}
         for line in self.browse(cr, uid, ids, context=context):
+            ctx = context.copy()
+            ctx.update({'date': line.voucher_id.date})
             res = {}
             company_currency = line.voucher_id.journal_id.company_id.currency_id.id
             voucher_currency = line.voucher_id.currency_id.id
@@ -825,13 +814,15 @@ class account_voucher_line(osv.osv):
                 res['amount_original'] = 0.0
                 res['amount_unreconciled'] = 0.0
 
+            elif move_line.currency_id:
+                res['amount_original'] = currency_pool.compute(cr, uid, move_line.currency_id.id, voucher_currency, move_line.amount_currency, context=ctx)
             elif move_line and move_line.credit > 0:
-                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit)
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.credit, context=ctx)
             else:
-                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.debit)
+                res['amount_original'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.debit, context=ctx)
 
             if move_line:
-                res['amount_unreconciled'] = currency_pool.compute(cr, uid, company_currency, voucher_currency, move_line.amount_unreconciled)
+                res['amount_unreconciled'] = currency_pool.compute(cr, uid, move_line.currency_id and move_line.currency_id.id or company_currency, voucher_currency, abs(move_line.amount_residual_currency), context=ctx)
             rs_data[line.id] = res
         return rs_data
 
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index d08e78fa72a..69baf8d1bad 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Unreconciliation transactions"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:259
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -36,6 +36,11 @@ msgstr ""
 msgid "Open Customer Journal Entries"
 msgstr ""
 
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Voucher Date"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Particulars"
@@ -43,11 +48,12 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: view:sale.receipt.report:0
 msgid "Group By..."
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:607
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
 msgstr ""
@@ -79,13 +85,14 @@ msgid "Bill Payment"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher.line,amount_original:0
-msgid "Originial Amount"
+#: code:addons/account_voucher/account_voucher.py:753
+#, python-format
+msgid "You have to configure account base code and account tax code on the '%s' tax!"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
-#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:0
+#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:182
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
 #, python-format
 msgid "Import Entries"
@@ -96,6 +103,11 @@ msgstr ""
 msgid "Account voucher unreconcile"
 msgstr ""
 
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "March"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
 msgid "When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt."
@@ -109,6 +121,8 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,company_id:0
 #: field:account.voucher.line,company_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,company_id:0
 msgid "Company"
 msgstr ""
 
@@ -118,8 +132,8 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,comment:0
-msgid "Write-Off Comment"
+#: help:account.voucher,reference:0
+msgid "Transaction reference number."
 msgstr ""
 
 #. module: account_voucher
@@ -137,6 +151,12 @@ msgstr ""
 msgid "Validate"
 msgstr ""
 
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,day:0
+msgid "Day"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Search Vouchers"
@@ -144,12 +164,14 @@ msgstr ""
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
 msgid "Purchase"
 msgstr ""
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
 #: field:account.voucher.line,account_id:0
+#: field:sale.receipt.report,account_id:0
 msgid "Account"
 msgstr ""
 
@@ -163,9 +185,16 @@ msgstr ""
 msgid "Ok"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
+msgid "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."
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,date_due:0
 #: field:account.voucher.line,date_due:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,date_due:0
 msgid "Due Date"
 msgstr ""
 
@@ -186,6 +215,7 @@ msgstr ""
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
 msgid "Sale"
 msgstr ""
 
@@ -217,11 +247,12 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Bill Information"
+msgid "Other Information"
 msgstr ""
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
+#: selection:sale.receipt.report,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -257,6 +288,12 @@ msgstr ""
 msgid "Amount (in words) :"
 msgstr ""
 
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,nbr:0
+msgid "# of Voucher Lines"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
@@ -282,9 +319,7 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-#: field:account.voucher,partner_id:0
-#: field:account.voucher.line,partner_id:0
-msgid "Partner"
+msgid "Paid Amount"
 msgstr ""
 
 #. module: account_voucher
@@ -293,18 +328,13 @@ msgid "Import Invoices"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
-#, python-format
-msgid "You have to configure account base code and account tax code on the '%s' tax!"
-msgstr ""
-
-#. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Later or Group Funds"
+#: report:voucher.print:0
+msgid "Account :"
 msgstr ""
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
 msgid "Receipt"
 msgstr ""
 
@@ -337,6 +367,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,state:0
+#: view:sale.receipt.report:0
 msgid "State"
 msgstr ""
 
@@ -345,6 +376,17 @@ msgstr ""
 msgid "Accounting Voucher Entries"
 msgstr ""
 
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.unreconcile,remove:0
+msgid "Want to remove accounting entries too ?"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
@@ -352,7 +394,7 @@ msgid "Voucher Entries"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:656
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -380,14 +422,19 @@ msgid "Sales Receipt"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:607
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Other Information"
+msgid "Bill Information"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: account_voucher
@@ -400,15 +447,21 @@ msgstr ""
 msgid "Tax Amount"
 msgstr ""
 
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.invoice:0
-#: code:addons/account_voucher/invoice.py:0
+#: code:addons/account_voucher/invoice.py:32
 #, python-format
 msgid "Pay Invoice"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:753
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
 msgstr ""
@@ -425,7 +478,11 @@ msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
-msgid "Paid Amount"
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: account_voucher
@@ -439,8 +496,13 @@ msgid "The amount of the voucher must be the same amount as the one on the state
 msgstr ""
 
 #. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Directly"
+#: view:account.voucher:0
+msgid "To Review"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Expense Lines"
 msgstr ""
 
 #. module: account_voucher
@@ -450,8 +512,8 @@ msgid "Invoices"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher.unreconcile,remove:0
-msgid "Want to remove accounting entries too ?"
+#: selection:sale.receipt.report,month:0
+msgid "December"
 msgstr ""
 
 #. module: account_voucher
@@ -460,8 +522,15 @@ msgstr ""
 msgid "Voucher Lines"
 msgstr ""
 
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,month:0
+msgid "Month"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
+#: field:sale.receipt.report,currency_id:0
 msgid "Currency"
 msgstr ""
 
@@ -471,20 +540,35 @@ msgid "Payable and Receivables"
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.print:0
-msgid "Account :"
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
 #: report:voucher.print:0
 msgid "Draft"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,type:0
-msgid "Default Type"
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
 msgstr ""
 
 #. module: account_voucher
@@ -492,11 +576,22 @@ msgstr ""
 msgid "Currency:"
 msgstr ""
 
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "PRO-FORMA"
 msgstr ""
 
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "August"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
 msgid "The supplier payment form allows you to track the payment you do to your suppliers. When you select a supplier, the payment method and an amount for the payment, OpenERP will propose to reconcile your payment with the open supplier invoices or bills."
@@ -507,6 +602,11 @@ msgstr ""
 msgid "Total Amount"
 msgstr ""
 
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "June"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Cr/Dr"
@@ -530,16 +630,18 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,date:0
 #: field:account.voucher.line,date_original:0
+#: field:sale.receipt.report,date:0
 msgid "Date"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Post"
+#: selection:sale.receipt.report,month:0
+msgid "November"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
+#: view:sale.receipt.report:0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -559,8 +661,14 @@ msgid "Write-Off Analytic Account"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Expense Lines"
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Directly"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "October"
 msgstr ""
 
 #. module: account_voucher
@@ -568,6 +676,11 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "January"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
@@ -585,11 +698,16 @@ msgid "Credit"
 msgstr ""
 
 #. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:656
 #, python-format
 msgid "Please define a sequence on the journal !"
 msgstr ""
 
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Through :"
@@ -602,8 +720,8 @@ msgid "Supplier Payment"
 msgstr ""
 
 #. module: account_voucher
-#: help:account.voucher,reference:0
-msgid "Transaction reference number."
+#: view:account.voucher:0
+msgid "Post"
 msgstr ""
 
 #. module: account_voucher
@@ -611,6 +729,12 @@ msgstr ""
 msgid "Invoices and outstanding transactions"
 msgstr ""
 
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
@@ -638,8 +762,8 @@ msgid "Bank Statement"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "To Review"
+#: selection:sale.receipt.report,month:0
+msgid "September"
 msgstr ""
 
 #. module: account_voucher
@@ -647,6 +771,13 @@ msgstr ""
 msgid "Sales Information"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipt Analysis"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
 #: model:res.request.link,name:account_voucher.req_link_voucher
@@ -673,6 +804,8 @@ msgstr ""
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
 msgid "Pro-forma"
 msgstr ""
 
@@ -737,10 +870,17 @@ msgstr ""
 msgid "Canceled"
 msgstr ""
 
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "May"
+msgstr ""
+
 #. module: account_voucher
 #: field:account.statement.from.invoice,journal_ids:0
 #: view:account.voucher:0
 #: field:account.voucher,journal_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,journal_id:0
 msgid "Journal"
 msgstr ""
 
@@ -755,6 +895,11 @@ msgstr ""
 msgid "Credits"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Original Amount"
+msgstr ""
+
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "State:"
@@ -766,12 +911,16 @@ msgstr ""
 #: view:account.voucher:0
 #: field:account.voucher,pay_now:0
 #: selection:account.voucher,type:0
+#: field:sale.receipt.report,pay_now:0
+#: selection:sale.receipt.report,type:0
 msgid "Payment"
 msgstr ""
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
 #: report:voucher.print:0
 msgid "Posted"
 msgstr ""
@@ -782,8 +931,8 @@ msgid "Customer"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,writeoff_acc_id:0
-msgid "Write-Off account"
+#: selection:sale.receipt.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: account_voucher
@@ -792,8 +941,18 @@ msgid "Supplier Invoices and Outstanding transactions"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Open Supplier Journal Entries"
+#: field:account.voucher,comment:0
+msgid "Write-Off Comment"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+msgid "Default Type"
 msgstr ""
 
 #. module: account_voucher
@@ -807,6 +966,11 @@ msgstr ""
 msgid "Account Entry"
 msgstr ""
 
+#. module: account_voucher
+#: field:sale.receipt.report,state:0
+msgid "Voucher State"
+msgstr ""
+
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
@@ -827,6 +991,17 @@ msgstr ""
 msgid "Untax Amount"
 msgstr ""
 
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_sale_receipt_report
+msgid "Sales Receipt Statistics"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,year:0
+msgid "Year"
+msgstr ""
+
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,amount_unreconciled:0
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index 1c25ed67633..3d803d641ef 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-10 18:11+0000\n"
+"PO-Revision-Date: 2010-12-28 05:10+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -25,7 +25,7 @@ msgstr "Transacciones sin conciliar"
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Ajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -137,7 +137,7 @@ msgstr "Cambiar a borrador"
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "Comentario del desajuste"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
@@ -309,6 +309,13 @@ msgid ""
 "\n"
 "* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
+" * El estado 'Borrador' se utiliza cuando un usuario codifica un recibo "
+"nuevo sin confirmar.\n"
+"* El estado 'Pro-forma' cuando el recibo no tiene un número de recibo.\n"
+"* El estado \"Fijado\" se utiliza cuando el usuario crea el recibo, se "
+"genera un número de recibo y se crean los asientos del recibo en la "
+"contabilidad.\n"
+"* El estado \"Cancelado\" se utiliza cuando el usuario cancela el recibo."
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -354,7 +361,7 @@ msgstr "En cuenta de :"
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "Importe del desajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -469,7 +476,7 @@ msgstr "Monto Pagado"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Diferencia del pago"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
@@ -477,6 +484,8 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -604,7 +613,7 @@ msgstr "Monto conciliado"
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "Cuenta analítica del desajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -647,7 +656,7 @@ msgstr "A través de :"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payment"
-msgstr ""
+msgstr "Pago a Proveedor"
 
 #. module: account_voucher
 #: help:account.voucher,reference:0
@@ -768,7 +777,7 @@ msgstr "¿Desea confirmar este registro?"
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile with Write-Off"
-msgstr ""
+msgstr "Conciliar con desajuste"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -837,12 +846,12 @@ msgstr "Cuenta de desajuste"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "Facturas de proveedor y transiciones de salida"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Abrir asientos de proveedor"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice
@@ -863,7 +872,7 @@ msgstr "Fecha de vigencia de asientos contables"
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Keep Open"
-msgstr ""
+msgstr "Mantener abierto"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index 85e14fb86f5..277b00347a8 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.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-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 22:35+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-29 08:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation transactions"
-msgstr ""
+msgstr "Transactions non rapprochées"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
@@ -45,7 +45,7 @@ msgstr "Particuliers"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index 6916658564f..17f93dc22fc 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/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:43+0000\n"
-"PO-Revision-Date: 2010-10-08 07:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 19:25+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.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:43+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -79,12 +79,12 @@ msgstr ""
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr ""
+msgstr "Płatność rachunku"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Originial Amount"
-msgstr ""
+msgstr "Wartość oryginalna"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
@@ -92,7 +92,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
 #, python-format
 msgid "Import Entries"
-msgstr ""
+msgstr "Importuj zapisy"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
@@ -107,11 +107,15 @@ msgid ""
 "automatically and you can record the customer payment related to this sales "
 "receipt."
 msgstr ""
+"Kiedy sprzedajesz produkty klientowi, to możesz mu dać potwierdzenie "
+"sprzedaży lub fakturę. Kiedy potwierdzisz potwierdzenie sprzedaży, to "
+"tworzone są automatycznie zapisy księgowe i możesz wprowadzić płatność "
+"klienta związaną z tym potwierdzeniem sprzedaży."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay Bill"
-msgstr ""
+msgstr "Zapłać rachunek"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -127,32 +131,32 @@ msgstr "Ustaw na projekt"
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Write-Off Comment"
-msgstr ""
+msgstr "Komentarz odpisu"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Skasuj uzgodnienie"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Statistics"
-msgstr ""
+msgstr "Statystyka poleceń"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate"
-msgstr ""
+msgstr "Zatwierdź"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Search Vouchers"
-msgstr ""
+msgstr "Szukaj poleceń"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 msgid "Purchase"
-msgstr ""
+msgstr "Zakup"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0
@@ -163,7 +167,7 @@ msgstr "Konto"
 #. module: account_voucher
 #: field:account.voucher,line_dr_ids:0
 msgid "Debits"
-msgstr ""
+msgstr "Winien"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
@@ -174,17 +178,17 @@ msgstr ""
 #: field:account.voucher,date_due:0
 #: field:account.voucher.line,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Data płatności"
 
 #. module: account_voucher
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Nie możesz tworzyć zapisu dla zamkniętego konta."
 
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
-msgstr ""
+msgstr "Notatki"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
@@ -199,17 +203,17 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.voucher,type:0
 msgid "Sale"
-msgstr ""
+msgstr "Sprzedaż"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Pozycja zapisu dziennika"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Ref #"
-msgstr ""
+msgstr "Odn #"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -220,32 +224,32 @@ msgstr "Kwota"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "Opcje płatności"
 
 #. module: account_voucher
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Niepoprawna wartość Winien lub Ma w zapisie !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Information"
-msgstr ""
+msgstr "Inofrmacja o rachunku"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Anulowano"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "Data płatności"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Pozycja wyciągu bankowego"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
@@ -257,12 +261,12 @@ msgstr ""
 #: view:account.voucher:0
 #: view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Skasuj uzgodnienie"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Podatek"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -279,6 +283,7 @@ msgstr "Konto analityczne"
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Nie możesz tworzyć zapisów bez partnera na kontach należności/płatności."
 
 #. module: account_voucher
 #: help:account.voucher,state:0
@@ -296,7 +301,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
 msgid "Go"
-msgstr ""
+msgstr "Przejdź"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -308,7 +313,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr ""
+msgstr "Importuj faktury"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
@@ -316,36 +321,37 @@ msgstr ""
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
 msgstr ""
+"Musisz skonfigurować rejestr podstawy i rejestr podatku dla podatku '%s' !"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "Zapłać później lub grupuj płatności"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 msgid "Receipt"
-msgstr ""
+msgstr "Potwierdzenie"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "On Account of :"
-msgstr ""
+msgstr "Na koncie:"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Write-Off Amount"
-msgstr ""
+msgstr "Wartość odpisu"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Lines"
-msgstr ""
+msgstr "Pozycje sprzedaży"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Date:"
-msgstr ""
+msgstr "Data:"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -357,7 +363,7 @@ msgstr "Okres"
 #: view:account.voucher:0
 #: field:account.voucher,state:0
 msgid "State"
-msgstr "Województwo"
+msgstr "Stan"
 
 #. module: account_voucher
 #: model:ir.module.module,shortdesc:account_voucher.module_meta_information
@@ -374,7 +380,7 @@ msgstr ""
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Błąd !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -384,12 +390,12 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
 msgid "Vouchers Entries"
-msgstr ""
+msgstr "Zapisy polecenia"
 
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Memo"
-msgstr ""
+msgstr "Notatka"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -402,55 +408,55 @@ msgstr ""
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Niedozwolona akcja !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Information"
-msgstr ""
+msgstr "Inne informacje"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "Kasowanie uzgodnień"
 
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Kwota Podatku"
 
 #. module: account_voucher
 #: view:account.invoice:0
 #: code:addons/account_voucher/invoice.py:0
 #, python-format
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Zapłać fakturę"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
-msgstr ""
+msgstr "Brak rejestru podstawy i rejestru podatku !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr ""
+msgstr "Informacje o płatności"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Entry"
-msgstr ""
+msgstr "Zapis polecenia"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Paid Amount"
-msgstr ""
+msgstr "Zapłacona wartość"
 
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Różnica w płatności"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
@@ -462,24 +468,24 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
 msgid "Pay Directly"
-msgstr ""
+msgstr "Zapłać od razu"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
 #: field:account.statement.from.invoice.lines,line_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Faktury"
 
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr ""
+msgstr "Chcesz usunąć zapisy również ?"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Lines"
-msgstr ""
+msgstr "Pozycje polecenia"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
@@ -489,7 +495,7 @@ msgstr "Waluta"
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "Zobowiązania i należności"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -506,12 +512,12 @@ msgstr "Projekt"
 #. module: account_voucher
 #: field:account.voucher,type:0
 msgid "Default Type"
-msgstr ""
+msgstr "Typ domyślny"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Currency:"
-msgstr ""
+msgstr "Waluta:"
 
 #. module: account_voucher
 #: report:voucher.print:0
@@ -526,16 +532,19 @@ msgid ""
 "the payment, OpenERP will propose to reconcile your payment with the open "
 "supplier invoices or bills."
 msgstr ""
+"Formularz Płatności dla dostawcy pozwala ci przeglądać te płatności. Możesz "
+"wybrać dostawcę, metodę płatności i wartości. OpenERP zaproponuje ci "
+"uzgodnienie płatności z otwartymi fakturami."
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Suma kwot"
 
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Cr/Dr"
-msgstr ""
+msgstr "Ma/Wn"
 
 #. module: account_voucher
 #: field:account.voucher,audit:0
@@ -545,12 +554,12 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Warunki płatności"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record ?"
-msgstr ""
+msgstr "Na pewno chcesz skasowac uzgodnienia tego rekordu ?"
 
 #. module: account_voucher
 #: field:account.voucher,date:0
@@ -561,37 +570,37 @@ msgstr "Data"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "Zaksięguj"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozszerzone filtry..."
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Number:"
-msgstr ""
+msgstr "Numer:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "Kwota uzgodniona"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "Konto analityczne odpisów"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Expense Lines"
-msgstr ""
+msgstr "Pozycje wydatków"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "Poprzednia płatność ?"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
@@ -602,7 +611,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Compute Tax"
-msgstr ""
+msgstr "Oblicz podatki"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -613,23 +622,23 @@ msgstr "Ma"
 #: code:addons/account_voucher/account_voucher.py:0
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr ""
+msgstr "Zdefiniuj numerację dla dziennika !"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "Through :"
-msgstr ""
+msgstr "Przez:"
 
 #. module: account_voucher
 #: 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 "Płatność Dostawcy"
 
 #. module: account_voucher
 #: help:account.voucher,reference:0
 msgid "Transaction reference number."
-msgstr ""
+msgstr "Numer odnośny transakcji"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -639,12 +648,12 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "Data rachunku"
 
 #. module: account_voucher
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "Firma musi odpowiednia do konta i okresu."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -660,17 +669,17 @@ msgstr "Numer"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Wyciąg bankowy"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "To Review"
-msgstr ""
+msgstr "Do sprawdzenia"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sales Information"
-msgstr ""
+msgstr "Informacja o sprzedaży"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
@@ -681,12 +690,12 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Items"
-msgstr ""
+msgstr "Pozycje polecenia"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -706,7 +715,7 @@ msgstr ""
 #: field:account.voucher,move_ids:0
 #: model:ir.model,name:account_voucher.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Pozycje zapisów dziennika"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -714,23 +723,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payment"
-msgstr ""
+msgstr "Płatności klienta"
 
 #. module: account_voucher
 #: field:account.move.line,amount_unreconciled:0
 msgid "Unreconciled Amount"
-msgstr ""
+msgstr "Kowta nieuzgodniona"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice
 msgid "Import Invoices in Statement"
-msgstr ""
+msgstr "Importuj faktury do wyciągu"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay"
-msgstr ""
+msgstr "Zapłać"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -740,17 +749,17 @@ msgstr "Winien"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr ""
+msgstr "Na pweno chcesz potwierdzić ten rekord ?"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile with Write-Off"
-msgstr ""
+msgstr "Uzgodnij z odpisem"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr ""
+msgstr "Metoda płatności"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
@@ -767,23 +776,23 @@ msgstr "Anulowano"
 #: view:account.voucher:0
 #: field:account.voucher,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dziennik"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Uwagi wewnętrzne"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "Ma"
 
 #. module: account_voucher
 #: report:voucher.print:0
 msgid "State:"
-msgstr ""
+msgstr "Stan:"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -792,7 +801,7 @@ msgstr ""
 #: field:account.voucher,pay_now:0
 #: selection:account.voucher,type:0
 msgid "Payment"
-msgstr ""
+msgstr "Płatność"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -804,28 +813,28 @@ msgstr "Zaksięgowano"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Customer"
-msgstr ""
+msgstr "Klient"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Konto odpisów"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier Invoices and Outstanding transactions"
-msgstr ""
+msgstr "Faktury dostawców  i inne transakcje"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Otwarte zapisy dostawcy"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
 msgid "Entries by Statement from Invoices"
-msgstr ""
+msgstr "Zapisy faktur wg wyciągów"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
@@ -835,12 +844,12 @@ msgstr "Zapis na koncie"
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
-msgstr ""
+msgstr "Efektywna data zapisów"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Keep Open"
-msgstr ""
+msgstr "Pozostaw otwarte"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -848,11 +857,13 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disable"
 msgstr ""
+"Jeśli skasujesz uzgodnienie transakcji, to musisz sprawdzić wszystkie akcje "
+"powiązane z tymi transakcjami, ponieważ one nie zostaną zdezaktywowane."
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
 msgid "Untax Amount"
-msgstr ""
+msgstr "Kowta bez podatku"
 
 #. module: account_voucher
 #: view:account.voucher:0
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py
index cef854aa953..06511c9a118 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt.py
+++ b/addons/account_voucher/report/account_voucher_sales_receipt.py
@@ -17,11 +17,8 @@
 #    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):
diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
index a1793527f67..d3fd720ec6d 100644
--- a/addons/account_voucher/test/sales_receipt.yml
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -3,7 +3,7 @@
 - 
   !record {model: account.voucher, id: account_voucher_seagate_0}:
     account_id: account.a_recv
-    amount: 0.0
+    amount: 30000.0
     company_id: base.main_company
     currency_id: base.EUR
     journal_id: account.sales_journal
@@ -13,7 +13,6 @@
         type: cr
     partner_id: base.res_partner_seagate
     period_id: account.period_9
-    tax_amount: 0.0
     type: sale
     
 -
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 3a3e996975f..e73354eb59a 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -89,13 +89,13 @@
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
                             on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
                             string="Payment Method"/>
-                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="2"/>
                         <field name="account_id"
@@ -152,13 +152,13 @@
                 <form string="Bill Payment">
                     <group col="6" colspan="4">
                         <field name="partner_id" domain="[('supplier','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" context="{'invoice_currency':currency_id}" string="Supplier"/>
-                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
                             on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
                             string="Payment Method"/>
-                        <field name="amount" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="2"/>
                         <field name="account_id"
@@ -199,9 +199,9 @@
                             <group col="2" colspan="1">
                                 <group col="2" colspan="1">
                                     <separator string="Payment Options" colspan="2"/>
+                                    <field name="payment_option" required="1"/>
                                     <field name="writeoff_amount"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
-                                    <field name="payment_option" required="1"/>
                                     <field name="writeoff_acc_id"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
                                            domain="[('type','=','other')]"/>
@@ -211,6 +211,7 @@
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"
                                            groups="analytic.group_analytic_accounting"/>
                                 </group>
+                                <separator string="Other Information" colspan="2"/>
                                 <group col="4" colspan="1">
                                   <field name="currency_id" invisible="True"/>
                                   <field name="number"/>
@@ -236,6 +237,8 @@
                                    <field name="credit"/>
                                    <field name="state"/>
                                    <field name="reconcile_id"/>
+                                   <field name="amount_currency"/>
+                                   <field name="currency_id"/>
                                </tree>
                             </field>
                         </page>
@@ -286,15 +289,15 @@
                 <form string="Customer Payment">
                     <group col="6" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)" string="Customer"/>
-                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="amount"
+                            string="Paid Amount"
+                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
                             widget="selection" select="1"
                             on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"
                             string="Payment Method"/>
-                        <field name="amount"
-                            string="Paid Amount"
-                            on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date)"/>
+                        <field name="date" select="1" on_change="onchange_date(partner_id, journal_id, amount, currency_id, type, date)"/>
                         <field name="reference" select="1" string="Payment Ref"/>
                         <field name="name" colspan="2"/>
                         <field name="account_id"
@@ -373,6 +376,8 @@
                                    <field name="credit"/>
                                    <field name="state"/>
                                    <field name="reconcile_id"/>
+                                   <field name="amount_currency"/>
+                                   <field name="currency_id"/>
                                </tree>
                             </field> 
                         </page>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 3367b08583b..918099487ab 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -167,7 +167,7 @@
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
                         <group attrs="{'invisible':[('state','!=','posted')]}">
-                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+                           <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                     </group>
@@ -286,7 +286,7 @@
                         <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
                         <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
                         <group attrs="{'invisible':[('state','!=','posted')]}">
-                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','!=','pay_now')]}"/>
+                            <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':[('pay_now','=','pay_now')]}"/>
                         </group>
                         <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
                         <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index a75513b02fc..f3ce59f7b0b 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -39,11 +39,11 @@ class account_statement_from_invoice_lines(osv.osv_memory):
             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')
@@ -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()
 
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 a94d1a36a9d..03e9a9608cd 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -208,6 +208,10 @@ class account_analytic_account(osv.osv):
             args=[]
         if context is None:
             context={}
+        if context.get('current_model') == 'project.project':
+            cr.execute("select analytic_account_id from project_project")
+            project_ids = [x[0] for x in cr.fetchall()]
+            return self.name_get(cr, uid, project_ids, context=context)
         account = self.search(cr, uid, [('code', '=', name)]+args, limit=limit, context=context)
         if not account:
             account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)]+args, limit=limit, context=context)
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index b7168d550db..19aa2f7a86e 100644
--- a/addons/analytic/i18n/analytic.pot
+++ b/addons/analytic/i18n/analytic.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -166,6 +166,11 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Cancelled"
diff --git a/addons/analytic/i18n/el.po b/addons/analytic/i18n/el.po
index 0bab19b40d6..1e23d22be8b 100644
--- a/addons/analytic/i18n/el.po
+++ b/addons/analytic/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-10-23 07:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 10:18+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -30,7 +30,7 @@ msgstr "Όνομα λογαριασμού"
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr ""
+msgstr "Καθορίζει την επιμετρούμενη ποσότητα"
 
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
@@ -38,6 +38,8 @@ msgid ""
 "Module for defining analytic accounting object.\n"
 "    "
 msgstr ""
+"Άρθρωμα προς ορισμό αντικειμένου αναλυτικής λογιστικής\n"
+"    "
 
 #. module: analytic
 #: field:account.analytic.account,state:0
@@ -101,7 +103,7 @@ msgstr "Εκκρεμεί"
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Γραμμή Αναλυτικής"
 
 #. module: analytic
 #: field:account.analytic.account,description:0
@@ -143,7 +145,7 @@ msgstr "Ημερομηνία"
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Νόμισμα Λογαριασμού"
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
@@ -157,11 +159,14 @@ msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
 msgstr ""
+"Υπολογίστηκε πολλαπλασιάζοντας τη νποσότητα επί την τιμή που προκύπτει από "
+"την τιμή κόστους του πίνακα Προϊόντων. Πάντα εκφράζεται στο κύριο νόμισμα "
+"της εταιρείας."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of quantity of hours."
-msgstr ""
+msgstr "Θέτει τα ανώτατα όρια των ωρών"
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -199,6 +204,8 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
+"Εαν επιλέξετε Προβολή Τύπου, αυτό σημαίνει ότι δεν θα επιτρέπετε την "
+"δημιουργία εγγραφών ημερολογίου χρησιμοποιόντας αυτόν τον λογαριασμό."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
diff --git a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
index b60207b0480..5e03dbc4dc4 100644
--- a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
+++ b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -31,6 +31,11 @@ msgstr ""
 msgid "Analytic Journal"
 msgstr ""
 
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
 msgid "Billing Rate per Journal for this Analytic Account"
@@ -58,8 +63,8 @@ msgid "Analytic Journal Billing Rate, Define the default invoicing rate for a sp
 msgstr ""
 
 #. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
 msgstr ""
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_journal_billing_rate/i18n/el.po b/addons/analytic_journal_billing_rate/i18n/el.po
index 0bc307f16c2..8a724de4c7a 100644
--- a/addons/analytic_journal_billing_rate/i18n/el.po
+++ b/addons/analytic_journal_billing_rate/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2009-09-08 13:49+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2010-12-29 10:33+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
@@ -71,7 +71,7 @@ msgstr ""
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Τιμολόγιο"
 
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,rate_id:0
@@ -86,7 +86,7 @@ msgstr ""
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
 
 #~ msgid "Analytic Journal Billing Rate"
 #~ msgstr "Ποσό Τιμολόγησης Ημερολόγιου Αναλυτικής"
diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index ff2e4d75cf5..3a8e9b34445 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,8 @@ msgid "Product"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -49,7 +50,13 @@ msgid "User"
 msgstr ""
 
 #. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:97
+#: code:addons/analytic_user_function/analytic_user_function.py:132
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index 4d7a72247e4..e9e6735e6e9 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 09:08+0000\n"
+"PO-Revision-Date: 2010-12-28 07:56+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index 9070ce6f58a..1b608fd9fe5 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-08-03 02:54+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 13:04+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -26,12 +26,12 @@ msgstr "Προϊόν"
 #: code:addons/analytic_user_function/analytic_user_function.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Σφάλμα!"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Γραμμή Φύλλου Xρόνου Eργασίας"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
@@ -55,6 +55,7 @@ msgstr "Χρήστης"
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
+"Δεν έχει οριστεί λογαριασμός εξόδων για αυτό το προϊόν: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index 52e1d44d796..f2530273b70 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-12-27 08:02+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 07:11+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-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -77,6 +77,20 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"\n"
+"    Questo modulo vi permette di definire qual'è la funzione default di uno "
+"specifico utente su un dato conto. Questo è molto utile quando un utente "
+"codifica il suo timesheet: i valori sono recuperati e i campi sono compilati "
+"automaticamente... ma la possibilità di cambiare questi valori è ancora "
+"disponibile.\n"
+"\n"
+"    Ovviamente se nessun dato è stato impostato per il conto attuale, è "
+"fornito il valore di default, come al solito, prelevato dai dati impiegato "
+"in modo che, questo modulo, risulti perfettamente compatibile con vecchie "
+"configurazioni.\n"
+"\n"
+"    "
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
diff --git a/addons/association/i18n/association.pot b/addons/association/i18n/association.pot
index 589397256a6..edea687c40c 100644
--- a/addons/association/i18n/association.pot
+++ b/addons/association/i18n/association.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/association/i18n/de.po b/addons/association/i18n/de.po
index a2b1ebcea34..b5502df4edc 100644
--- a/addons/association/i18n/de.po
+++ b/addons/association/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 09:11+0000\n"
+"PO-Revision-Date: 2010-12-28 07:54+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
diff --git a/addons/association/i18n/el.po b/addons/association/i18n/el.po
index 466b740772c..7babf378768 100644
--- a/addons/association/i18n/el.po
+++ b/addons/association/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:20+0000\n"
+"PO-Revision-Date: 2010-12-29 09:55+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -135,7 +135,7 @@ msgstr "Διαχείριση Έργων"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Παραμετροποίηση"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/association/i18n/it.po b/addons/association/i18n/it.po
index 9d4b2553908..b7ec3bd0db5 100644
--- a/addons/association/i18n/it.po
+++ b/addons/association/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 07:49+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 08:30+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index cb8dfc45376..7f34eb6697c 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -913,6 +913,8 @@
        <field name="action">sign_out</field>
        <field name="employee_id" ref="employee2" />
     </record>
-
+    <record id="base.user_demo" model="res.users">
+        <field name="groups_id" eval="[(4,ref('auction.group_auction_manager'))]"/> 
+    </record>
     </data>
 </openerp>
diff --git a/addons/auction/i18n/ar.po b/addons/auction/i18n/ar.po
index 1d0c72ca99b..2dd5dc150d1 100644
--- a/addons/auction/i18n/ar.po
+++ b/addons/auction/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 66c5eb6c020..feb73c38a3a 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:57+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:57+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -292,13 +292,13 @@ msgid "Object Image"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
 #, python-format
 msgid "No buyer is set for this lot."
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:578
 #, python-format
 msgid "The Buyer \"%s\" has no Invoice Address."
 msgstr ""
@@ -373,7 +373,7 @@ msgid "June"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
 #, python-format
 msgid "No Lots belong to this Auction Date"
 msgstr ""
@@ -501,7 +501,8 @@ msgid "Payment"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
 #, python-format
 msgid "The object \"%s\" has no buyer assigned."
 msgstr ""
@@ -644,8 +645,9 @@ msgid "Account tax for seller"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_lots_invoice.py:0
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -691,6 +693,11 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr ""
+
 #. module: auction
 #: help:auction.lots,ach_emp:0
 msgid "When state is Taken Away, this field is marked as True"
@@ -788,7 +795,7 @@ msgid "(Keep empty for automatic number)"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:578
 #, python-format
 msgid "No Invoice Address"
 msgstr ""
@@ -799,7 +806,8 @@ msgid "Bailiffs Listing"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
 #, python-format
 msgid "This record does not exist !"
 msgstr ""
@@ -1050,15 +1058,19 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
 #, python-format
 msgid "Active IDs not Found"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_aie_send.py:0
-#: code:addons/auction/wizard/auction_aie_send_result.py:0
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
 #, python-format
 msgid "Connection to WWW.Auction-in-Europe.com failed !"
 msgstr ""
@@ -1087,7 +1099,7 @@ msgid "Depositer Inventory"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:692
 #, python-format
 msgid "The Buyer has no Invoice Address."
 msgstr ""
@@ -1301,7 +1313,7 @@ msgid "Deposit Date"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
 #, python-format
 msgid "This lot does not exist !"
 msgstr ""
@@ -1361,7 +1373,7 @@ msgid "Auction Analysis"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_pay_buy.py:0
+#: code:addons/auction/wizard/auction_pay_buy.py:80
 #, python-format
 msgid "Payment aborted !"
 msgstr ""
@@ -1439,11 +1451,6 @@ msgstr ""
 msgid "Lot"
 msgstr ""
 
-#. module: auction
-#: help:aie.category,child_ids:0
-msgid "children aie category"
-msgstr ""
-
 #. module: auction
 #: model:ir.model,name:auction.model_auction_artists
 msgid "auction.artists"
@@ -1529,7 +1536,8 @@ msgid "Last exposition date for auction"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
 #, python-format
 msgid "Missed buyer !"
 msgstr ""
@@ -1545,7 +1553,7 @@ msgid "Auction manager "
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_lots_invoice.py:0
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
 #, python-format
 msgid "Two different buyers for the same invoice !\n"
 "Please correct this problem before invoicing"
@@ -1774,8 +1782,8 @@ msgid "Net revenue"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
-#: code:addons/auction/wizard/auction_pay_buy.py:0
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:87
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1911,7 +1919,7 @@ msgid "Configuration"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_pay_buy.py:0
+#: code:addons/auction/wizard/auction_pay_buy.py:80
 #, python-format
 msgid "You should pay all the total: \"%.2f\" are missing to accomplish the payment."
 msgstr ""
@@ -2044,7 +2052,7 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:692
 #, python-format
 msgid "Missed Address !"
 msgstr ""
@@ -2081,10 +2089,10 @@ msgid "Auction Date:"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_aie_send.py:0
-#: code:addons/auction/wizard/auction_aie_send_result.py:0
-#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2167,7 +2175,7 @@ msgid "Objects Description"
 msgstr ""
 
 #. module: auction
-#: code:addons/auction/wizard/auction_pay_buy.py:0
+#: code:addons/auction/wizard/auction_pay_buy.py:87
 #, python-format
 msgid "No auction date for \"%s\": Please set one."
 msgstr ""
diff --git a/addons/auction/i18n/bg.po b/addons/auction/i18n/bg.po
index 1b326149bdf..17e9536e62d 100644
--- a/addons/auction/i18n/bg.po
+++ b/addons/auction/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/bs.po b/addons/auction/i18n/bs.po
index 6484cab105b..0eb810c0c50 100644
--- a/addons/auction/i18n/bs.po
+++ b/addons/auction/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/ca.po b/addons/auction/i18n/ca.po
index b6210be0201..ec2d7d21256 100644
--- a/addons/auction/i18n/ca.po
+++ b/addons/auction/i18n/ca.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr "Lot"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/cs.po b/addons/auction/i18n/cs.po
index 588096eb0e1..1b56a87a47b 100644
--- a/addons/auction/i18n/cs.po
+++ b/addons/auction/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/de.po b/addons/auction/i18n/de.po
index 30a09fc4301..ad64d4fc7fe 100644
--- a/addons/auction/i18n/de.po
+++ b/addons/auction/i18n/de.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Auktionslos"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/el.po b/addons/auction/i18n/el.po
index d58685861ae..2c3c24e6fa2 100644
--- a/addons/auction/i18n/el.po
+++ b/addons/auction/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr "Παρτίδα"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/es.po b/addons/auction/i18n/es.po
index d21add0d670..609b9590425 100644
--- a/addons/auction/i18n/es.po
+++ b/addons/auction/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-10-30 08:44+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 13:13+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -44,7 +43,7 @@ msgstr "Vendedor"
 #. module: auction
 #: field:auction.lots,name:0
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #. module: auction
 #: field:auction.lots.sms.send,text:0
@@ -56,7 +55,7 @@ msgstr "Mensaje SMS"
 #: view:auction.lots.auction.move:0
 #: view:auction.lots.make.invoice.buyer:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -82,7 +81,7 @@ msgstr "Nº de objetos"
 #. module: auction
 #: view:auction.lots:0
 msgid "Authors"
-msgstr ""
+msgstr "Autores"
 
 #. module: auction
 #: view:auction.bid:0
@@ -129,7 +128,7 @@ msgstr "Importe facturado"
 #. module: auction
 #: help:auction.lots,name:0
 msgid "Auction object name"
-msgstr ""
+msgstr "Nombre objeto subastado"
 
 #. module: auction
 #: model:ir.model,name:auction.model_aie_category
@@ -153,7 +152,7 @@ msgstr "Justificante de depósito"
 #. module: auction
 #: view:auction.deposit:0
 msgid "Reference"
-msgstr ""
+msgstr "Referencia"
 
 #. module: auction
 #: help:auction.dates,state:0
@@ -180,7 +179,7 @@ msgstr "Núm. de lista"
 #. module: auction
 #: report:buyer.list:0
 msgid "Date:"
-msgstr ""
+msgstr "Fecha:"
 
 #. module: auction
 #: field:auction.deposit.cost,name:0
@@ -200,12 +199,12 @@ msgstr "Estado"
 #. module: auction
 #: view:auction.dates:0
 msgid "First Auction Date"
-msgstr ""
+msgstr "Primera fecha subasta"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: auction
 #: help:auction.lot.category,active:0
@@ -222,7 +221,7 @@ msgstr "Ref."
 #. module: auction
 #: field:report.auction,total_price:0
 msgid "Total Price"
-msgstr ""
+msgstr "Precio total"
 
 #. module: auction
 #: view:auction.lots:0
@@ -280,7 +279,7 @@ msgstr "Apuestas"
 #. module: auction
 #: view:auction.lots.buyer_map:0
 msgid "Buyer Map"
-msgstr ""
+msgstr "Mapa compradores"
 
 #. module: auction
 #: field:report.object.encoded,obj_ret:0
@@ -290,18 +289,18 @@ msgstr "Nº obj ret"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_bid
 msgid "Bid Auctions"
-msgstr ""
+msgstr "Pujar subastas"
 
 #. module: auction
 #: help:auction.lots,image:0
 msgid "Object Image"
-msgstr ""
+msgstr "Imagen del objeto"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_buyer_map.py:0
 #, python-format
 msgid "No buyer is set for this lot."
-msgstr ""
+msgstr "No hay comprador para este lote."
 
 #. module: auction
 #: code:addons/auction/auction.py:0
@@ -327,12 +326,12 @@ msgstr "Formulario justificante de depósito"
 #. module: auction
 #: help:auction.lots,statement_id:0
 msgid "Bank statement line for given buyer"
-msgstr ""
+msgstr "Línea extracto bancario para el comprador dado"
 
 #. module: auction
 #: field:auction.lot.category,aie_categ:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
@@ -342,7 +341,7 @@ msgstr "Asociar nombre de comprador a empresas"
 #. module: auction
 #: view:auction.lots:0
 msgid "Search Auction Lots"
-msgstr ""
+msgstr "Buscar lotes subastados"
 
 #. module: auction
 #: field:report.auction,net_revenue:0
@@ -363,7 +362,7 @@ msgstr "Enviar SMS"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: auction
 #: view:auction.lots:0
@@ -376,18 +375,18 @@ msgstr "Vendido"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
 #, python-format
 msgid "No Lots belong to this Auction Date"
-msgstr ""
+msgstr "Ningún lote pertenece a esta fecha de subasta"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: auction
 #: field:auction.bid_line,name:0
@@ -412,17 +411,17 @@ msgstr "Descripción del objeto"
 #. module: auction
 #: field:auction.lots,artist2_id:0
 msgid "Artist/Author2"
-msgstr ""
+msgstr "Artist/Autor2"
 
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Line1"
-msgstr ""
+msgstr "Línea1"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
 msgid "Make Invoice for Buyer"
-msgstr ""
+msgstr "Crear factura para el comprador"
 
 #. module: auction
 #: field:auction.lots,gross_revenue:0
@@ -438,7 +437,7 @@ msgstr "Pagar objetos del comprador"
 #. module: auction
 #: help:auction.dates,auction2:0
 msgid "End date of auction"
-msgstr ""
+msgstr "Fecha fin de la subasta"
 
 #. module: auction
 #: view:auction.lots.sms.send:0
@@ -464,7 +463,7 @@ msgstr "IVA 12%"
 #. module: auction
 #: view:auction.dates:0
 msgid "Buyer Invoices"
-msgstr ""
+msgstr "Facturas comprador"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.res_w_buyer
@@ -479,7 +478,7 @@ msgstr "Precio máximo"
 #. module: auction
 #: help:auction.dates,auction1:0
 msgid "Start date of auction"
-msgstr ""
+msgstr "Fecha inicio de la subasta"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_auction_move
@@ -489,12 +488,12 @@ msgstr ""
 #. module: auction
 #: help:auction.dates,buyer_costs:0
 msgid "Account tax for buyer"
-msgstr ""
+msgstr "Cuenta impuestos para el comprador"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Next Auction"
-msgstr ""
+msgstr "Siguiente subasta"
 
 #. module: auction
 #: view:auction.taken:0
@@ -520,12 +519,12 @@ msgstr "Guardar hasta la venta"
 #. module: auction
 #: view:auction.dates:0
 msgid "Last Auction Date"
-msgstr ""
+msgstr "Fecha última subasta"
 
 #. module: auction
 #: model:account.tax,name:auction.tax_seller
 msgid "Seller Costs (12%)"
-msgstr ""
+msgstr "Costes vendedor (12%)"
 
 #. module: auction
 #: field:auction.lots,paid_vnd:0
@@ -574,12 +573,12 @@ msgstr "%)"
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer Information"
-msgstr ""
+msgstr "Información comprador"
 
 #. module: auction
 #: help:auction.lots,gross_revenue:0
 msgid "Buyer Price - Seller Price"
-msgstr ""
+msgstr "Precio comprador - Precio vendedor"
 
 #. module: auction
 #: field:auction.lots.make.invoice,objects:0
@@ -600,7 +599,7 @@ msgstr "Precio comprador"
 #. module: auction
 #: view:auction.lots:0
 msgid "Bids Details"
-msgstr ""
+msgstr "Detalles de la puja"
 
 #. module: auction
 #: field:auction.lots,is_ok:0
@@ -621,7 +620,7 @@ msgstr "Catálogo de subastas"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax4
@@ -647,14 +646,14 @@ msgstr "Costes indirectos"
 #. module: auction
 #: help:auction.dates,seller_costs:0
 msgid "Account tax for seller"
-msgstr ""
+msgstr "Cuenta impuesto para el vendedor"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_invoice.py:0
 #: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Error de usuario"
 
 #. module: auction
 #: model:ir.module.module,shortdesc:auction.module_meta_information
@@ -692,13 +691,13 @@ msgstr ""
 #. module: auction
 #: view:auction.catalog.flagey:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: auction
 #: view:auction.lots:0
 #: view:report.auction:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: auction
 #: help:auction.lots,ach_emp:0
@@ -747,7 +746,7 @@ msgstr "Estimación mín.:"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: auction
 #: field:report.auction,net_margin:0
@@ -762,7 +761,7 @@ msgstr "¿Límite neto?"
 #. module: auction
 #: field:aie.category,child_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "desconocido"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -788,7 +787,7 @@ msgstr ""
 #. module: auction
 #: view:report.auction:0
 msgid "Auction Summary"
-msgstr ""
+msgstr "Resumen subasta"
 
 #. module: auction
 #: view:auction.lots.make.invoice:0
@@ -811,17 +810,17 @@ msgstr ""
 #: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "This record does not exist !"
-msgstr ""
+msgstr "¡ Este registro no existe !"
 
 #. module: auction
 #: field:auction.pay.buy,total:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Importe total"
 
 #. module: auction
 #: help:auction.pay.buy,amount:0
 msgid "Amount For First Bank Statement"
-msgstr ""
+msgstr "Importe para el primer extracto bancario"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_object_date
@@ -832,7 +831,7 @@ msgstr "Objetos por día"
 #. module: auction
 #: help:auction.lots,author_right:0
 msgid "Account tax for author commission"
-msgstr ""
+msgstr "Cuenta impuesto para la comisión del autor"
 
 #. module: auction
 #: model:product.template,name:auction.monproduit_product_template
@@ -863,12 +862,12 @@ msgstr "Costes extra"
 #. module: auction
 #: view:auction.lots.buyer_map:0
 msgid "Map "
-msgstr ""
+msgstr "Mapa "
 
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer Invoice Reconciled"
-msgstr ""
+msgstr "Factura comprador reconciliada"
 
 #. module: auction
 #: field:auction.deposit,date_dep:0
@@ -888,17 +887,17 @@ msgstr "Costes específicos"
 #. module: auction
 #: report:buyer.list:0
 msgid "To pay ("
-msgstr ""
+msgstr "A pagar ("
 
 #. module: auction
 #: model:account.tax,name:auction.tax_buyer
 msgid "Buyer Costs (20%)"
-msgstr ""
+msgstr "Costes comprador (20%)"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction
 msgid "Dashboard"
-msgstr ""
+msgstr "Cuadro de mandos"
 
 #. module: auction
 #: view:auction.dates:0
@@ -916,12 +915,12 @@ msgstr "Total adjudicaciones"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_make_invoice
 msgid "Make invoice"
-msgstr ""
+msgstr "Crear factura"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: auction
 #: view:auction.dates:0
@@ -932,7 +931,7 @@ msgstr "Historial"
 #. module: auction
 #: field:aie.category,code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: auction
 #: report:auction.code_bar_lot:0
@@ -957,7 +956,7 @@ msgstr "Cancelar"
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer's Payment History"
-msgstr ""
+msgstr "Historial de pagos del comprador"
 
 #. module: auction
 #: view:auction.artists:0
@@ -978,7 +977,7 @@ msgstr "Pagar"
 #. module: auction
 #: view:auction.lots.make.invoice:0
 msgid "Create Invoices For Seller"
-msgstr ""
+msgstr "Crear facturas para el vendedor"
 
 #. module: auction
 #: field:report.object.encoded,obj_margin:0
@@ -1000,6 +999,8 @@ msgstr "Analítico"
 msgid ""
 "When state of Buyer Invoice is 'Paid', this field is selected as True."
 msgstr ""
+"Cuando el estado de la factura del comprador es 'Pagada', este campo se pone "
+"a verdadero."
 
 #. module: auction
 #: report:bids.lots:0
@@ -1026,17 +1027,17 @@ msgstr "Facturar objetos comprador"
 #. module: auction
 #: view:report.auction:0
 msgid "My Auction"
-msgstr ""
+msgstr "Mi subasta"
 
 #. module: auction
 #: help:auction.lots,gross_margin:0
 msgid "(Gross Revenue*100.0)/ Object Price"
-msgstr ""
+msgstr "(Ingresos brutos*100.0)/ Precio objeto"
 
 #. module: auction
 #: field:auction.bid,contact_tel:0
 msgid "Contact Number"
-msgstr ""
+msgstr "Número de contacto"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1064,7 +1065,7 @@ msgstr "Número factura"
 #: code:addons/auction/wizard/auction_lots_numerotate.py:0
 #, python-format
 msgid "Active IDs not Found"
-msgstr ""
+msgstr "No se encontraron IDs activos"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_aie_send.py:0
@@ -1081,7 +1082,7 @@ msgstr "Ingreso bruto"
 #. module: auction
 #: model:ir.actions.act_window,name:auction.open_board_auction
 msgid "Auction board"
-msgstr ""
+msgstr "Tablero subasta"
 
 #. module: auction
 #: field:aie.category,name:0
@@ -1136,7 +1137,7 @@ msgstr "Marcar lotes"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots
 msgid "Auction Object"
-msgstr ""
+msgstr "Objeto subastado"
 
 #. module: auction
 #: field:auction.lots,obj_num:0
@@ -1176,12 +1177,12 @@ msgstr "Derechos de autor"
 #: view:auction.lots:0
 #: view:report.auction:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: auction
 #: help:auction.dates,journal_id:0
 msgid "Account journal for buyer"
-msgstr ""
+msgstr "Diario contable para comprador"
 
 #. module: auction
 #: field:auction.bid,bid_lines:0
@@ -1210,12 +1211,12 @@ msgstr "Vendedores"
 #. module: auction
 #: help:auction.lots,lot_est2:0
 msgid "Maximum Estimate Price"
-msgstr ""
+msgstr "Precio máximo estimado"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -1230,7 +1231,7 @@ msgstr "Nº de artículos no vendidos:"
 #. module: auction
 #: view:auction.dates:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Crear facturas"
 
 #. module: auction
 #: field:auction.bid,auction_id:0
@@ -1247,7 +1248,7 @@ msgstr ", ID"
 #. module: auction
 #: report:buyer.list:0
 msgid "Adj.("
-msgstr ""
+msgstr "Adj.("
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.lot_list_inv
@@ -1257,7 +1258,7 @@ msgstr "Lista de lotes - Horizontal"
 #. module: auction
 #: view:auction.artists:0
 msgid "Author/Artist"
-msgstr ""
+msgstr "Autor/Artista"
 
 #. module: auction
 #: field:auction.lots,ach_login:0
@@ -1283,12 +1284,12 @@ msgstr "Lugar"
 #. module: auction
 #: view:report.auction:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mes -1"
 
 #. module: auction
 #: help:auction.lots,is_ok:0
 msgid "When buyer pay for bank statement', this field is marked"
-msgstr ""
+msgstr "Cuando el comprador paga por extracto bancario', se marca este campo"
 
 #. module: auction
 #: field:auction.lots,ach_emp:0
@@ -1303,12 +1304,12 @@ msgstr "Total ing. bruto"
 #. module: auction
 #: help:auction.lots,lot_est1:0
 msgid "Minimum Estimate Price"
-msgstr ""
+msgstr "Precio mínimo estimado"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Date"
-msgstr ""
+msgstr "Fecha depósito"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_lots_numerotate.py:0
@@ -1319,7 +1320,7 @@ msgstr "¡Este lote no existe!"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: auction
 #: field:auction.bid_line,call:0
@@ -1340,7 +1341,7 @@ msgstr "Estimación mínima"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_sms_send
 msgid "Sms send "
-msgstr ""
+msgstr "Mandar sms "
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -1351,7 +1352,7 @@ msgstr "Cambiar fecha subasta"
 #. module: auction
 #: field:auction.artists,birth_death_dates:0
 msgid "Lifespan"
-msgstr ""
+msgstr "Período de vida"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -1362,19 +1363,19 @@ msgstr "Método de retirada"
 #. module: auction
 #: view:auction.dates:0
 msgid "Buyer Commissions"
-msgstr ""
+msgstr "Comisiones comprador"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_auction
 #: model:ir.ui.menu,name:auction.menu_report_auction
 msgid "Auction Analysis"
-msgstr ""
+msgstr "Análisis subastas"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_pay_buy.py:0
 #, python-format
 msgid "Payment aborted !"
-msgstr ""
+msgstr "¡ Pago abortado !"
 
 #. module: auction
 #: field:auction.lot.history,price:0
@@ -1389,7 +1390,7 @@ msgstr "Inicio de la subasta"
 #. module: auction
 #: help:auction.pay.buy,statement_id3:0
 msgid "Third Bank Statement For Buyer"
-msgstr ""
+msgstr "Tercer extracto bancario para el comprador"
 
 #. module: auction
 #: view:report.auction:0
@@ -1406,7 +1407,7 @@ msgstr "Estimación máxima:"
 #. module: auction
 #: view:auction.lots:0
 msgid "Statistical"
-msgstr ""
+msgstr "Estadística"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_deposit
@@ -1416,17 +1417,17 @@ msgstr ""
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
 msgid "Object statistics"
-msgstr ""
+msgstr "Estadísticas de objeto"
 
 #. module: auction
 #: help:auction.lots,net_margin:0
 msgid "(Net Revenue * 100)/ Object Price"
-msgstr ""
+msgstr "(Ingreso neto * 100)/ Precio del objeto"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
 msgid "Lot History"
-msgstr ""
+msgstr "Historial de lote"
 
 #. module: auction
 #: view:auction.lots.make.invoice:0
@@ -1451,7 +1452,7 @@ msgstr "Lote"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
@@ -1462,12 +1463,12 @@ msgstr "subasta.artistas"
 #. module: auction
 #: field:report.auction,avg_price:0
 msgid "Avg Price."
-msgstr ""
+msgstr "Precio prom."
 
 #. module: auction
 #: help:auction.pay.buy,statement_id2:0
 msgid "Second Bank Statement For Buyer"
-msgstr ""
+msgstr "Segundo extracto bancario para el comprador"
 
 #. module: auction
 #: field:auction.dates,journal_id:0
@@ -1494,7 +1495,7 @@ msgstr "Activa"
 #. module: auction
 #: view:auction.dates:0
 msgid "Exposition Dates"
-msgstr ""
+msgstr "Fechas exposición"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax1
@@ -1536,7 +1537,7 @@ msgstr "Objetos por día"
 #. module: auction
 #: help:auction.dates,expo2:0
 msgid "Last exposition date for auction"
-msgstr ""
+msgstr "Última fecha de exposición para la subasta"
 
 #. module: auction
 #: code:addons/auction/auction.py:0
@@ -1561,11 +1562,13 @@ msgid ""
 "Two different buyers for the same invoice !\n"
 "Please correct this problem before invoicing"
 msgstr ""
+"Dos compradores diferentes para la misma factura !\n"
+"Por favor, corrija este problema antes de facturar"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Invoice"
-msgstr ""
+msgstr "Factura"
 
 #. module: auction
 #: field:auction.lots,vnd_lim:0
@@ -1580,12 +1583,12 @@ msgstr "Transferencia"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Line3"
-msgstr ""
+msgstr "Línea3"
 
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Line2"
-msgstr ""
+msgstr "Línea2"
 
 #. module: auction
 #: help:auction.lots,obj_ret:0
@@ -1620,12 +1623,12 @@ msgstr "Producto"
 #. module: auction
 #: report:buyer.list:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Seller Information"
-msgstr ""
+msgstr "Información vendedor"
 
 #. module: auction
 #: view:auction.deposit:0
@@ -1639,7 +1642,7 @@ msgstr "Objetos"
 #. module: auction
 #: view:auction.dates:0
 msgid "Seller Invoices"
-msgstr ""
+msgstr "Facturas vendedor"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -1654,7 +1657,7 @@ msgstr "Permitir importe negativo"
 #. module: auction
 #: help:auction.pay.buy,amount2:0
 msgid "Amount For Second Bank Statement"
-msgstr ""
+msgstr "Importe para el segundo extracto bancario"
 
 #. module: auction
 #: field:auction.lot.history,auction_id:0
@@ -1666,7 +1669,7 @@ msgstr "Fecha subasta"
 #. module: auction
 #: view:auction.lots.sms.send:0
 msgid "SMS Text"
-msgstr ""
+msgstr "Texto SMS"
 
 #. module: auction
 #: field:auction.dates,auction1:0
@@ -1676,7 +1679,7 @@ msgstr "Primer día subasta"
 #. module: auction
 #: view:auction.lots.make.invoice.buyer:0
 msgid "Create Invoices For Buyer"
-msgstr ""
+msgstr "Crear facturas para el comprador"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1692,12 +1695,12 @@ msgstr "Artistas"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Pay Objects"
-msgstr ""
+msgstr "Pagar objetos"
 
 #. module: auction
 #: help:auction.dates,expo1:0
 msgid "Beginning exposition date for auction"
-msgstr ""
+msgstr "Fecha inicio exposición para la subasta"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
@@ -1712,7 +1715,7 @@ msgstr ""
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_enable
 msgid "Lots Enable"
-msgstr ""
+msgstr "Activar lotes"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1745,7 +1748,7 @@ msgstr "Extracto"
 #: help:auction.lots,seller_price:0
 #: help:auction.lots.make.invoice,amount:0
 msgid "Seller Price"
-msgstr ""
+msgstr "Precio vendedor"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax20
@@ -1766,7 +1769,7 @@ msgstr "Derechos de autor"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lots_buyer_map
 msgid "Map Buyer"
-msgstr ""
+msgstr "Mapa comprador"
 
 #. module: auction
 #: field:report.auction.object.date,name:0
@@ -1791,7 +1794,7 @@ msgstr "Ingreso neto"
 #: code:addons/auction/wizard/auction_pay_buy.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: auction
 #: report:auction.total.rml:0
@@ -1801,7 +1804,7 @@ msgstr "Nº de artículos:"
 #. module: auction
 #: model:account.tax,name:auction.tax_buyer_author
 msgid "Author rights (4%)"
-msgstr ""
+msgstr "Derechos de autor (4%)"
 
 #. module: auction
 #: field:report.object.encoded,estimation:0
@@ -1830,7 +1833,7 @@ msgstr ""
 #. module: auction
 #: view:auction.taken:0
 msgid "OK"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: auction
 #: model:ir.actions.report.xml,name:auction.buyer_form_id
@@ -1846,7 +1849,7 @@ msgstr "Nombre comprador"
 #: view:report.auction:0
 #: field:report.auction,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
@@ -1867,7 +1870,7 @@ msgstr "Cerrado"
 #. module: auction
 #: view:auction.dates:0
 msgid "Search Next Auction Dates"
-msgstr ""
+msgstr "Buscar fechas siguiente subasta"
 
 #. module: auction
 #: view:auction.catalog.flagey:0
@@ -1897,12 +1900,12 @@ msgstr ""
 #. module: auction
 #: help:auction.lots,obj_price:0
 msgid "Object Price"
-msgstr ""
+msgstr "Precio objeto"
 
 #. module: auction
 #: view:auction.bid:0
 msgid "Bids Lines"
-msgstr ""
+msgstr "Líneas pujas"
 
 #. module: auction
 #: view:auction.lots:0
@@ -1912,7 +1915,7 @@ msgstr "Catálogo"
 #. module: auction
 #: help:auction.lots,auction_id:0
 msgid "Auction for object"
-msgstr ""
+msgstr "Subasta para objeto"
 
 #. module: auction
 #: field:auction.deposit.cost,account:0
@@ -1934,7 +1937,7 @@ msgstr ""
 #. module: auction
 #: model:ir.model,name:auction.model_auction_pay_buy
 msgid "Pay buy"
-msgstr ""
+msgstr "Pagar compra"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_outils_menu
@@ -1969,7 +1972,7 @@ msgstr "Artista / Nombre autor"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: auction
 #: field:auction.lots,image:0
@@ -1980,12 +1983,12 @@ msgstr "Imagen"
 #: help:auction.lots,buyer_price:0
 #: help:auction.lots.make.invoice.buyer,amount:0
 msgid "Buyer Price"
-msgstr ""
+msgstr "Precio comprador"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_category
 msgid "Auction Lots Category"
-msgstr ""
+msgstr "Categoría lotes subasta"
 
 #. module: auction
 #: model:account.tax.code,name:auction.account_tax_code_id2
@@ -1995,7 +1998,7 @@ msgstr "IVA 20%"
 #. module: auction
 #: model:ir.model,name:auction.model_auction_payer_sel
 msgid "Auction payment for seller"
-msgstr ""
+msgstr "Pago subasta para vendedor"
 
 #. module: auction
 #: view:auction.lots:0
@@ -2026,7 +2029,7 @@ msgstr "........."
 #. module: auction
 #: view:report.auction:0
 msgid "Auction Summary tree view"
-msgstr ""
+msgstr "Vista resumen de subasta en árbol"
 
 #. module: auction
 #: report:report.auction.buyer.result:0
@@ -2042,7 +2045,7 @@ msgstr "Fechas subasta"
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_board_auction_open
 msgid "Auction DashBoard"
-msgstr ""
+msgstr "Panel de mandos de subasta"
 
 #. module: auction
 #: view:report.auction:0
@@ -2056,7 +2059,7 @@ msgstr "Usuario"
 #. module: auction
 #: view:auction.pay.buy:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
 #. module: auction
 #: code:addons/auction/auction.py:0
@@ -2067,12 +2070,12 @@ msgstr "¡Falta dirección!"
 #. module: auction
 #: help:auction.lots,net_revenue:0
 msgid "Buyer Price - Seller Price - Indirect Cost"
-msgstr ""
+msgstr "Precio comprador - Precio vendedor - Coste indirecto"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
 msgid "Open Bids"
-msgstr ""
+msgstr "Pujas abiertas"
 
 #. module: auction
 #: field:auction.artists,pseudo:0
@@ -2129,7 +2132,7 @@ msgstr "Totales subasta con listas"
 #. module: auction
 #: view:auction.deposit:0
 msgid "General Information"
-msgstr ""
+msgstr "Información general"
 
 #. module: auction
 #: view:auction.lots.auction.move:0
@@ -2149,7 +2152,7 @@ msgstr "Objeto codificado"
 #. module: auction
 #: view:auction.bid:0
 msgid "Search Auction Bid"
-msgstr ""
+msgstr "Buscar puja subasta"
 
 #. module: auction
 #: report:bids.phones.details:0
@@ -2159,7 +2162,7 @@ msgstr "Est"
 #. module: auction
 #: view:auction.dates:0
 msgid "Seller Commissions"
-msgstr ""
+msgstr "Comisiones vendedor"
 
 #. module: auction
 #: view:report.object.encoded:0
@@ -2169,7 +2172,7 @@ msgstr "Estadística objeto"
 #. module: auction
 #: help:auction.dates,journal_seller_id:0
 msgid "Account journal for seller"
-msgstr ""
+msgstr "Diario contable para vendedor"
 
 #. module: auction
 #: field:auction.dates,auction2:0
@@ -2179,7 +2182,7 @@ msgstr "Último día de subasta"
 #. module: auction
 #: view:auction.deposit:0
 msgid "Objects Description"
-msgstr ""
+msgstr "Descripción de objetos"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_pay_buy.py:0
@@ -2197,7 +2200,7 @@ msgstr "Descripción"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: auction
 #: field:auction.lots,obj_price:0
@@ -2217,12 +2220,12 @@ msgstr "Contraseña"
 #. module: auction
 #: selection:report.auction,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: auction
 #: view:auction.pay.buy:0
diff --git a/addons/auction/i18n/es_AR.po b/addons/auction/i18n/es_AR.po
index 8947d0fce92..6c8c55fcff8 100644
--- a/addons/auction/i18n/es_AR.po
+++ b/addons/auction/i18n/es_AR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Lote"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/es_EC.po b/addons/auction/i18n/es_EC.po
index 18e07fab82b..a03504d67e6 100644
--- a/addons/auction/i18n/es_EC.po
+++ b/addons/auction/i18n/es_EC.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr "Lote"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/et.po b/addons/auction/i18n/et.po
index 626a0d1b489..ce5dee2d53a 100644
--- a/addons/auction/i18n/et.po
+++ b/addons/auction/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Partii"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/fi.po b/addons/auction/i18n/fi.po
index 95120d82095..09963892cf4 100644
--- a/addons/auction/i18n/fi.po
+++ b/addons/auction/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/fr.po b/addons/auction/i18n/fr.po
index 85cab263117..df6df8fc58a 100644
--- a/addons/auction/i18n/fr.po
+++ b/addons/auction/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1463,8 +1463,8 @@ msgstr "Lot"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
-msgstr "Sous-categorie aie"
+msgid "children aie category"
+msgstr ""
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_artists
@@ -2800,3 +2800,6 @@ msgstr "Historique de la vente"
 
 #~ msgid "My Latest Objects"
 #~ msgstr "Mes Derniers Objets"
+
+#~ msgid "Childs aie category"
+#~ msgstr "Sous-categorie aie"
diff --git a/addons/auction/i18n/hi.po b/addons/auction/i18n/hi.po
index 6b0e6074df0..6bda3bdb87f 100644
--- a/addons/auction/i18n/hi.po
+++ b/addons/auction/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/hr.po b/addons/auction/i18n/hr.po
index 19e144800b7..d7e4bfa425e 100644
--- a/addons/auction/i18n/hr.po
+++ b/addons/auction/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Lot"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/hu.po b/addons/auction/i18n/hu.po
index 9f67c1054d8..2dd5dc150d1 100644
--- a/addons/auction/i18n/hu.po
+++ b/addons/auction/i18n/hu.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/id.po b/addons/auction/i18n/id.po
index 2316fe3ffcc..9536405ded7 100644
--- a/addons/auction/i18n/id.po
+++ b/addons/auction/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/it.po b/addons/auction/i18n/it.po
index 98c49d8d00b..9b9679534c1 100644
--- a/addons/auction/i18n/it.po
+++ b/addons/auction/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/ko.po b/addons/auction/i18n/ko.po
index af038719d5e..b291af1984b 100644
--- a/addons/auction/i18n/ko.po
+++ b/addons/auction/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index dd9a50c8505..4fdd44bebd2 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 3eb1e3a63c8..a57a1db3fb5 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/nl_BE.po b/addons/auction/i18n/nl_BE.po
index 2bbec55a059..90fe294435b 100644
--- a/addons/auction/i18n/nl_BE.po
+++ b/addons/auction/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/pl.po b/addons/auction/i18n/pl.po
index ced65283c18..935dadf5510 100644
--- a/addons/auction/i18n/pl.po
+++ b/addons/auction/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index ade7e1b1f66..63233d62152 100644
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1452,7 +1452,7 @@ msgstr "Lote"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 6829c6e3e57..e3c543a9f53 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/ro.po b/addons/auction/i18n/ro.po
index a1996caab31..243b7bad4ab 100644
--- a/addons/auction/i18n/ro.po
+++ b/addons/auction/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Lot"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/ru.po b/addons/auction/i18n/ru.po
index 3bdc3f0bbdb..e7885dea7a2 100644
--- a/addons/auction/i18n/ru.po
+++ b/addons/auction/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "Лот"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sl.po b/addons/auction/i18n/sl.po
index a1459c7aa6a..a63c4db0aab 100644
--- a/addons/auction/i18n/sl.po
+++ b/addons/auction/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sq.po b/addons/auction/i18n/sq.po
index 694e708093b..d3e9b7e8083 100644
--- a/addons/auction/i18n/sq.po
+++ b/addons/auction/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sr.po b/addons/auction/i18n/sr.po
index d0153cc8300..d40ed52b173 100644
--- a/addons/auction/i18n/sr.po
+++ b/addons/auction/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1454,7 +1454,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sr@latin.po b/addons/auction/i18n/sr@latin.po
index 3a72a5ba49f..277908ff7ee 100644
--- a/addons/auction/i18n/sr@latin.po
+++ b/addons/auction/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1454,7 +1454,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/sv.po b/addons/auction/i18n/sv.po
index 6d71af4e261..a0458a99d1a 100644
--- a/addons/auction/i18n/sv.po
+++ b/addons/auction/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/tlh.po b/addons/auction/i18n/tlh.po
index aeddac9d2be..c9016eeff63 100644
--- a/addons/auction/i18n/tlh.po
+++ b/addons/auction/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 620da9af390..f07c6534d31 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/uk.po b/addons/auction/i18n/uk.po
index 891737c3007..ad76cb7d132 100644
--- a/addons/auction/i18n/uk.po
+++ b/addons/auction/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/vi.po b/addons/auction/i18n/vi.po
index 23a552be1e9..dba29659e88 100644
--- a/addons/auction/i18n/vi.po
+++ b/addons/auction/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1451,7 +1451,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/zh_CN.po b/addons/auction/i18n/zh_CN.po
index d3980519fda..2fe5e5f895f 100644
--- a/addons/auction/i18n/zh_CN.po
+++ b/addons/auction/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr "批号"
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/i18n/zh_TW.po b/addons/auction/i18n/zh_TW.po
index fe594967bae..cb052fdbceb 100644
--- a/addons/auction/i18n/zh_TW.po
+++ b/addons/auction/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -1450,7 +1450,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/auction/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/audittrail.py b/addons/audittrail/audittrail.py
index b744a10b3d9..2f769246bcf 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
-from osv.osv import osv_pool
+from osv.osv import osv_pool, object_proxy
 from tools.translate import _
 import ir
 import pooler
@@ -184,7 +184,7 @@ class audittrail_log_line(osv.osv):
 audittrail_log_line()
 
 
-class audittrail_objects_proxy(osv_pool):
+class audittrail_objects_proxy(object_proxy):
     """ Uses Object proxy for auditing changes on object of subscribed Rules"""
 
     def get_value_text(self, cr, uid, field_name, values, model, context=None):
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index 1229a63f860..6f6b461d1a6 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -82,7 +82,7 @@
             <field name="search_view_id" ref="view_audittrail_rule_search"/>
         </record>
 
-        <menuitem name="Rules" id="menu_action_audittrail_rule_tree"
+        <menuitem id="menu_action_audittrail_rule_tree"
             action="action_audittrail_rule_tree" parent="base.menu_audit" />
         <!-- AuditTrail Log form -->
 
diff --git a/addons/audittrail/i18n/audittrail.pot b/addons/audittrail/i18n/audittrail.pot
index 2ed7f56e9cc..1aa5dbff883 100644
--- a/addons/audittrail/i18n/audittrail.pot
+++ b/addons/audittrail/i18n/audittrail.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:57+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:57+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Audit Trail"
 msgstr ""
 
 #. module: audittrail
-#: code:addons/audittrail/audittrail.py:0
+#: code:addons/audittrail/audittrail.py:81
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
 msgstr ""
@@ -127,11 +127,6 @@ msgstr ""
 msgid "Log Lines"
 msgstr ""
 
-#. module: audittrail
-#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
-msgid "Rules"
-msgstr ""
-
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,object_id:0
@@ -161,6 +156,7 @@ msgstr ""
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
 msgid "Audit Rules"
 msgstr ""
 
@@ -223,7 +219,7 @@ msgid "Log Reads"
 msgstr ""
 
 #. module: audittrail
-#: code:addons/audittrail/audittrail.py:0
+#: code:addons/audittrail/audittrail.py:82
 #, python-format
 msgid "Change audittrail depends -- Setting rule as DRAFT"
 msgstr ""
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index 44fe5a30527..aba0421531e 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 09:26+0000\n"
+"PO-Revision-Date: 2010-12-28 09:06+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index d2cf7a727e8..09909f467c6 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:45+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:45+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:13+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -71,7 +71,12 @@ msgid "Days"
 msgstr ""
 
 #. module: base_action_rule
-#: code:addons/base_action_rule/base_action_rule.py:0
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -101,11 +106,6 @@ msgstr ""
 msgid "Check this if you want the rule to send a reminder by email to the partner."
 msgstr ""
 
-#. module: base_action_rule
-#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
-msgid "Create actions automatically triggered based on a user activity in the system.E.g.: an opportunity created by a specific user can be automatically maintained with a specific sales team, or an opportunity which still has status pending after 14 days triggers an automatic reminder email."
-msgstr ""
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Partner"
@@ -141,6 +141,11 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid "Use automated actions to automatically trigger actions for various screens. Example: a lead created by a specific user may be automatically set to a specific sales team, or an opportunity which still has status pending after 14 days might trigger an automatic reminder email."
+msgstr ""
+
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_email:0
 msgid "Email-id of the persons whom mail is to be sent"
@@ -280,7 +285,7 @@ msgid "Active"
 msgstr ""
 
 #. module: base_action_rule
-#: code:addons/base_action_rule/base_action_rule.py:0
+#: code:addons/base_action_rule/base_action_rule.py:314
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index 34566d51596..4a63d9ac84c 100644
--- a/addons/base_action_rule/i18n/de.po
+++ b/addons/base_action_rule/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 09:26+0000\n"
+"PO-Revision-Date: 2010-12-28 09:17+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_action_rule/i18n/el.po
new file mode 100644
index 00000000000..363e527652c
--- /dev/null
+++ b/addons/base_action_rule/i18n/el.po
@@ -0,0 +1,498 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-21 19:43+0000\n"
+"PO-Revision-Date: 2010-12-29 09:54+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-31 05:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+"Τσέκαε αυτό εάν θέλετε αυτός ο κανόνας να στέλνει email στον/στην υπεύθυνο."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Υπενθύμιση Συνεργάτη"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Κατηγορία Συνεργάτη"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Το Κουμπί Πατήθηκε"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Αντικείμενο"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Αποστολή σε αυτά τα Emails"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Θέσε την κατάσταση σε"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "Email Από"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "Σώμα Email"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Ημέρες"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "Error!"
+msgstr "Σφάλμα!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Απάντηση-Σε"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Λεπτά"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Όνομα Κανόνα"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Create actions automatically triggered based on a user activity in the "
+"system.E.g.: an opportunity created by a specific user can be automatically "
+"maintained with a specific sales team, or an opportunity which still has "
+"status pending after 14 days triggers an automatic reminder email."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Προσθεσμία"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Συνεργάτης"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to Be Used in The Body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Κατάσταση"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information
+msgid "Action Rule"
+msgstr "Κανόνας Ενέργειας"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Πεδία προς Αλλαγή"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Τελευταία Ημερομηνία Ενέργειας"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Ώρες"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_id)s = Object ID"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Καθυστέρηση Μετά την Ημερομηνία Εναύσματος"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Υπενθύμιση με Συννημένο"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Μη έγκυρες παράμετροι"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Κανένας"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "Τύπος καθυστέρησης"
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "Email Σε"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_watchers:0
+msgid ""
+"Check this if you want the rule to mark CC(mail to any other person defined "
+"in actions)."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Σημείωση"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Καθυστέρηση μετά την ημερομηνίας εναύσματος"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Συνθήκες"
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+msgid ""
+"Delay After Trigger Date,specifies you can put a negative number. If you "
+"need a delay before the trigger date, like sending a reminder 15 minutes "
+"before a meeting."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Ενεργό"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:0
+#, python-format
+msgid "No E-Mail ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.module.module,description:base_action_rule.module_meta_information
+msgid "This module allows to implement action rules for any object."
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr ""
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Μήνες"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Φίλτρο"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Ημερομηνία"
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr ""
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Σφάλμα:Το email δεν είναι σωστά διαμορφωμένο"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Υπεύθυνος"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Σώμα Mail"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr ""
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr "Αυτοματοποιημένες ενέργειες"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Ενέργεια Διακομιστή"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr ""
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Ακολουθία"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Ενέργειες"
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Ημερομηνία Εναύσματος"
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index ad6faf14a40..cbf30fe29c7 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 14:13+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-01-01 12:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -425,7 +424,7 @@ msgstr "%(partner_email)s = Courriel du partenaire"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_date)s = Creation date"
-msgstr ""
+msgstr "%(object_date)s = Date de création"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index f551259efe6..2a63fa0ebfc 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.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-26 22:25+0000\n"
+"PO-Revision-Date: 2011-01-01 10:11+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -375,7 +375,7 @@ msgstr "%(object_description)s = Описание объекта"
 #. module: base_action_rule
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Ошибка: письмо плохо отформатировано"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -410,7 +410,7 @@ msgstr "%(partner_email)s = Эл. почта партнера"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_date)s = Creation date"
-msgstr ""
+msgstr "%(object_date)s = дата создания"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index 2a3288152e2..5389544b041 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:14+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -60,8 +60,14 @@ msgid "Invited User"
 msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "Select range to Exclude"
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
 msgstr ""
 
 #. module: base_calendar
@@ -96,12 +102,6 @@ msgstr ""
 msgid "Fourth"
 msgstr ""
 
-#. module: base_calendar
-#: help:calendar.event,count:0
-#: help:calendar.todo,count:0
-msgid "Repeat max that times"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,show_as:0
 #: field:calendar.todo,show_as:0
@@ -125,11 +125,8 @@ msgid "Public"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-#: selection:res.alarm,trigger_interval:0
-msgid "Hours"
+#: view:calendar.event:0
+msgid " "
 msgstr ""
 
 #. module: base_calendar
@@ -140,7 +137,7 @@ msgid "March"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -179,8 +176,8 @@ msgid "Indicats whether the favor of a reply is requested"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,alarm_id:0
-msgid "Basic Alarm"
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
 
 #. module: base_calendar
@@ -189,9 +186,8 @@ msgid "The users that the original request was delegated to"
 msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: field:calendar.attendee,delegated_to:0
-msgid "Delegated To"
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
 msgstr ""
 
 #. module: base_calendar
@@ -213,11 +209,6 @@ msgstr ""
 msgid "Tue"
 msgstr ""
 
-#. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_attachment
-msgid "ir.attachment"
-msgstr ""
-
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
@@ -225,6 +216,12 @@ msgstr ""
 msgid "Yearly"
 msgstr ""
 
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
@@ -257,9 +254,11 @@ msgid "Invitation Detail"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
-#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:0
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#: code:addons/base_calendar/base_calendar.py:1354
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -270,13 +269,8 @@ msgid "Chair Person"
 msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
-msgid "Exclude range"
-msgstr ""
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Select data for Custom Rule"
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
 msgstr ""
 
 #. module: base_calendar
@@ -287,8 +281,6 @@ msgstr ""
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
 #: selection:res.alarm,trigger_interval:0
 msgid "Minutes"
 msgstr ""
@@ -314,9 +306,10 @@ msgid "Secondly"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.alarm,trigger_related:0
-#: selection:res.alarm,trigger_related:0
-msgid "The event ends"
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
 msgstr ""
 
 #. module: base_calendar
@@ -331,8 +324,12 @@ msgid "Provide external email address who will receive this invitation."
 msgstr ""
 
 #. module: base_calendar
-#: help:calendar.attendee,partner_id:0
-msgid "Partner related to contact"
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid "Full featured calendar system that supports:\n"
+"    - Calendar of events\n"
+"    - Alerts (create requests)\n"
+"    - Recurring events\n"
+"    - Invitations to people"
 msgstr ""
 
 #. module: base_calendar
@@ -357,12 +354,6 @@ msgstr ""
 msgid "Optional Participation"
 msgstr ""
 
-#. module: base_calendar
-#: help:calendar.event,interval:0
-#: help:calendar.todo,interval:0
-msgid "Repeat every x"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,date_deadline:0
 #: field:calendar.todo,date_deadline:0
@@ -370,14 +361,17 @@ msgid "Deadline"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "_Cancel"
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid "If the active field is set to          true, it will allow you to hide the event alarm information without removing it."
 msgstr ""
 
 #. module: base_calendar
@@ -394,13 +388,25 @@ msgid "Organizer"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
 #: view:calendar.event:0
 #: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
 msgid "Event"
 msgstr ""
 
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
@@ -448,6 +454,11 @@ msgstr ""
 msgid "Invite Type"
 msgstr ""
 
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder details"
@@ -496,8 +507,9 @@ msgid "Run"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.model,name:base_calendar.model_calendar_alarm
-msgid "Event alarm information"
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
 msgstr ""
 
 #. module: base_calendar
@@ -514,9 +526,8 @@ msgid "Repeat Until"
 msgstr ""
 
 #. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid "Create specific calendar alarms that may be assigned to calendar events or meetings."
 msgstr ""
 
 #. module: base_calendar
@@ -535,6 +546,11 @@ msgstr ""
 msgid "Caldav URL"
 msgstr ""
 
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,recurrent_uid:0
 #: field:calendar.todo,recurrent_uid:0
@@ -576,6 +592,11 @@ msgstr ""
 msgid "Participation required"
 msgstr ""
 
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.event,create_date:0
 #: field:calendar.todo,create_date:0
@@ -596,7 +617,7 @@ msgid "Daily"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: code:addons/base_calendar/base_calendar.py:385
 #, python-format
 msgid "Can not Duplicate"
 msgstr ""
@@ -700,6 +721,12 @@ msgstr ""
 msgid "Individual"
 msgstr ""
 
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
@@ -755,7 +782,8 @@ msgid "Group"
 msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
 msgid "Edit All"
 msgstr ""
 
@@ -777,7 +805,15 @@ msgid "Fri"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1092
 #, python-format
 msgid "Count can not be Negative"
 msgstr ""
@@ -814,6 +850,11 @@ msgstr ""
 msgid "Invitation From"
 msgstr ""
 
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr ""
+
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
@@ -847,6 +888,8 @@ msgstr ""
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
 msgstr ""
@@ -885,10 +928,8 @@ msgid "June"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.alarm,event_date:0
-#: field:calendar.attendee,event_date:0
-#: view:calendar.event:0
-msgid "Event Date"
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
 msgstr ""
 
 #. module: base_calendar
@@ -940,8 +981,6 @@ msgstr ""
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,count:0
-#: field:calendar.event,count:0
-#: field:calendar.todo,count:0
 msgid "Count"
 msgstr ""
 
@@ -1006,7 +1045,7 @@ msgid "Wednesday"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: code:addons/base_calendar/base_calendar.py:1090
 #, python-format
 msgid "Interval can not be Negative"
 msgstr ""
@@ -1026,8 +1065,8 @@ msgid "Active"
 msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation"
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
 msgstr ""
 
 #. module: base_calendar
@@ -1057,8 +1096,9 @@ msgid "Participation role for the calendar user"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.attendee,ref:0
-msgid "Event Ref"
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
 msgstr ""
 
 #. module: base_calendar
@@ -1071,6 +1111,11 @@ msgstr ""
 msgid "Search Events"
 msgstr ""
 
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
@@ -1080,8 +1125,6 @@ msgstr ""
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
-#: help:calendar.event,active:0
-#: help:calendar.todo,active:0
 #: help:res.alarm,active:0
 msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
 msgstr ""
@@ -1129,6 +1172,12 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
@@ -1137,7 +1186,6 @@ msgstr ""
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
-#: view:calendar.event:0
 msgid "of"
 msgstr ""
 
@@ -1160,11 +1208,6 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
-#. module: base_calendar
-#: selection:calendar.alarm,action:0
-msgid "Procedure"
-msgstr ""
-
 #. module: base_calendar
 #: help:calendar.alarm,description:0
 msgid "Provides a more complete                             description of the calendar component, than that                             provided by the \"SUMMARY\" property"
@@ -1196,15 +1239,12 @@ msgid "Tentative"
 msgstr ""
 
 #. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-#: field:calendar.event,user_id:0
-#: field:calendar.todo,user_id:0
-msgid "Responsible"
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
 msgstr ""
 
 #. module: base_calendar
-#: view:calendar.event:0
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
@@ -1223,12 +1263,6 @@ msgstr ""
 msgid "Thursday"
 msgstr ""
 
-#. module: base_calendar
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Custom"
-msgstr ""
-
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
@@ -1259,8 +1293,9 @@ msgid "Month"
 msgstr ""
 
 #. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "External Email"
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
 msgstr ""
 
 #. module: base_calendar
@@ -1319,12 +1354,6 @@ msgstr ""
 msgid "ir.values"
 msgstr ""
 
-#. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-msgid "Invite People"
-msgstr ""
-
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
@@ -1344,12 +1373,8 @@ msgid "Sat"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.module.module,description:base_calendar.module_meta_information
-msgid "Full featured calendar system that supports:\n"
-"    - Calendar of events\n"
-"    - Alerts (create requests)\n"
-"    - Recurring events\n"
-"    - Invitations to people"
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
 msgstr ""
 
 #. module: base_calendar
@@ -1392,9 +1417,8 @@ msgid "Name"
 msgstr ""
 
 #. module: base_calendar
-#: field:calendar.event,exdate:0
-#: field:calendar.todo,exdate:0
-msgid "Exception Date/Times"
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
 msgstr ""
 
 #. module: base_calendar
@@ -1411,7 +1435,7 @@ msgid "Alarm"
 msgstr ""
 
 #. module: base_calendar
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
 #, python-format
 msgid "Please Apply Recurrency before applying Exception Rule."
 msgstr ""
@@ -1421,6 +1445,11 @@ msgstr ""
 msgid "Sent By User"
 msgstr ""
 
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Repeat interval"
+msgstr ""
+
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
@@ -1428,6 +1457,11 @@ msgstr ""
 msgid "April"
 msgstr ""
 
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
@@ -1548,8 +1582,8 @@ msgid "Duration"
 msgstr ""
 
 #. module: base_calendar
-#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
-msgid "Create specific calendar alarms that can be assigned to calendar events or meetings."
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
 msgstr ""
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po
index 1c312f301a3..1b8dcf12e83 100644
--- a/addons/base_calendar/i18n/de.po
+++ b/addons/base_calendar/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 09:29+0000\n"
+"PO-Revision-Date: 2010-12-28 07:56+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/el.po b/addons/base_calendar/i18n/el.po
index ac030965910..00b351f2f34 100644
--- a/addons/base_calendar/i18n/el.po
+++ b/addons/base_calendar/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-16 17:59+0000\n"
+"PO-Revision-Date: 2010-12-29 09:46+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -70,7 +70,7 @@ msgstr "Προσκαλούμενος Χρήστης"
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "Select range to Exclude"
-msgstr ""
+msgstr "Επιλογή εύρους για Εξαίρεση"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
@@ -189,7 +189,7 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
 msgid "Basic Alarm"
-msgstr ""
+msgstr "Βασική Υπενθύμιση"
 
 #. module: base_calendar
 #: help:calendar.attendee,delegated_to:0
@@ -609,7 +609,7 @@ msgstr "Ημερήσια"
 #: code:addons/base_calendar/base_calendar.py:0
 #, python-format
 msgid "Can not Duplicate"
-msgstr ""
+msgstr "Δεν μπορεί να Διπλοκαταχωρηθεί"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
@@ -694,7 +694,7 @@ msgstr "Δεκέμβριος"
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
 msgid "Check this if you want to send an Email to Invited Person"
-msgstr ""
+msgstr "Τσέκαρε αυτό εάν θέλετε να στείλετε Email στον Προσκεκλημένο"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -778,7 +778,7 @@ msgstr "Επαφές"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
 msgid "Basic Alarm Information"
-msgstr ""
+msgstr "Βασικές Πληροφορίες Υπενθύμισης"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,fr:0
@@ -849,12 +849,12 @@ msgstr "Γεγονότα"
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
 #: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
 msgid "Invite Attendees"
-msgstr ""
+msgstr "Πρόσληση Συμμετοχόντων"
 
 #. module: base_calendar
 #: help:calendar.attendee,email:0
 msgid "Email of Invited Person"
-msgstr ""
+msgstr "Email του Προσκεκλημένου"
 
 #. module: base_calendar
 #: field:calendar.alarm,repeat:0
@@ -937,7 +937,7 @@ msgstr "Νοέμβριος"
 #. module: base_calendar
 #: help:calendar.attendee,member:0
 msgid "Indicate the groups that the attendee belongs to"
-msgstr ""
+msgstr "Δηλώνει τις ομάδες που ο προσκεκλημένος ανήκει"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
@@ -976,7 +976,7 @@ msgstr "Οκτώβριος"
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Αβέβαιο"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
@@ -1170,7 +1170,7 @@ msgstr "Ακύρωση"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
@@ -1230,13 +1230,13 @@ msgstr "Υπεύθυνος"
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Επανάληψη"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
 #: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
 msgid "Event Invitations"
-msgstr ""
+msgstr "Προσκλήσεις Γεγονότος"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
@@ -1361,14 +1361,14 @@ msgstr "Αντικείμενα"
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "Ανατέθηκε"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Σάβ"
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -1383,47 +1383,47 @@ msgstr ""
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Minutely"
-msgstr ""
+msgstr "Κάθε λεπτό"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
 msgid "Specify the user that is acting on behalf of the calendar user"
-msgstr ""
+msgstr "Όρισε τον χρήστη που δρα εκ μέρους του χρήστη ημερολογίου"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Ημερομηνία Λήξης"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "Φεβρουάριος"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Μήνες"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "Πόρος"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "Όνομα"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Εξαίρεση Ημερομηνία/Ώρες"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1431,6 +1431,8 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
+"Περιλαμβάνει το κείμενο που θα χρησιμοποιηθεί σαν θέμα μυνήματος για email ή "
+"περιλαμβάνει το κείμενο για προβολή"
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1438,7 +1440,7 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Υπενθύμιση"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
@@ -1449,122 +1451,122 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.attendee,sent_by_uid:0
 msgid "Sent By User"
-msgstr ""
+msgstr "Αποστάλθηκε από Χρήστη"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "Απρίλιος"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Καθημερινή"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Κατά ημέρα"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Μοντέλο"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "Ήχος"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "For information Purpose"
-msgstr ""
+msgstr "Για Λόγους πληροφόρησης"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Invite"
-msgstr ""
+msgstr "Προσκαλέστε"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Πληροφορίες Συμμετέχοντα"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "ID Πόρου"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "Απαιτεί ενέργεια"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
 msgid "Sent By"
-msgstr ""
+msgstr "Στάλθηκε Από"
 
 #. module: base_calendar
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Ακολουθία"
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Βάλε υπενθύμιση στην συγκεκριμένη ώρα, πρίν συμβεί το γεγονός"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "Εσωτερικός Χρήστης"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "Αποδοχή"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Σάββατο"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "Πρόσκληση Σε"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Δευτερόλεπτο"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "Ελεύθερο/Απασχολημένο"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1575,7 +1577,7 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Διάρκεια"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
@@ -1583,11 +1585,13 @@ msgid ""
 "Create specific calendar alarms that can be assigned to calendar events or "
 "meetings."
 msgstr ""
+"Δημιουργεία συγκεκριμένων υπενθυμήσεων ημερολογίου που μπορούν να ανατεθούνε "
+"σε γεγονότα ημερολογίου ή συναντήσεις."
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Ημερομηνία Εναύσματος"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1605,7 +1609,7 @@ msgstr ""
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Πέμπτος"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Μη έγκυρο XML για προβολή Αρχιτεκτονικής"
diff --git a/addons/base_calendar/i18n/es.po b/addons/base_calendar/i18n/es.po
index 0e9263dbb68..cb0057c0254 100644
--- a/addons/base_calendar/i18n/es.po
+++ b/addons/base_calendar/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 13:46+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 14:51+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -248,7 +248,7 @@ msgstr "Estado de la participación de los asistentes"
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Room"
-msgstr ""
+msgstr "Sala"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -621,49 +621,49 @@ msgstr "Marcar como"
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_address_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: base_calendar
 #: help:calendar.event,rrule_type:0
 #: help:calendar.todo,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "Permite que el evento se repita automáticamente en ese intervalo"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegar"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,partner_id:0
 #: view:calendar.attendee:0
 #: field:calendar.attendee,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Contactos de la empresa"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Aceptar"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "First"
-msgstr ""
+msgstr "Primera"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacidad"
 
 #. module: base_calendar
 #: field:calendar.event,vtimezone:0
@@ -674,21 +674,21 @@ msgstr "Zona horaria"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Subject"
-msgstr ""
+msgstr "Asunto"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,send_mail:0
@@ -698,81 +698,81 @@ msgstr "Marque aquí si quiere enviar un correo a la persona invitada"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Availability"
-msgstr ""
+msgstr "Disponibilidad"
 
 #. module: base_calendar
 #: view:calendar.event.edit.all:0
 msgid "_Save"
-msgstr ""
+msgstr "_Guardar"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr ""
+msgstr "Individual"
 
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Dueño"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr ""
+msgstr "Información delegación"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha inicio"
 
 #. module: base_calendar
 #: field:calendar.attendee,cn:0
 msgid "Common name"
-msgstr ""
+msgstr "Nombre común"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr ""
+msgstr "Rechazada"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "My Role"
-msgstr ""
+msgstr "Mi rol"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr ""
+msgstr "Mis eventos"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Decline"
-msgstr ""
+msgstr "Rechazar"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Weeks"
-msgstr ""
+msgstr "Semanas"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Edit All"
-msgstr ""
+msgstr "Editar todo"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactos"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_alarm
@@ -784,7 +784,7 @@ msgstr "Información sobre la alarma básica"
 #: field:calendar.event,fr:0
 #: field:calendar.todo,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Vie"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -795,29 +795,29 @@ msgstr "La cuenta no puede ser negativa"
 #. module: base_calendar
 #: field:calendar.attendee,member:0
 msgid "Member"
-msgstr ""
+msgstr "Miembro"
 
 #. module: base_calendar
 #: help:calendar.event,location:0
 #: help:calendar.todo,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Ubicación del evento"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Regla recurrente"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
 msgid "Attachment"
-msgstr ""
+msgstr "Adjunto"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -828,7 +828,7 @@ msgstr "Invitación desde"
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,alarm_id:0
 msgid "Reminder"
-msgstr ""
+msgstr "Recordatorio"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
@@ -842,7 +842,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr ""
+msgstr "Eventos"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
@@ -859,7 +859,7 @@ msgstr "Email del invitado"
 #: field:calendar.alarm,repeat:0
 #: field:res.alarm,repeat:0
 msgid "Repeat"
-msgstr ""
+msgstr "Repetir"
 
 #. module: base_calendar
 #: help:calendar.attendee,dir:0
@@ -873,65 +873,65 @@ msgstr ""
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Lunes"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Tercero"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: base_calendar
 #: field:calendar.alarm,event_date:0
 #: field:calendar.attendee,event_date:0
 #: view:calendar.event:0
 msgid "Event Date"
-msgstr ""
+msgstr "Fecha evento"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "The"
-msgstr ""
+msgstr "El"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_from:0
 msgid "Delegated From"
-msgstr ""
+msgstr "Delegado desde"
 
 #. module: base_calendar
 #: field:calendar.attendee,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: base_calendar
 #: help:calendar.attendee,member:0
@@ -941,65 +941,65 @@ msgstr "Indicar los grupos a los que pertenece el asistente"
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 msgid "Data"
-msgstr ""
+msgstr "Datos"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,mo:0
 #: field:calendar.event,mo:0
 #: field:calendar.todo,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Lun"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,count:0
 #: field:calendar.event,count:0
 #: field:calendar.todo,count:0
 msgid "Count"
-msgstr ""
+msgstr "Total"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "No repetir"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Incierto"
 
 #. module: base_calendar
 #: field:calendar.attendee,language:0
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_occurs:0
 #: field:res.alarm,trigger_occurs:0
 msgid "Triggers"
-msgstr ""
+msgstr "Disparadores"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_related:0
 #: field:res.alarm,trigger_related:0
 msgid "Related to"
-msgstr ""
+msgstr "Relacionado con"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,interval:0
@@ -1008,14 +1008,14 @@ msgstr ""
 #: field:calendar.todo,interval:0
 #: field:res.alarm,trigger_interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Intervalo"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Miércoles"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:0
@@ -1027,7 +1027,7 @@ msgstr "El intervalo no puede ser negativo"
 #: field:calendar.alarm,name:0
 #: view:calendar.event:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: base_calendar
 #: field:calendar.alarm,active:0
@@ -1035,17 +1035,17 @@ msgstr ""
 #: field:calendar.todo,active:0
 #: field:res.alarm,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation"
-msgstr ""
+msgstr "Invitación"
 
 #. module: base_calendar
 #: field:calendar.alarm,action:0
 msgid "Action"
-msgstr ""
+msgstr "Acción"
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,type:0
@@ -1059,6 +1059,8 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
+"Duración' y 'Repetir' son ambos opcionales, pero si uno está activo también "
+"debe estarlo el otro"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
@@ -1083,14 +1085,14 @@ msgstr "Define la acción a invocar cuando salte la alarma"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "Buscar eventos"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Semanal"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1101,17 +1103,19 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Si el campo activo es verdadero, le permitirá ocultar la notificación de "
+"aviso del evento sin eliminarlo."
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "ID fecha recurrente"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1121,7 +1125,7 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: base_calendar
 #: view:res.alarm:0
@@ -1131,55 +1135,55 @@ msgstr "Detalles del recordatorio"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "A revisar"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
 #: field:calendar.event,freq:0
 #: field:calendar.todo,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Frecuencia"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "of"
-msgstr ""
+msgstr "de"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 #: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuarios"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Martes"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr ""
+msgstr "Procedimiento"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1192,7 +1196,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Usuario responsable"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1200,19 +1204,19 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Busy"
-msgstr ""
+msgstr "Ocupado"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr ""
+msgstr "Evento de calendario"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
 msgid "Tentative"
-msgstr ""
+msgstr "Provisional"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1220,39 +1224,39 @@ msgstr ""
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: base_calendar
 #: view:calendar.event:0
 #: field:calendar.event,rrule_type:0
 #: field:calendar.todo,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Recurrencia"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
 #: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
 msgid "Event Invitations"
-msgstr ""
+msgstr "Invitaciones al evento"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Jueves"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Custom"
-msgstr ""
+msgstr "Personalizado"
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Regla de excepción"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
@@ -1263,7 +1267,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -1272,13 +1276,15 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Define una regla o patrón de repetición de tiempo a excluir de la regla "
+"recurrente."
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,month_list:0
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
@@ -1293,6 +1299,9 @@ msgid ""
 "e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
 "      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 msgstr ""
+"Define una regla o patrón repetitivo para eventos recurrentes.\n"
+"Por ejemplo: Para 10 ocurrencias cada último domingo de cada dos meses : "
+"FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
@@ -1307,20 +1316,20 @@ msgstr ""
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,type:0
 #: view:calendar.attendee:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -1331,41 +1340,41 @@ msgstr "Buscar invitaciones"
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr ""
+msgstr "Después de"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr ""
+msgstr "Parar"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
 msgid "ir.values"
-msgstr ""
+msgstr "ir.valores"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "Invitar personas"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
-msgstr ""
+msgstr "Objetos"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Delegated"
-msgstr ""
+msgstr "Delegada"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,sa:0
 #: field:calendar.event,sa:0
 #: field:calendar.todo,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Sáb"
 
 #. module: base_calendar
 #: model:ir.module.module,description:base_calendar.module_meta_information
@@ -1380,7 +1389,7 @@ msgstr ""
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 msgid "Minutely"
-msgstr ""
+msgstr "Cada minuto"
 
 #. module: base_calendar
 #: help:calendar.attendee,sent_by:0
@@ -1391,36 +1400,36 @@ msgstr ""
 #: view:calendar.event:0
 #: field:calendar.event.edit.all,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: base_calendar
 #: selection:calendar.event,freq:0
 #: selection:calendar.todo,freq:0
 msgid "Months"
-msgstr ""
+msgstr "Meses"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurso"
 
 #. module: base_calendar
 #: field:res.alarm,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: base_calendar
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Fecha/horas excepción"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1428,6 +1437,8 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
+"Contiene el texto a usar como asunto del mensaje para correos electrónicos, "
+"o contiene el texto a mostrar"
 
 #. module: base_calendar
 #: field:calendar.event,alarm_id:0
@@ -1435,7 +1446,7 @@ msgstr ""
 #: field:calendar.todo,alarm_id:0
 #: field:calendar.todo,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Alarma"
 
 #. module: base_calendar
 #: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
@@ -1454,37 +1465,37 @@ msgstr "Enviado por usuario"
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,week_list:0
 #: field:calendar.event,week_list:0
 #: field:calendar.todo,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Día de la semana"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,byday:0
 #: field:calendar.event,byday:0
 #: field:calendar.todo,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Por día"
 
 #. module: base_calendar
 #: field:calendar.alarm,model_id:0
 msgid "Model"
-msgstr ""
+msgstr "Modelo"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Audio"
-msgstr ""
+msgstr "Audio"
 
 #. module: base_calendar
 #: field:calendar.event,id:0
 #: field:calendar.todo,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
@@ -1499,17 +1510,17 @@ msgstr "Invitar"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Información asistentes"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "ID del recurso"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
 msgid "Needs Action"
-msgstr ""
+msgstr "Necesita acción"
 
 #. module: base_calendar
 #: field:calendar.attendee,sent_by:0
@@ -1520,49 +1531,49 @@ msgstr "Enviado por"
 #: field:calendar.event,sequence:0
 #: field:calendar.todo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: base_calendar
 #: help:calendar.event,alarm_id:0
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Configure una alarma en este momento, antes de que ocurra el evento"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "Internal User"
-msgstr ""
+msgstr "Usuario interno"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Accept"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Sábado"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation To"
-msgstr ""
+msgstr "Invitación a"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Segundo"
 
 #. module: base_calendar
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "Libre/Ocupado"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1573,7 +1584,7 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duración"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
@@ -1581,11 +1592,13 @@ msgid ""
 "Create specific calendar alarms that can be assigned to calendar events or "
 "meetings."
 msgstr ""
+"Cree alarmas específicas del calendario que se puede asignar a los eventos "
+"del calendario o reuniones."
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Fecha activación"
 
 #. module: base_calendar
 #: help:calendar.alarm,attach:0
@@ -1603,7 +1616,7 @@ msgstr ""
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Quinto"
 
 #~ msgid "Set Exclude range"
 #~ msgstr "Fijar el rango de exclusión"
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/base_contact.pot b/addons/base_contact/i18n/base_contact.pot
index 054498cbe45..b859c06339c 100644
--- a/addons/base_contact/i18n/base_contact.pot
+++ b/addons/base_contact/i18n/base_contact.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:15+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_contact/i18n/de.po b/addons/base_contact/i18n/de.po
index ede248cbcbb..7fc2ba1024d 100644
--- a/addons/base_contact/i18n/de.po
+++ b/addons/base_contact/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 09:45+0000\n"
+"PO-Revision-Date: 2010-12-28 08:44+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/el.po b/addons/base_contact/i18n/el.po
index f75818be675..a010fc78741 100644
--- a/addons/base_contact/i18n/el.po
+++ b/addons/base_contact/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-15 05:05+0000\n"
+"PO-Revision-Date: 2010-12-29 09:18+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -47,7 +47,7 @@ msgstr "Ημερομηνία έναρξης εργασίας"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Select the Option for Addresses Migration"
-msgstr ""
+msgstr "Επιλέξτε αυτήν την Επιλογή για Μετάπτωση Διευθύνσεων"
 
 #. module: base_contact
 #: help:res.partner.job,function:0
@@ -132,6 +132,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Εάν το ενεργό πεδίο είναι Λάθος(False), σας επιτρέπει να αποκρύψετε την "
+"επαφή συναργάτη χωρίς να την διαγράψετε."
 
 #. module: base_contact
 #: model:ir.module.module,description:base_contact.module_meta_information
@@ -184,6 +186,8 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Σειρά σπουδαιότητας αυτού του τίτλου εργασίας στην λίστα τιτλων εργασιω΄ν "
+"του συνδεδεμένου συνεργάτη"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -262,7 +266,7 @@ msgstr "Διευθύνσεις Συνεργάτη"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Address's Migration to Contacts"
-msgstr ""
+msgstr "Μετάπτωση Διευθύνσεων σε Επαφές"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -326,7 +330,7 @@ msgstr "Αλλιώς οι λεπτομέρεις δεν θα είναι ορατ
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Παραμετροποίηση"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -469,7 +473,7 @@ msgstr "Εθνικότητα"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Ανοιχτές Εργασίες"
 
 #. module: base_contact
 #: field:base.contact.installer,name:0
@@ -480,6 +484,7 @@ msgstr "Όνομα"
 #: view:base.contact.installer:0
 msgid "You can migrate Partner's current addresses to the contact."
 msgstr ""
+"Μπορείτε να μεταπτώσετε τις τρέχουσες διεύθυνσεις του Συνεργάτη στην επαφή."
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
diff --git a/addons/base_contact/i18n/es.po b/addons/base_contact/i18n/es.po
index 644b0741a61..28e6b64c00b 100644
--- a/addons/base_contact/i18n/es.po
+++ b/addons/base_contact/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 22:35+0000\n"
+"PO-Revision-Date: 2010-12-28 08:39+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/hu.po b/addons/base_contact/i18n/hu.po
index dc5152b00a5..9cf725e3acb 100644
--- a/addons/base_contact/i18n/hu.po
+++ b/addons/base_contact/i18n/hu.po
@@ -7,29 +7,29 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-05 07:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 12:09+0000\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr ""
+msgstr "Megnevezés"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "# a kapcsolatoknak"
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -71,7 +71,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobil"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -82,12 +82,12 @@ msgstr ""
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr ""
+msgstr "Emberek akikkel dolgozol"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr ""
+msgstr "Határozza meg a beosztást és címet"
 
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
@@ -104,17 +104,17 @@ msgstr ""
 #: view:res.partner.contact:0
 #: field:res.partner.job,name:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "Feladatok ugyanahoz a partneri címhez"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr ""
+msgstr "Partnerek"
 
 #. module: base_contact
 #: field:res.partner.job,state:0
@@ -156,7 +156,7 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact"
-msgstr ""
+msgstr "Alap kapcsolat"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
@@ -166,7 +166,7 @@ msgstr ""
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 msgid "Contact's Jobs"
-msgstr ""
+msgstr "Kapcsolattartó munkaköre"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -188,7 +188,7 @@ msgstr ""
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr ""
+msgstr "Belső/Kimenő mellék a telefonszámhoz"
 
 #. module: base_contact
 #: help:res.partner.job,phone:0
@@ -199,7 +199,7 @@ msgstr ""
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "Beosztások és címek"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
@@ -215,12 +215,12 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Partner sorrend"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Címek"
 
 #. module: base_contact
 #: field:base.contact.installer,progress:0
@@ -247,7 +247,7 @@ msgstr ""
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "múlt"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
@@ -289,7 +289,7 @@ msgstr ""
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr ""
+msgstr "Munkahelyi és otthoni címek"
 
 #. module: base_contact
 #: help:res.partner.job,address_id:0
@@ -299,12 +299,12 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.job,function:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Partner beosztása"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Plusz telefon mező"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
@@ -325,7 +325,7 @@ msgstr ""
 #: field:res.partner.contact,email:0
 #: field:res.partner.job,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
@@ -335,12 +335,12 @@ msgstr ""
 #. module: base_contact
 #: view:res.partner.job:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Kapcsolatartók"
 
 #. module: base_contact
 #: field:res.partner.job,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base_contact
 #: view:base.contact.installer:0
@@ -350,7 +350,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktív"
 
 #. module: base_contact
 #: field:res.partner.contact,function:0
@@ -365,27 +365,27 @@ msgstr ""
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "sorrend"
 
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
 msgid "Language"
-msgstr ""
+msgstr "Nyelv"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Extra információ"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr ""
+msgstr "Cégek akikkel dolgozol"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Partneri kapcsolat"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -410,7 +410,7 @@ msgstr ""
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Aktuális"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
@@ -420,7 +420,7 @@ msgstr "Keresztnév"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Kapcsolattartó partner"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
@@ -436,7 +436,7 @@ msgstr ""
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Fő munkakör"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
@@ -446,18 +446,18 @@ msgstr ""
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr ""
+msgstr "Kapcsolat a tisztviselőhöz"
 
 #. module: base_contact
 #: view:res.partner:0
 #: field:res.partner.job,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Cím"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Nemzetiség"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
@@ -477,7 +477,7 @@ msgstr ""
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Fő munkáltató"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
@@ -498,12 +498,12 @@ msgstr ""
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Partner címe"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Indulási időpont"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
diff --git a/addons/base_contact/i18n/it.po b/addons/base_contact/i18n/it.po
index 3628e0bfd66..b9f736f6a39 100644
--- a/addons/base_contact/i18n/it.po
+++ b/addons/base_contact/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-12 09:22+0000\n"
+"PO-Revision-Date: 2010-12-29 08:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -155,6 +155,25 @@ msgid ""
 "an other object.\n"
 "    "
 msgstr ""
+"\n"
+"        Questo modulo permette di gestire i vostri contatti interamente.\n"
+"\n"
+"    Permette di definire\n"
+"        * contatti non relazionati necessariamente con un partner,\n"
+"        * contatti che lavorano per parecchi indirizzi (possibilità per "
+"partner differenti),\n"
+"        * contatti con la possibilità di avere differenti funzioni per "
+"ognuno degli indirizzi lavorativi\n"
+"\n"
+"    Aggiunge inoltre un nuovo menù in:\n"
+"        Partner \\ Contatti\n"
+"        Partner \\ Funzioni\n"
+"\n"
+"    Prestare attenzione che questo modulo converte l'attuale indirizzo in "
+"\"indirizzo + contatti\". Ciò significa che alcuni campi dell'indirizzo "
+"verranno persi (come il nome contatto), dato che questi si suppongono "
+"definiti in un altro oggetto.\n"
+"    "
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
diff --git a/addons/base_contact/i18n/ru.po b/addons/base_contact/i18n/ru.po
index e64c6615cbe..234743e58b2 100644
--- a/addons/base_contact/i18n/ru.po
+++ b/addons/base_contact/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-12 01:22+0000\n"
+"PO-Revision-Date: 2011-01-01 19:25+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:13+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -239,7 +239,7 @@ msgstr "Фамилия"
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr ""
+msgstr "Общение"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
@@ -324,7 +324,7 @@ msgstr "Иначе эти подробности не будут видны в 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Настройка"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
diff --git a/addons/base_contact/i18n/vi.po b/addons/base_contact/i18n/vi.po
index 1e8dd3b3847..c107618c451 100644
--- a/addons/base_contact/i18n/vi.po
+++ b/addons/base_contact/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-28 04:32+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:09+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_crypt/__init__.py b/addons/base_crypt/__init__.py
new file mode 100755
index 00000000000..a8b9a6b0740
--- /dev/null
+++ b/addons/base_crypt/__init__.py
@@ -0,0 +1,23 @@
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+
+from service import security
+import crypt
+
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
new file mode 100755
index 00000000000..d6c0bbd82e3
--- /dev/null
+++ b/addons/base_crypt/__openerp__.py
@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    "name" : "Base - Password Encryption",
+    "version" : "1.1",
+    "author" : "FS3 & OpenERP SA",
+    "maintainer" : "OpenERP SA",
+    "website" : "http://www.openerp.com",
+    "category" : "Generic Modules/Base",
+    "description": """This module replaces the cleartext password in the database with a password hash,
+preventing anyone from reading the original password.
+For your existing user base, the removal of the cleartext passwords occurs the first time
+a user logs into the database, after installing base_crypt.
+After installing this module it won't be possible to recover a forgotten password for your
+users, the only solution is for an admin to set a new password.
+
+Note: installing this module does not mean you can ignore basic security measures,
+as the password is still transmitted unencrypted on the network (by the client),
+unless you are using a secure protocol such as XML-RPCS.
+                    """,
+    "depends" : ["base"],
+    "data" : [],
+    "active": False,
+    "installable": True,
+}
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
new file mode 100755
index 00000000000..486f52cea02
--- /dev/null
+++ b/addons/base_crypt/crypt.py
@@ -0,0 +1,254 @@
+# Notice:
+# ------
+#
+# Implements encrypting functions.
+#
+# Copyright (c) 2008, F S 3 Consulting Inc.
+#
+# Maintainer:
+# Alec Joseph Rivera (agi<at>fs3.ph)
+#
+#
+# Warning:
+# -------
+#
+# This program as  such is intended to be used by  professional programmers
+# who take the whole responsibility of assessing all potential consequences
+# resulting  from its eventual  inadequacies and  bugs.  End users  who are
+# looking  for a  ready-to-use  solution  with  commercial  guarantees  and
+# support are strongly adviced to contract a Free Software Service Company.
+#
+# This program  is Free Software; you can  redistribute it and/or modify it
+# under  the terms of the  GNU General  Public License  as published by the
+# Free Software  Foundation;  either version 2 of the  License, or (at your
+# option) any later version.
+#
+# This  program is  distributed in  the hope that  it will  be useful,  but
+# WITHOUT   ANY   WARRANTY;   without   even   the   implied   warranty  of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+#
+# You should  have received a copy of the GNU General  Public License along
+# with this program; if not, write to the:
+#
+# Free Software Foundation, Inc.
+# 59 Temple Place - Suite 330
+# Boston, MA  02111-1307
+# USA.
+
+from random import seed, sample
+from string import letters, digits
+from osv import fields,osv
+import pooler
+from tools.translate import _
+
+magic_md5 = '$1$'
+
+def gen_salt( length=8, symbols=letters + digits ):
+    seed()
+    return ''.join( sample( symbols, length ) )
+
+# The encrypt_md5 is based on Mark Johnson's md5crypt.py, which in turn is
+# based on  FreeBSD src/lib/libcrypt/crypt.c (1.2)  by  Poul-Henning Kamp.
+# Mark's port can be found in  ActiveState ASPN Python Cookbook.  Kudos to
+# Poul and Mark. -agi
+#
+# Original license:
+#
+# * "THE BEER-WARE LICENSE" (Revision 42):
+# *
+# * <phk@login.dknet.dk>  wrote  this file.  As  long as  you retain  this
+# * notice  you can do  whatever you want with this stuff. If we meet some
+# * day,  and you think this stuff is worth it,  you can buy me  a beer in
+# * return.
+# *
+# * Poul-Henning Kamp
+
+import md5
+
+def encrypt_md5( raw_pw, salt, magic=magic_md5 ):
+    hash = md5.new( raw_pw + magic + salt )
+    stretch = md5.new( raw_pw + salt + raw_pw).digest()
+
+    for i in range( 0, len( raw_pw ) ):
+        hash.update( stretch[i % 16] )
+
+    i = len( raw_pw )
+
+    while i:
+        if i & 1:
+            hash.update('\x00')
+        else:
+            hash.update( raw_pw[0] )
+        i >>= 1
+
+    saltedmd5 = hash.digest()
+
+    for i in range( 1000 ):
+        hash = md5.new()
+
+        if i & 1:
+            hash.update( raw_pw )
+        else:
+            hash.update( saltedmd5 )
+
+        if i % 3:
+            hash.update( salt )
+        if i % 7:
+            hash.update( raw_pw )
+        if i & 1:
+            hash.update( saltedmd5 )
+        else:
+            hash.update( raw_pw )
+
+        saltedmd5 = hash.digest()
+
+    itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+
+    rearranged = ''
+    for a, b, c in ((0, 6, 12), (1, 7, 13), (2, 8, 14), (3, 9, 15), (4, 10, 5)):
+        v = ord( saltedmd5[a] ) << 16 | ord( saltedmd5[b] ) << 8 | ord( saltedmd5[c] )
+
+        for i in range(4):
+            rearranged += itoa64[v & 0x3f]
+            v >>= 6
+
+    v = ord( saltedmd5[11] )
+
+    for i in range( 2 ):
+        rearranged += itoa64[v & 0x3f]
+        v >>= 6
+
+    return magic + salt + '$' + rearranged
+
+class users(osv.osv):
+    _name="res.users"
+    _inherit="res.users"
+    # agi - 022108
+    # Add handlers for 'input_pw' field.
+
+    def set_pw(self, cr, uid, id, name, value, args, context):
+        if not value:
+            raise osv.except_osv(_('Error'), _("Please specify the password !"))
+
+        obj = pooler.get_pool(cr.dbname).get('res.users')
+        if not hasattr(obj, "_salt_cache"):
+            obj._salt_cache = {}
+
+        salt = obj._salt_cache[id] = gen_salt()
+        encrypted = encrypt_md5(value, salt)
+        cr.execute('update res_users set password=%s where id=%s',
+            (encrypted.encode('utf-8'), int(id)))
+        cr.commit()
+        del value
+
+    def get_pw( self, cr, uid, ids, name, args, context ):
+        cr.execute('select id, password from res_users where id in %s', (tuple(map(int, ids)),))
+        stored_pws = cr.fetchall()
+        res = {}
+
+        for id, stored_pw in stored_pws:
+            res[id] = stored_pw
+
+        return res
+
+    _columns = {
+        # The column size could be smaller as it is meant to store a hash, but
+        # an existing column cannot be downsized; thus we use the original
+        # column size.
+        'password': fields.function(get_pw, fnct_inv=set_pw, type='char',
+            method=True, size=64, string='Password', invisible=True,
+            store=True),
+    }
+
+    def login(self, db, login, password):
+        cr = pooler.get_db(db).cursor()
+        cr.execute('select password, id from res_users where login=%s',
+            (login.encode('utf-8'),))
+        stored_pw = id = cr.fetchone()
+
+        if stored_pw:
+            stored_pw = stored_pw[0]
+            id = id[1]
+        else:
+            # Return early if there is no such login.
+            return False
+
+        stored_pw = self.maybe_encrypt(cr, stored_pw, id)
+
+        # Calculate an encrypted password from the user-provided
+        # password.
+        obj = pooler.get_pool(db).get('res.users')
+        if not hasattr(obj, "_salt_cache"):
+            obj._salt_cache = {}
+        salt = obj._salt_cache[id] = stored_pw[len(magic_md5):11]
+        encrypted_pw = encrypt_md5(password, salt)
+
+        # Check if the encrypted password matches against the one in the db.
+        cr.execute('select id from res_users where id=%s and password=%s and active', (int(id), encrypted_pw.encode('utf-8')))
+        res = cr.fetchone()
+        cr.close()
+
+        if res:
+            return res[0]
+        else:
+            return False
+
+    def check(self, db, uid, passwd):
+        # Get a chance to hash all passwords in db before using the uid_cache.
+        obj = pooler.get_pool(db).get('res.users')
+        if not hasattr(obj, "_salt_cache"):
+            obj._salt_cache = {}
+            self._uid_cache.get(db, {}).clear()
+
+        cached_pass = self._uid_cache.get(db, {}).get(uid)
+        if (cached_pass is not None) and cached_pass == passwd:
+            return True
+
+        cr = pooler.get_db(db).cursor()
+        if uid not in obj._salt_cache:
+            cr.execute('select login from res_users where id=%s', (int(uid),))
+            stored_login = cr.fetchone()
+            if stored_login:
+                stored_login = stored_login[0]
+
+            if not self.login(db,stored_login,passwd):
+                return False
+
+        salt = obj._salt_cache[uid]
+        cr.execute('select count(id) from res_users where id=%s and password=%s',
+            (int(uid), encrypt_md5(passwd, salt)))
+        res = cr.fetchone()[0]
+        cr.close()
+        if not bool(res):
+            raise Exception('AccessDenied')
+
+        if res:
+            if self._uid_cache.has_key(db):
+                ulist = self._uid_cache[db]
+                ulist[uid] = passwd
+            else:
+                self._uid_cache[db] = {uid: passwd}
+        return bool(res)
+
+    def maybe_encrypt(self, cr, pw, id):
+        # If the password 'pw' is not encrypted, then encrypt all passwords
+        # in the db. Returns the (possibly newly) encrypted password for 'id'.
+
+        if pw[0:len(magic_md5)] != magic_md5:
+            cr.execute('select id, password from res_users')
+            res = cr.fetchall()
+            for i, p in res:
+                encrypted = p
+                if p[0:len(magic_md5)] != magic_md5:
+                    encrypted = encrypt_md5(p, gen_salt())
+                    cr.execute('update res_users set password=%s where id=%s',
+                        (encrypted.encode('utf-8'), int(i)))
+                if i == id:
+                    encrypted_res = encrypted
+            cr.commit()
+            return encrypted_res
+        return pw
+
+users()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_crypt/i18n/base_crypt.pot b/addons/base_crypt/i18n/base_crypt.pot
new file mode 100644
index 00000000000..60b8263732d
--- /dev/null
+++ b/addons/base_crypt/i18n/base_crypt.pot
@@ -0,0 +1,64 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_crypt
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:57:15+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:15+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:134
+#, python-format
+msgid "Please specify the password !"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base - Password Encryption"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:134
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid "This module replaces the cleartext password in the database with a password hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security measures,\n"
+"as the password is still transmitted unencrypted on the network (by the client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+"                    "
+msgstr ""
+
diff --git a/addons/base_crypt/i18n/sv.po b/addons/base_crypt/i18n/sv.po
new file mode 100644
index 00000000000..a20776a2100
--- /dev/null
+++ b/addons/base_crypt/i18n/sv.po
@@ -0,0 +1,40 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* base_crypt
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.14\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-11-26 09:12+0000\n"
+"PO-Revision-Date: 2010-11-23 02:16+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-15 05:38+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid "Module for password encryption."
+msgstr ""
+
+#. module: base_crypt
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
+msgid "Base"
+msgstr ""
+
+#. module: base_crypt
+#: field:res.users,input_pw:0
+msgid "Password"
+msgstr ""
+
+#~ msgid "Module for password encryption.KKKKKKKKKKKKKKKKKKK"
+#~ msgstr "Module for password encryption.KKKKKKKKKKKKKKKKKKK"
diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot
index f63798c1745..a0b53f32715 100644
--- a/addons/base_iban/i18n/base_iban.pot
+++ b/addons/base_iban/i18n/base_iban.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Create IBAN bank accounts"
 msgstr ""
 
 #. module: base_iban
-#: code:addons/base_iban/base_iban.py:0
+#: code:addons/base_iban/base_iban.py:120
 #, python-format
 msgid "The IBAN does not seems to be correct. You should have entered something like this %s"
 msgstr ""
@@ -51,21 +51,13 @@ msgstr ""
 msgid "bic"
 msgstr ""
 
-#. module: base_iban
-#: model:ir.module.module,description:base_iban.module_meta_information
-msgid "\n"
-"This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity\n"
-"\n"
-"    "
-msgstr ""
-
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
 msgid "iban"
 msgstr ""
 
 #. module: base_iban
-#: code:addons/base_iban/base_iban.py:0
+#: code:addons/base_iban/base_iban.py:121
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
 msgstr ""
@@ -80,6 +72,14 @@ msgstr ""
 msgid "IBAN Account"
 msgstr ""
 
+#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid "\n"
+"This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity.\n"
+"\n"
+"    "
+msgstr ""
+
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
diff --git a/addons/base_iban/i18n/de.po b/addons/base_iban/i18n/de.po
index fb302cd4cd4..79a6136da4e 100644
--- a/addons/base_iban/i18n/de.po
+++ b/addons/base_iban/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 09:47+0000\n"
+"PO-Revision-Date: 2010-12-28 08:46+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/el.po b/addons/base_iban/i18n/el.po
index 0d0126d9180..2af4f012de9 100644
--- a/addons/base_iban/i18n/el.po
+++ b/addons/base_iban/i18n/el.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2009-05-14 15:09+0000\n"
-"Last-Translator: Panagiotis Kranidiotis <kranidiotis@vatica.org>\n"
+"PO-Revision-Date: 2010-12-29 10:18+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -18,7 +18,7 @@ msgstr ""
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr ""
+msgstr "Δημιουργία λογαριασμών IBAN"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:0
@@ -27,6 +27,7 @@ msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
 msgstr ""
+"Ο IBAN δεν φαίνεται να είναι σωστός. Θα πρέπει να είχατε εισάγει κάτι σαν %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -41,7 +42,7 @@ msgstr "Διεθνής Αριθμός Τραπεζικού Λογαριασμο
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Τραπεζικοί Λογαριασμοί"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
@@ -62,6 +63,11 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Αυτό το άρθρωμα κάνει εγκατάσταση την βάση για το IBAN (International Bank "
+"Account Number) λογαριασμού τράπεζας και ελέγχει για την ορθότητά του\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
@@ -73,6 +79,7 @@ msgstr "iban"
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
 msgstr ""
+"Ο IBAN δεν είναι έγκυρος, θα πρέπει να ξεκινά με τον κωδικό της χώρας"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
diff --git a/addons/base_iban/i18n/it.po b/addons/base_iban/i18n/it.po
index e637d87ef9a..415df8e98f5 100644
--- a/addons/base_iban/i18n/it.po
+++ b/addons/base_iban/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:28+0000\n"
+"PO-Revision-Date: 2011-01-01 12:30+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:02+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -63,6 +63,12 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Questo moduli installa la gestione base per l'IBAN (International Bank "
+"Account Number) il valore del conto è controllato per verificarne la sua "
+"validità\n"
+"\n"
+"    "
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
diff --git a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
index 3a2ad652ffe..1f7c11bc02b 100644
--- a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
+++ b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_module_doc_rst/i18n/fr_BE.po b/addons/base_module_doc_rst/i18n/fr_BE.po
deleted file mode 100644
index 1a0e3c0f141..00000000000
--- a/addons/base_module_doc_rst/i18n/fr_BE.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:45:34+0000\n"
-"PO-Revision-Date: 2009-01-28 00:45:34+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst format"
-msgstr "Guide Technique au format rst"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nom du Fichier"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crée le Guide Technical au format rst"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Choisissez un fichier où le Guide Technique sera créé."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Fichier"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Fermer"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst format"
-msgstr "Crée le Guide Technique au format rst"
-
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/base_module_quality.pot b/addons/base_module_quality/i18n/base_module_quality.pot
index 1ddd822cdc7..209c3b44e68 100644
--- a/addons/base_module_quality/i18n/base_module_quality.pot
+++ b/addons/base_module_quality/i18n/base_module_quality.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,20 +16,21 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
 #, python-format
 msgid "Suggestion"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/base_module_quality.py:0
+#: code:addons/base_module_quality/base_module_quality.py:100
 #, python-format
 msgid "Programming Error"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:31
 #, python-format
 msgid "Method Test"
 msgstr ""
@@ -40,7 +41,7 @@ msgid "Base module quality - To check the quality of other modules"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:34
 #, python-format
 msgid "\n"
 "Test checks for fields, views, security rules, dependancy level\n"
@@ -48,7 +49,7 @@ msgid "\n"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:127
 #, python-format
 msgid "O(n) or worst"
 msgstr ""
@@ -59,54 +60,58 @@ msgid "Skipped"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:46
 #, python-format
 msgid "Module has no objects"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:49
 #, python-format
 msgid "Speed Test"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:54
 #, python-format
 msgid "The module does not contain the __openerp__.py file"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
-#: code:addons/base_module_quality/object_test/object_test.py:0
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:82
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
 #, python-format
 msgid "Object Name"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:54
+#: code:addons/base_module_quality/method_test/method_test.py:61
+#: code:addons/base_module_quality/method_test/method_test.py:68
 #, python-format
 msgid "Ok"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:34
 #, python-format
 msgid "This test checks if the module satisfies the current coding standard used by OpenERP."
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/wizard/quality_save_report.py:0
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
 #, python-format
 msgid "No report to save!"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of dependancy in %"
 msgstr ""
@@ -117,19 +122,19 @@ msgid "The test will be completed only if the module is installed or if the test
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
 #, python-format
 msgid "Result (/10)"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:33
 #, python-format
 msgid "Terp Test"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:33
 #, python-format
 msgid "Object Test"
 msgstr ""
@@ -140,38 +145,38 @@ msgid "Save Report"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/wizard/module_quality_check.py:0
+#: code:addons/base_module_quality/wizard/module_quality_check.py:46
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 #, python-format
 msgid "Quality Check"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:128
 #, python-format
 msgid "Not Efficient"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/wizard/quality_save_report.py:0
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
 #, python-format
 msgid "Warning"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:35
 #, python-format
 msgid "Unit Test"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "Reading Complexity"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:267
 #, python-format
 msgid "Result of pep8_test in %"
 msgstr ""
@@ -182,7 +187,7 @@ msgid "State"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:50
 #, python-format
 msgid "Module does not have 'unit_test/test.py' file"
 msgstr ""
@@ -193,7 +198,7 @@ msgid "Ponderation"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of Security in %"
 msgstr ""
@@ -204,25 +209,25 @@ msgid "Some tests are more critical than others, so they have a bigger weight in
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:120
 #, python-format
 msgid "No enough data"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
 #, python-format
 msgid "Result (/1)"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N (Number of Records)"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:133
 #, python-format
 msgid "No data"
 msgstr ""
@@ -238,13 +243,13 @@ msgid "Save report"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:34
 #, python-format
 msgid "This test checks where object has workflow or not on it if there is a state field and several buttons on it and also checks validity of workflow xml file"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
 #, python-format
 msgid "Result in %"
 msgstr ""
@@ -255,14 +260,14 @@ msgid "Standard entries"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:58
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:88
 #, python-format
 msgid "No python file found"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
 #: view:module.quality.check:0
 #: view:module.quality.detail:0
 #, python-format
@@ -285,20 +290,20 @@ msgid "Note"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:85
 #, python-format
 msgid "<html>O(1) means that the number of SQL requests to read the object does not depand on the number of objects we are reading. This feature is mostly wished.\n"
 "</html>"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:120
 #, python-format
 msgid "__openerp__.py file"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
 #, python-format
 msgid "Status"
 msgstr ""
@@ -310,7 +315,7 @@ msgid "Tests"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:50
 #, python-format
 msgid "\n"
 "This test checks the speed of the module. Note that at least 5 demo data is needed in order to run it.\n"
@@ -319,13 +324,13 @@ msgid "\n"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:71
 #, python-format
 msgid "Unable to parse the result. Check the details."
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:33
 #, python-format
 msgid "\n"
 "This test checks if the module satisfy tiny structure\n"
@@ -333,50 +338,53 @@ msgid "\n"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
 #, python-format
 msgid "Module Name"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:56
 #, python-format
 msgid "Error! Module is not properly loaded/installed"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:115
+#: code:addons/base_module_quality/speed_test/speed_test.py:116
 #, python-format
 msgid "Error in Read method"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:138
 #, python-format
 msgid "Score is below than minimal score(%s%%)"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N/2"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:57
+#: code:addons/base_module_quality/method_test/method_test.py:64
+#: code:addons/base_module_quality/method_test/method_test.py:71
 #, python-format
 msgid "Exception"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/base_module_quality.py:0
+#: code:addons/base_module_quality/base_module_quality.py:100
 #, python-format
 msgid "Test Is Not Implemented"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "N"
 msgstr ""
@@ -387,32 +395,32 @@ msgid "Report Save"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
 #, python-format
 msgid "Feedback about structure of module"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:73
 #, python-format
 msgid "Given module has no objects.Speed test can work only when new objects are created in the module along with demo data"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:32
 #, python-format
 msgid "This test uses Pylint and checks if the module satisfies the coding standard of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
 " "
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
 #, python-format
 msgid "Feed back About Workflow of Module"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:129
 #, python-format
 msgid "No Workflow define"
 msgstr ""
@@ -428,7 +436,7 @@ msgid "Cancel"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:32
 #, python-format
 msgid "\n"
 "PEP-8 Test , copyright of py files check, method can not call from loops\n"
@@ -441,13 +449,13 @@ msgid "Final Score (%)"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:61
 #, python-format
 msgid "Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:125
 #, python-format
 msgid "Efficient"
 msgstr ""
@@ -458,13 +466,13 @@ msgid "Rated Module"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:33
 #, python-format
 msgid "Workflow Test"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:36
 #, python-format
 msgid "\n"
 "This test checks the Unit Test(PyUnit) Cases of the module. Note that 'unit_test/test.py' is needed in module.\n"
@@ -473,7 +481,7 @@ msgid "\n"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:32
 #, python-format
 msgid "\n"
 "This test checks if the module classes are raising exception when calling basic methods or not.\n"
@@ -486,43 +494,43 @@ msgid "Details"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:119
 #, python-format
 msgid "Warning! Not enough demo data"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:31
 #, python-format
 msgid "Pylint Test"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:31
 #, python-format
 msgid "PEP-8 Test"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:187
 #, python-format
 msgid "Field name"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
 #, python-format
 msgid "1"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:132
 #, python-format
 msgid "Warning! Object has no demo data"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
 #, python-format
 msgid "Tag Name"
 msgstr ""
@@ -560,8 +568,8 @@ msgid "Name"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
 #, python-format
 msgid "Result of views in %"
 msgstr ""
@@ -577,25 +585,25 @@ msgid "Save report as .html format"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/base_module_quality.py:0
+#: code:addons/base_module_quality/base_module_quality.py:269
 #, python-format
 msgid "The module has to be installed before running this test."
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:123
 #, python-format
 msgid "O(1)"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:177
 #, python-format
 msgid "Result of fields in %"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
 #: view:module.quality.detail:0
 #: field:module.quality.detail,summary:0
 #, python-format
@@ -603,20 +611,20 @@ msgid "Summary"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
 #, python-format
 msgid "File Name"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
 #, python-format
 msgid "Line number"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:32
 #, python-format
 msgid "Structure Test"
 msgstr ""
@@ -627,7 +635,7 @@ msgid "Quality"
 msgstr ""
 
 #. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
 #, python-format
 msgid "Feed back About terp file of Module"
 msgstr ""
diff --git a/addons/base_module_quality/i18n/de.po b/addons/base_module_quality/i18n/de.po
index 0e526e3356f..a4aa9d19ae5 100644
--- a/addons/base_module_quality/i18n/de.po
+++ b/addons/base_module_quality/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-09 11:33+0000\n"
+"PO-Revision-Date: 2010-12-31 10:20+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:49+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -544,7 +544,7 @@ msgstr "Details"
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Warning! Not enough demo data"
-msgstr ""
+msgstr "Warnung! Nicht genügend Demodaten."
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
diff --git a/addons/base_module_quality/i18n/el.po b/addons/base_module_quality/i18n/el.po
index 0bc9f730d2f..13e6e5cc5c9 100644
--- a/addons/base_module_quality/i18n/el.po
+++ b/addons/base_module_quality/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-08-03 03:39+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 11:50+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
@@ -22,7 +22,7 @@ msgstr ""
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:0
 #, python-format
 msgid "Suggestion"
-msgstr ""
+msgstr "Πρόταση"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:0
@@ -34,7 +34,7 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Method Test"
-msgstr ""
+msgstr "Μεθοδολογία Τεστ"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
@@ -64,13 +64,13 @@ msgstr "Προσπεράστηκε"
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Module has no objects"
-msgstr ""
+msgstr "Το Άρθρωμα δεν έχει αντικείμενα"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Speed Test"
-msgstr ""
+msgstr "Τεστ Ταχύτητας"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
@@ -87,13 +87,13 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Object Name"
-msgstr ""
+msgstr "Όνομα Αντικειμένου"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Ok"
-msgstr ""
+msgstr "ΟΚ"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
@@ -107,7 +107,7 @@ msgstr ""
 #: code:addons/base_module_quality/wizard/quality_save_report.py:0
 #, python-format
 msgid "No report to save!"
-msgstr ""
+msgstr "Καμία αναφορά για αποθήκευση!"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/object_test/object_test.py:0
@@ -128,7 +128,7 @@ msgstr ""
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
 msgid "Result (/10)"
-msgstr ""
+msgstr "Αποτέλεσμα(/10)"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
@@ -140,7 +140,7 @@ msgstr ""
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Object Test"
-msgstr ""
+msgstr "Τεστ Αντικειμένου"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
@@ -158,13 +158,13 @@ msgstr "Έλεγχος ποιότητας"
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Not Efficient"
-msgstr ""
+msgstr "αναπαρκής"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/wizard/quality_save_report.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Προειδοποίηση"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
@@ -204,7 +204,7 @@ msgstr "Συντελεστής"
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Result of Security in %"
-msgstr ""
+msgstr "Αποτελέσματα Ασφάλειας σε %"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -219,7 +219,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "No enough data"
-msgstr ""
+msgstr "Μη επαρκή δεδομένα"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
@@ -237,7 +237,7 @@ msgstr ""
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "No data"
-msgstr ""
+msgstr "Δεν υπάρχουν δεδομένα"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
@@ -261,7 +261,7 @@ msgstr ""
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
 #, python-format
 msgid "Result in %"
-msgstr ""
+msgstr "Αποτέλεσμα σε %"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
@@ -273,7 +273,7 @@ msgstr "Τυπικές εγγραφές"
 #: code:addons/base_module_quality/pylint_test/pylint_test.py:0
 #, python-format
 msgid "No python file found"
-msgstr ""
+msgstr "Δεν βρέθηκε αρχείο python"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
@@ -318,7 +318,7 @@ msgstr ""
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
 #, python-format
 msgid "Status"
-msgstr ""
+msgstr "Κατάσταση"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
@@ -355,7 +355,7 @@ msgstr ""
 #: code:addons/base_module_quality/workflow_test/workflow_test.py:0
 #, python-format
 msgid "Module Name"
-msgstr ""
+msgstr "Όνομα Αρθρώματος"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/unit_test/unit_test.py:0
@@ -385,7 +385,7 @@ msgstr ""
 #: code:addons/base_module_quality/method_test/method_test.py:0
 #, python-format
 msgid "Exception"
-msgstr ""
+msgstr "Εξαίρεση"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/base_module_quality.py:0
@@ -532,25 +532,25 @@ msgstr ""
 #: code:addons/base_module_quality/object_test/object_test.py:0
 #, python-format
 msgid "Field name"
-msgstr ""
+msgstr "Όνομα πεδίου"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/speed_test/speed_test.py:0
 #, python-format
 msgid "Warning! Object has no demo data"
-msgstr ""
+msgstr "Προειδοποίηση! Το αντικείμενο δεν έχει πρόχειρα δεδομένα"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/terp_test/terp_test.py:0
 #, python-format
 msgid "Tag Name"
-msgstr ""
+msgstr "όνομα ετικέτας"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
@@ -635,13 +635,13 @@ msgstr "Περίληψη"
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
 #, python-format
 msgid "File Name"
-msgstr ""
+msgstr "Όνομα Αρχείου"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/pep8_test/pep8_test.py:0
 #, python-format
 msgid "Line number"
-msgstr ""
+msgstr "Αριθμός Γραμμής"
 
 #. module: base_module_quality
 #: code:addons/base_module_quality/structure_test/structure_test.py:0
diff --git a/addons/base_module_record/i18n/base_module_record.pot b/addons/base_module_record/i18n/base_module_record.pot
index 364cefca5ab..c2c33c6be93 100644
--- a/addons/base_module_record/i18n/base_module_record.pot
+++ b/addons/base_module_record/i18n/base_module_record.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgid "Export Customizations As Data File"
 msgstr ""
 
 #. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:0
+#: code:addons/base_module_record/wizard/base_module_save.py:129
 #, python-format
 msgid "Error"
 msgstr ""
diff --git a/addons/base_module_record/i18n/de.po b/addons/base_module_record/i18n/de.po
index 2de858f4c17..a52a29a888c 100644
--- a/addons/base_module_record/i18n/de.po
+++ b/addons/base_module_record/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:15+0000\n"
+"PO-Revision-Date: 2010-12-31 09:44+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -113,7 +113,7 @@ msgstr "Module Aufzeichnung"
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
 msgid "Export Customizations As a Module"
-msgstr "Kundenanpassung als Modul exportieren"
+msgstr "Export Personalisierung als Modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -208,7 +208,7 @@ msgstr "Fortsetzen"
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
 msgid "Export Customizations As Data File"
-msgstr "Exportiere Personalisierung as Datei"
+msgstr "Export Personalisierung als Datei"
 
 #. module: base_module_record
 #: code:addons/base_module_record/wizard/base_module_save.py:0
@@ -230,7 +230,7 @@ msgstr "OK"
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr "Modul Erzeugung"
+msgstr "Export Personalisierung"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,info,data_kind:0
@@ -297,6 +297,34 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die einfache Erstellung eines neuen Moduls ohne "
+"Quellcode zu schreiben.\n"
+"Es werden alle Vorgänge zu ausgewählten Objekten während einer aktiven "
+"Sitzung aufgezeichnet, um\n"
+"dann ein Modul in Form eines .zip Archivs zu exportieren. Somit können Sie "
+"sehr einfach Ihr eigenes \n"
+"Modul mit Hilfe des OpenERP Clients erstellen.\n"
+"\n"
+"Aufgezeichnet werden neu erstellte und/oder geänderte Datensätze. Außerdem "
+"werden \n"
+"abhängige Daten sowie existierende Verbindungen aktualisiert (many2one "
+"Widgets, many2many Widgets, ...). \n"
+"Workflows und Demo/Update Daten werden ebenfalls im Rahmen dieses Moduls "
+"unterstützt.\n"
+"\n"
+"Diese Funktion hilft Ihnen z.B. dabei wiederverwendbare Module zu erstellen "
+"und auf diesem Wege individuelle\n"
+"Konfigurationen zu erstellen und diese für Demos bzw. den realen Einsatz zu "
+"nutzen. \n"
+"\n"
+"Wie sollte das Modul angewendet werden? Starten Sie den Assistenten über das "
+"Menü: \n"
+"Administration/Personalisierung/Export Personalisierung/Export "
+"Personalisierung als Modul\n"
+"Wählen Sie dann eine Datum/Zeit Einstellung für den Export der "
+"aufgezeichneten Personalisierung.\n"
+"    "
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/base_module_record/i18n/el.po b/addons/base_module_record/i18n/el.po
index 92b950fc7ec..35c773f785e 100644
--- a/addons/base_module_record/i18n/el.po
+++ b/addons/base_module_record/i18n/el.po
@@ -6,13 +6,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-12 09:18+0000\n"
+"PO-Revision-Date: 2010-12-29 10:30+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -247,7 +247,7 @@ msgstr "Πληροφορίες Αρθρώματος"
 #: wizard_field:base_module_record.module_record_data,init,info_yaml:0
 #: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
 msgid "YAML"
-msgstr ""
+msgstr "YAML"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_data,info,res_text:0
diff --git a/addons/base_module_record/i18n/it.po b/addons/base_module_record/i18n/it.po
index 02d0917075b..01c6fed3156 100644
--- a/addons/base_module_record/i18n/it.po
+++ b/addons/base_module_record/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:34+0000\n"
+"PO-Revision-Date: 2011-01-01 13: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-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -296,6 +296,30 @@ msgid ""
 "module.\n"
 "    "
 msgstr ""
+"\n"
+"Questo moduli vi permette di creare un nuovo modulo senza sviluppo alcuno.\n"
+"Esso registra tutte le operazioni sull'oggetto durante la sessione di "
+"registrazione e\n"
+"produce un modulo .ZIP. E' così possibile creare il vostro modulo personale "
+"direttamente dal\n"
+"client OpenERP.\n"
+"\n"
+"Questa versione lavora per creare e aggiornare registrazioni esistenti. Essa "
+"ricalcola dipendenze e collegamenti per tutti i tipi di Widget (molti a uno, "
+"molti a molti, ...).\n"
+"Supporta inoltre i workflow e i dati demo/aggiornamento.\n"
+"\n"
+"Questo dovrebbe aiutare nella creazione semplice, riusabile e pubblicabile "
+"dei moduli, \n"
+"nella personalizzazione, nella configurazione e nell'inserimento di dati "
+"demo / test.\n"
+"\n"
+"Come usarlo:\n"
+"Lancia il wizard: Amministrazione/Personalizzazione/Creazione moduli/Esporta "
+"personalizzazione come un modulo.\n"
+"Seleziona il criterio data / ora della registrazione e gli oggetti "
+"interessati e registra il modulo.\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/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index 28228b4ab58..773458fe3cb 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -193,16 +193,16 @@ class report_creator(osv.osv):
         if context is None:
             context = {}
         data = context.get('report_id', False)
+        res = super(report_creator, self).read(cr, user, ids, fields, context, load)
         if (not context) or 'report_id' not in context:
-            return super(report_creator, self).read(cr, user, ids, fields, context, load)
-        ctx = context or {}
+            return res
         wp = ''
-        if data:
+        for data in res:
+            if not data.get('sql_query'):
+                return res
             if self.model_set_id:
                 wp = [self._id_get(cr, user, data, context) + (' in (%s)' % (','.join(map(lambda x: "'" + str(x) + "'", ids))))]
-            report = self._sql_query_get(cr, user, [data], 'sql_query', None, ctx, where_plus = wp)
-            sql_query = report[data]
-            cr.execute(sql_query)
+            cr.execute(data['sql_query'])
             res = cr.dictfetchall()
             fields_get = self.fields_get(cr, user, None, context)
             for r in res:
@@ -216,7 +216,7 @@ class report_creator(osv.osv):
                         related_name = self.pool.get(field_dict.get('relation')).name_get(cr, user, [r[k]], context)[0]
                         r[k] = related_name
 
-            return res
+        return res
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         """
@@ -253,9 +253,8 @@ class report_creator(osv.osv):
                     newargs += [("count(*) " + a[1] +" " + str(a[2]))]
             ctx = context or {}
             ctx['getid'] = True
-            report = self._sql_query_get(cr, user, [context_id], 'sql_query', None, ctx, where_plus = newargs, limit=limit, offset=offset)
-            query = report[context_id]
-            cr.execute(query, newargs2)
+            sql_query = report.sql_query
+            cr.execute(sql_query, newargs2)
             result = cr.fetchall()
             return map(lambda x: x[0], result)
 
diff --git a/addons/base_report_creator/i18n/base_report_creator.pot b/addons/base_report_creator/i18n/base_report_creator.pot
index c51b850f21c..903773f74f4 100644
--- a/addons/base_report_creator/i18n/base_report_creator.pot
+++ b/addons/base_report_creator/i18n/base_report_creator.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgid "Graph Mode"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:0
+#: code:addons/base_report_creator/base_report_creator.py:321
 #, python-format
 msgid "These is/are model(s) (%s) in selection which is/are not related to any other model"
 msgstr ""
@@ -116,7 +116,7 @@ msgid "Custom Reports"
 msgstr ""
 
 #. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:0
+#: code:addons/base_report_creator/base_report_creator.py:321
 #, python-format
 msgid "No Related Models!!"
 msgstr ""
diff --git a/addons/base_report_creator/i18n/de.po b/addons/base_report_creator/i18n/de.po
index a252525b8f6..224abdc4b4b 100644
--- a/addons/base_report_creator/i18n/de.po
+++ b/addons/base_report_creator/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 15:52+0000\n"
+"PO-Revision-Date: 2010-12-29 11:38+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -145,6 +145,7 @@ msgstr "Summe"
 #: constraint:base_report_creator.report:0
 msgid "You must have to give calendar view's color,start date and delay."
 msgstr ""
+"Sie müssen zum Kalender die Farbe angegeben, Startdatum und Laufzeit."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
@@ -246,6 +247,8 @@ msgstr "UND"
 #: constraint:base_report_creator.report:0
 msgid "You can not display field which are not stored in Database."
 msgstr ""
+"Sie können kein Feld anzeigen, welches nicht in der Datenbank gespeichert "
+"wird."
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -384,6 +387,7 @@ msgstr "Abbrechen"
 #: constraint:base_report_creator.report:0
 msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
+"Sie können keine Summenfunktion bei nicht berechenbaren Feldern anwenden."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -416,6 +420,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the report "
 "without removing it."
 msgstr ""
+"Durch Deaktivierung der Option, kann die Auswertung ausgeblendet werden."
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
diff --git a/addons/base_report_creator/i18n/it.po b/addons/base_report_creator/i18n/it.po
index 928101159e0..ed06b86d722 100644
--- a/addons/base_report_creator/i18n/it.po
+++ b/addons/base_report_creator/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:27+0000\n"
+"PO-Revision-Date: 2011-01-01 12:10+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -145,6 +145,8 @@ msgstr "Somma"
 #: constraint:base_report_creator.report:0
 msgid "You must have to give calendar view's color,start date and delay."
 msgstr ""
+"E' necessario fornire il colore di visualizzazione calendario, la data "
+"iniziale e la durata periodo."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
@@ -246,6 +248,7 @@ msgstr "AND"
 #: constraint:base_report_creator.report:0
 msgid "You can not display field which are not stored in Database."
 msgstr ""
+"Non è possibile visualizzare campi che non sono memorizzati nel database."
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
@@ -384,6 +387,7 @@ msgstr "Annulla"
 #: constraint:base_report_creator.report:0
 msgid "You can apply aggregate function to the non calculated field."
 msgstr ""
+"Non è possibile applicare la funzione aggregativa ai campi non calcolati."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,menu_id:0
@@ -416,6 +420,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the report "
 "without removing it."
 msgstr ""
+"Se il campo attivo è impostato su \"falso\", vi permetterà di nascondere il "
+"report senza rimuoverlo."
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
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/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 9d39bba8a61..88f4d9d5a81 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -36,8 +36,7 @@ upload the report using the same wizard.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['security/base_report_security.xml',
-                 'wizard/base_report_design_view.xml'],
+    'init_xml': ['wizard/base_report_design_view.xml'],
     'update_xml': ['base_report_designer_installer.xml'],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/base_report_designer/i18n/base_report_designer.pot b/addons/base_report_designer/i18n/base_report_designer.pot
index 8caa4b3ec9e..950ea864077 100644
--- a/addons/base_report_designer/i18n/base_report_designer.pot
+++ b/addons/base_report_designer/i18n/base_report_designer.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:50+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:50+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
index cd5090bb172..6d4d39f7748 100644
--- a/addons/base_report_designer/i18n/de.po
+++ b/addons/base_report_designer/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 18:19+0000\n"
+"PO-Revision-Date: 2010-12-29 08:51+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -25,7 +25,7 @@ msgstr ""
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "OpenERP Report Designer Configuration"
-msgstr ""
+msgstr "Konfiguration Report Designer"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
@@ -38,6 +38,8 @@ msgid ""
 "This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
 "Writer."
 msgstr ""
+"Dieses Plugin erlaubt es Berichte für OpenERP in Openoffice Writer zu "
+"erstellen oder zu verändern"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -56,6 +58,14 @@ msgid ""
 "you can modify in OpenOffice.Once you have modified it you can\n"
 "upload the report using the same wizard.\n"
 msgstr ""
+"\n"
+"Dieses Modul wird mit dem OpenERP OpenOffice Plugin benutzt.\n"
+"Sie müssen zunächst das Plugin installieren (http://www.openerp.com)\n"
+"\n"
+"Dieses Modul fügt einen Assistenten für den Import/Export von .swx \n"
+"Dateien hinzu, die Sie dann in OpenOffice bearbeiten können. Nach dem \n"
+"bearbeiten können Sie den Bericht auch mit diesem Assistenten wieder\n"
+"hochladen.\n"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index 913d1cb228b..0cf581b1e14 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/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-27 22:32+0000\n"
+"PO-Revision-Date: 2010-12-28 08:27+0000\n"
 "Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 7d3e5520a2a..51c4ff40343 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/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:25+0000\n"
+"PO-Revision-Date: 2011-01-01 11: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-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
@@ -24,7 +24,7 @@ msgstr "base.report.sxw"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "OpenERP Report Designer Configuration"
-msgstr ""
+msgstr "Configurazione Report Designer di OpenERP"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
@@ -37,6 +37,8 @@ msgid ""
 "This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
 "Writer."
 msgstr ""
+"Questo plug in vi permette di creare/modificare i report OpenERP nel Writer "
+"di OpenOffice"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -55,6 +57,15 @@ msgid ""
 "you can modify in OpenOffice.Once you have modified it you can\n"
 "upload the report using the same wizard.\n"
 msgstr ""
+"\n"
+"Questo modulo è usato in abbinamento al plug in OpenERP per OpenOffice.\n"
+"E' necessario prima di tutto installare il plug in, che è disponibile su:\n"
+"http://www.openerp.com\n"
+"\n"
+"Questo modulo aggiunge wizard per importare/esportare report .SXW  che\n"
+"sono modificabili in OpenOffice. Una volta che è stato modificato è anche "
+"possibile\n"
+"ricaricare il report in OpenERP utilizzando lo stesso wizard.\n"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -191,7 +202,7 @@ msgstr "Imagine"
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
 msgid "Base Report sxw"
-msgstr ""
+msgstr "Report base SXW"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_file_sxw
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index b54ad6c7131..f4730290ce7 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.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: 2010-08-03 03:47+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-12-31 10:45+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+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 "OpenERP 报表设计器配置"
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
@@ -36,7 +36,7 @@ msgstr "报表设计接口模块"
 msgid ""
 "This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
 "Writer."
-msgstr ""
+msgstr "该插件允许您在 OpenOffice Writer 软件中创建或修改 OpenERP 报表。"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -64,32 +64,32 @@ msgstr "这.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 "说明"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "关闭(_C)"
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "The RML report"
-msgstr ""
+msgstr "RML 报表"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "配置"
 
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "title"
-msgstr ""
+msgstr "title"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
@@ -100,7 +100,7 @@ msgstr "报表"
 #. 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 "报表设计者"
 #. module: base_report_designer
 #: field:base_report_designer.installer,name:0
 msgid "File name"
-msgstr ""
+msgstr "文件名"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -122,7 +122,7 @@ msgstr "给一个报表"
 #: 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 "OpenERP 报表设计器"
 
 #. module: base_report_designer
 #: view:base.report.sxw:0
@@ -132,19 +132,19 @@ msgstr "继续"
 #. module: base_report_designer
 #: field:base.report.rml.save,file_rml:0
 msgid "Save As"
-msgstr ""
+msgstr "另存为"
 
 #. module: base_report_designer
 #: help:base_report_designer.installer,plugin_file:0
 msgid ""
 "OpenObject Report Designer plug-in file. Save as this file and install this "
 "plug-in in OpenOffice."
-msgstr ""
+msgstr "报表设计器插件文件。请保存此文件并作为 OpenOffice 软件的插件安装。"
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
 msgid "Save RML FIle"
-msgstr ""
+msgstr "保存 RML 文件"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,file_sxw:0
@@ -155,12 +155,12 @@ msgstr "你的.SXW文件"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "安装和配置步骤"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "配置进度"
 
 #. 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 "跳过"
 
 #. module: base_report_designer
 #: field:base_report_designer.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图片"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
 msgid "Base Report sxw"
-msgstr ""
+msgstr "基本的报表 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 "报表设计器插件"
 
 #. module: base_report_designer
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
 msgid "OpenERP Report Designer Installation"
-msgstr ""
+msgstr "OpenERP 报表设计器安装程序"
 
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
@@ -211,7 +211,7 @@ msgstr "取消"
 #. 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 77314929269..4819007f1d0 100644
--- a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
+++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
@@ -344,7 +344,6 @@ if __name__ == "__main__":
         parser.error("incorrect number of arguments")
 
     import sys
-    import StringIO
 
     fname = sys.argv[1]
     f = fname
diff --git a/addons/base_report_designer/plugin/openerp_report_designer.zip b/addons/base_report_designer/plugin/openerp_report_designer.zip
index 50524b2e60d..47ca560e47d 100644
Binary files a/addons/base_report_designer/plugin/openerp_report_designer.zip and b/addons/base_report_designer/plugin/openerp_report_designer.zip differ
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index 123be9b9bc2..3cf759e7ada 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -140,28 +140,16 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
             ErrorDialog("Connection Refuse...","Please enter valid Login/Password")
             self.win.endExecute()
         try:
-
-            ids  = self.sock.execute(sDatabase,UID,sPassword, 'res.groups' ,  'search', [('name','=','OpenOfficeReportDesigner')])
             ids_module =self.sock.execute(sDatabase, UID, sPassword, 'ir.module.module', 'search', [('name','=','base_report_designer'),('state', '=', 'installed')])
-            dict_groups =self.sock.execute(sDatabase, UID,sPassword, 'res.groups' , 'read',ids,['users'])
         except :
             import traceback,sys
             info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
             self.logobj.log_write('ServerParameter', LOG_ERROR, info)
 
-        if not len(ids) :
-            ErrorDialog("Group Not Found!!!  Create a group  named  \n\n"'"OpenOfficeReportDesigner"'"  \n\n  ","","Group Name Error")
-            self.logobj.log_write('Group Error',LOG_WARNING, ':Create a  group OpenOfficeReportDesigner   using database %s' % (sDatabase))
-            self.win.endExecute()
         if not len(ids_module):
             ErrorDialog("Please Install base_report_designer module", "", "Module Uninstalled Error")
             self.logobj.log_write('Module Not Found',LOG_WARNING, ':base_report_designer not install in  database %s' % (sDatabase))
             self.win.endExecute()
-
-        if UID not in dict_groups[0]['users']:
-            ErrorDialog("Connection Refuse...","You have not access these Report Designer")
-            self.logobj.log_write('Connection Refuse',LOG_WARNING, " Not Access Report Designer ")
-            self.win.endExecute()
         else:
             desktop=getDesktop()
             doc = desktop.getCurrentComponent()
diff --git a/addons/base_report_designer/security/base_report_security.xml b/addons/base_report_designer/security/base_report_security.xml
deleted file mode 100644
index bd3854ebdba..00000000000
--- a/addons/base_report_designer/security/base_report_security.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data noupdate="1">
-		<record id="res_groups_openofficereportdesigner0" model="res.groups">
-			<field eval="[(6,0,[])]" name="menu_access"/>
-			<field eval="[(6,0,[])]" name="rule_groups"/>
-			<field eval="[(6,0,[ref('base.user_root')])]" name="users"/>
-			<field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
-		</record>
-
-       <record id="ir_model_access_openofficereportdesigner0" model="ir.model.access">
-           <field name="model_id" ref="base.model_ir_actions_report_xml"/>
-           <field eval="1" name="perm_read"/>
-           <field eval="&quot;&quot;&quot;OpenOfficeReportDesigner&quot;&quot;&quot;" name="name"/>
-           <field eval="1" name="perm_unlink"/>
-           <field eval="1" name="perm_write"/>
-           <field eval="1" name="perm_create"/>
-           <field name="group_id" ref="res_groups_openofficereportdesigner0"/>
-       </record>
-	</data>
-
-</openerp>
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index fe053c831df..de0ad85ba99 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:50+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:50+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -86,7 +86,7 @@ msgid "Helps you handle your accounting needs, if you are not an accountant, we
 msgstr ""
 
 #. module: base_setup
-#: code:addons/base_setup/__init__.py:0
+#: code:addons/base_setup/__init__.py:50
 #, python-format
 msgid "The following users have been installed : \n"
 ""
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 7bdcb2c046e..2be552ea151 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-20 09:37+0000\n"
+"PO-Revision-Date: 2010-12-31 10:59+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@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:16+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -81,7 +81,7 @@ msgstr "销售点"
 #. module: base_setup
 #: field:base.setup.installer,association:0
 msgid "Associations"
-msgstr ""
+msgstr "协会"
 
 #. module: base_setup
 #: help:base.setup.installer,account_accountant:0
@@ -145,7 +145,7 @@ msgstr ""
 msgid ""
 "You can start configuring the system or connect directly to the database as "
 "an administrator."
-msgstr ""
+msgstr "您可以选择开始配置系统或者直接作为管理员连接到数据库。"
 
 #. module: base_setup
 #: field:base.setup.installer,report_designer:0
@@ -160,7 +160,7 @@ msgstr "电话"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -172,12 +172,12 @@ msgstr ""
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
-msgstr ""
+msgstr "title"
 
 #. module: base_setup
 #: field:base.setup.installer,knowledge:0
 msgid "Knowledge Management"
-msgstr ""
+msgstr "知识管理"
 
 #. module: base_setup
 #: model:ir.module.module,description:base_setup.module_meta_information
@@ -232,7 +232,7 @@ msgstr "公司名称"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Skip Configuration Wizards"
-msgstr ""
+msgstr "跳过配置向导"
 
 #. module: base_setup
 #: help:base.setup.installer,hr:0
@@ -251,14 +251,14 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_company
 msgid "base.setup.company"
-msgstr ""
+msgstr "base.setup.company"
 
 #. module: base_setup
 #: help:base.setup.installer,purchase:0
 msgid ""
 "Helps you manage your purchase-related processes such as requests for "
 "quotations, supplier invoices, etc..."
-msgstr ""
+msgstr "帮助您管理采购相关流程，如询价、供货商发票等等"
 
 #. module: base_setup
 #: help:base.setup.company,rml_footer2:0
@@ -271,12 +271,12 @@ msgstr "这将显示在报表底部.建议你输入银行的信息"
 #. module: base_setup
 #: field:base.setup.company,street2:0
 msgid "Street 2"
-msgstr ""
+msgstr "街道地址 2"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_installer
 msgid "base.setup.installer"
-msgstr ""
+msgstr "base.setup.installer"
 
 #. module: base_setup
 #: field:base.setup.company,country_id:0
@@ -291,17 +291,17 @@ msgstr "设置"
 #. module: base_setup
 #: field:base.setup.installer,account_accountant:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "会计与财务"
 
 #. module: base_setup
 #: field:base.setup.installer,auction:0
 msgid "Auction Houses"
-msgstr ""
+msgstr "拍卖行"
 
 #. module: base_setup
 #: field:base.setup.company,zip:0
 msgid "Zip Code"
-msgstr ""
+msgstr "邮政编码"
 
 #. module: base_setup
 #: view:base.setup.config:0
@@ -313,7 +313,7 @@ msgstr "开始设置"
 msgid ""
 "Lets you install addons geared towards sharing knowledge with and between "
 "your employees."
-msgstr ""
+msgstr "让您安装附加的模块使您可以与您的雇员分享知识。"
 
 #. module: base_setup
 #: view:base.setup.installer:0
@@ -326,7 +326,7 @@ msgstr ""
 #: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
-msgstr ""
+msgstr "单位配置"
 
 #. module: base_setup
 #: field:base.setup.company,logo:0
@@ -344,37 +344,37 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
-msgstr ""
+msgstr "采购管理"
 
 #. module: base_setup
 #: help:base.setup.installer,sale:0
 msgid "Helps you handle your quotations, sale orders and invoicing."
-msgstr ""
+msgstr "帮助您处理报价单、销售单和发票。"
 
 #. module: base_setup
 #: field:base.setup.installer,stock:0
 msgid "Warehouse Management"
-msgstr ""
+msgstr "仓库管理"
 
 #. module: base_setup
 #: field:base.setup.installer,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "项目管理"
 
 #. module: base_setup
 #: field:base.setup.config,installed_users:0
 msgid "Installed Users"
-msgstr ""
+msgstr "已安装的用户"
 
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "New Database"
-msgstr ""
+msgstr "新数据库"
 
 #. module: base_setup
 #: field:base.setup.installer,crm:0
 msgid "Customer Relationship Management"
-msgstr ""
+msgstr "客户关系管理"
 
 #. module: base_setup
 #: help:base.setup.installer,auction:0
@@ -396,7 +396,7 @@ msgstr "这将显示在报表的右上角,建议你放一个标语."
 msgid ""
 "Lets you install various tools to simplify and enhance OpenERP's report "
 "creation."
-msgstr ""
+msgstr "让您安装工具来简化和增强 OpenERP 的报表创建功能."
 
 #. module: base_setup
 #: field:base.setup.company,rml_header1:0
@@ -406,24 +406,24 @@ msgstr "报表页眉"
 #. module: base_setup
 #: view:base.setup.config:0
 msgid "Information about your new database"
-msgstr ""
+msgstr "您的新数据库信息"
 
 #. module: base_setup
 #: field:base.setup.company,config_logo:0
 #: field:base.setup.config,config_logo:0
 #: field:base.setup.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图片"
 
 #. module: base_setup
 #: field:base.setup.installer,product_expiry:0
 msgid "Food Industry"
-msgstr ""
+msgstr "食品工业"
 
 #. module: base_setup
 #: field:base.setup.installer,mrp:0
 msgid "Manufacturing"
-msgstr ""
+msgstr "生产管理"
 
 #. module: base_setup
 #: view:base.setup.company:0
@@ -441,12 +441,12 @@ msgstr "这将显示在报表底部,建议你放入正式的公司信息."
 #. module: base_setup
 #: field:base.setup.company,website:0
 msgid "Company Website"
-msgstr ""
+msgstr "公司网站"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "Install Specific Industry Applications"
-msgstr ""
+msgstr "安装特定行业应用"
 
 #. module: base_setup
 #: field:base.setup.company,street:0
@@ -456,18 +456,18 @@ msgstr "街区"
 #. module: base_setup
 #: view:base.setup.company:0
 msgid "Configure Your Company Information"
-msgstr ""
+msgstr "配置您的单位信息"
 
 #. module: base_setup
 #: help:base.setup.company,website:0
 msgid "Example: http://openerp.com"
-msgstr ""
+msgstr "例如：http://openerp.com"
 
 #. module: base_setup
 #: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
-msgstr ""
+msgstr "安装应用"
 
 #. module: base_setup
 #: help:base.setup.installer,crm:0
@@ -482,7 +482,7 @@ msgstr ""
 msgid ""
 "Helps you manage your inventory and main stock operations: delivery orders, "
 "receptions, etc."
-msgstr ""
+msgstr "帮助您管理库存与仓库相关操作：发货单、收货单等等"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
@@ -499,7 +499,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_config
 msgid "base.setup.config"
-msgstr ""
+msgstr "base.setup.config"
 
 #~ msgid "Profile"
 #~ msgstr "配置"
diff --git a/addons/base_synchro/i18n/base_synchro.pot b/addons/base_synchro/i18n/base_synchro.pot
index 39cd7a700e6..748f2eb8c9b 100644
--- a/addons/base_synchro/i18n/base_synchro.pot
+++ b/addons/base_synchro/i18n/base_synchro.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_synchro/i18n/de.po b/addons/base_synchro/i18n/de.po
index d5ddf158876..a0cb14d0fb1 100644
--- a/addons/base_synchro/i18n/de.po
+++ b/addons/base_synchro/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:47+0000\n"
+"PO-Revision-Date: 2010-12-29 09:45+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-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_synchro
@@ -170,7 +170,7 @@ msgstr "Synchronisierte Instanzen"
 #. module: base_synchro
 #: field:base.synchro.obj,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: base_synchro
 #: view:base.synchro.obj:0
diff --git a/addons/base_tools/i18n/base_tools.pot b/addons/base_tools/i18n/base_tools.pot
index f6e7b0230d3..923e474412d 100644
--- a/addons/base_tools/i18n/base_tools.pot
+++ b/addons/base_tools/i18n/base_tools.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot
index 74687ff0de1..71b0c9d3c10 100644
--- a/addons/base_vat/i18n/base_vat.pot
+++ b/addons/base_vat/i18n/base_vat.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: base_vat
-#: code:addons/base_vat/base_vat.py:0
+#: code:addons/base_vat/base_vat.py:87
 #, python-format
 msgid "The Vat does not seems to be correct. You should have entered something like this %s"
 msgstr ""
@@ -42,7 +42,7 @@ msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: base_vat
-#: code:addons/base_vat/base_vat.py:0
+#: code:addons/base_vat/base_vat.py:88
 #, python-format
 msgid "The VAT is invalid, It should begin with the country code"
 msgstr ""
diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po
index 295cf6abffa..57ca1a761b6 100644
--- a/addons/base_vat/i18n/de.po
+++ b/addons/base_vat/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 11:39+0000\n"
+"PO-Revision-Date: 2010-12-29 10:28+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -40,6 +40,14 @@ msgid ""
 "countries.\n"
 "    "
 msgstr ""
+"\n"
+"    Aktivieren Sie die UST-ID für den Partner. Prüfen Sie die Gültigkeit.\n"
+"\n"
+"    Dieses Modul verwendet die Logik, die unter  http://sima-pc.com/nif.php "
+"beschrieben wird,\n"
+"    zur Prüfung der Gültigkeit einer UST-ID, die Sie bei einem "
+"Geschäftspartner aus der EU zuweisen.\n"
+"    "
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
@@ -51,7 +59,7 @@ msgstr ""
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:0
diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po
index 74857cfdf00..06f533bd96d 100644
--- a/addons/base_vat/i18n/hu.po
+++ b/addons/base_vat/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-12-29 10:39+0000\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ <openerp@novotrade.hu>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -64,7 +64,7 @@ msgstr ""
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index a135d71f276..07c47c4d2a6 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-22 07:37+0000\n"
+"PO-Revision-Date: 2011-01-01 13:29+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:14+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -39,6 +39,14 @@ msgid ""
 "countries.\n"
 "    "
 msgstr ""
+"\n"
+"    Abilita la partita IVA per il partner. Controlla la validità del valore "
+"fornito.\n"
+"\n"
+"    Questo modulo segue i metofi definiti in http://sima-pc.com/nif.php per\n"
+"    controllare la validità del numero assegnato ai partner nei paesi "
+"europei.\n"
+"    "
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
@@ -48,7 +56,7 @@ msgstr "Base VAT - Per controllare la correttezza della Partita IVA"
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Errore! Non è possibile creare membri associati ricorsivi."
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:0
diff --git a/addons/board/board.py b/addons/board/board.py
index 8662aa5bff2..7de35fcc5f8 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -120,7 +120,6 @@ class board_board(osv.osv):
         @return: Dictionary of Fields, arch and toolbar.
         """
 
-
         res = {}
         res = super(board_board, self).fields_view_get(cr, user, view_id, view_type,\
                                  context, toolbar=toolbar, submenu=submenu)
@@ -131,9 +130,31 @@ class board_board(osv.osv):
             view_id = vids[0]
             arch = self.pool.get('ir.ui.view.custom').browse(cr, user, view_id, context=context)
             res['arch'] = arch.arch
-
+        res['arch'] = self._arch_preprocessing(cr, user, res['arch'], context=context)
         res['toolbar'] = {'print': [], 'action': [], 'relate': []}
         return res
+    
+    
+    def _arch_preprocessing(self, cr, user, arch, context=None): 
+        from lxml import etree                               
+        def remove_unauthorized_children(node):
+            for child in node.iterchildren():
+                if child.tag=='action' and child.get('invisible'):
+                    node.remove(child)
+                else:
+                    child=remove_unauthorized_children(child)
+            return node
+        
+        def encode(s):
+            if isinstance(s, unicode):
+                return s.encode('utf8')
+            return s
+            
+        archnode = etree.fromstring(encode(arch))        
+        return etree.tostring(remove_unauthorized_children(archnode),pretty_print=True)
+        
+        
+    
 
     _columns = {
         'name': fields.char('Dashboard', size=64, required=True),
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index f5555892a60..347e9d22436 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:52+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:52+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:20+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@ msgid "Latest Connections"
 msgstr ""
 
 #. module: board
-#: code:addons/board/wizard/board_menu_create.py:0
+#: code:addons/board/wizard/board_menu_create.py:45
 #, python-format
 msgid "User Error!"
 msgstr ""
@@ -377,7 +377,7 @@ msgid "Dashboard View"
 msgstr ""
 
 #. module: board
-#: code:addons/board/wizard/board_menu_create.py:0
+#: code:addons/board/wizard/board_menu_create.py:46
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
 msgstr ""
diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po
index 0de6b36d3e4..5082be802b6 100644
--- a/addons/board/i18n/de.po
+++ b/addons/board/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 15:59+0000\n"
+"PO-Revision-Date: 2010-12-29 11:19+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -229,7 +229,7 @@ msgstr "Obermenü"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Monat -1    "
 
 #. module: board
 #: selection:res.log.report,month:0
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index 6d59db8b08e..bc3d5db102a 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/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-27 22:43+0000\n"
+"PO-Revision-Date: 2010-12-31 09: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-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -228,7 +228,7 @@ msgstr "Menu Parent"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mois -1    "
 
 #. module: board
 #: selection:res.log.report,month:0
diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po
index bd29d722d14..533d0f89484 100644
--- a/addons/board/i18n/it.po
+++ b/addons/board/i18n/it.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-12 09:19+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
-"<lorenzo.battistini@agilebg.com>\n"
+"PO-Revision-Date: 2011-01-01 11:27+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -229,7 +228,7 @@ msgstr "Menu Superiore"
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mese-1    "
 
 #. module: board
 #: selection:res.log.report,month:0
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index aa8da752a9b..89a048e69c4 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-11 23:27+0000\n"
-"Last-Translator: ZhangCheng <skyxxzc@gmail.com>\n"
+"PO-Revision-Date: 2011-01-01 12:57+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -24,7 +24,7 @@ msgstr ""
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "菜单创建"
 
 #. module: board
 #: view:board.note:0
@@ -60,7 +60,7 @@ msgstr "用户错误！"
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 #: model:ir.ui.menu,name:board.menu_board_admin
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "管理员仪表盘"
 
 #. module: board
 #: view:board.note:0
@@ -73,19 +73,19 @@ msgstr "备注"
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组于"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "仪表盘"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "每周全局活动"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -95,7 +95,7 @@ msgstr "标题"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "# 条"
 
 #. module: board
 #: view:res.log.report:0
@@ -118,7 +118,7 @@ msgstr ""
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "日志分析"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -140,7 +140,7 @@ msgstr "八月"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "用户连接列表"
 
 #. module: board
 #: field:res.log.report,creation_date:0
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 0110e1678ae..1909601eb00 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -4,4 +4,6 @@
 "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
 "access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
-
+"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1
+"access_res_log_report_system","res.log.report system","model_res_log_report",base.group_system,1,0,0,0
+"access_res_log_report_erp_manager","res.log.report erp_manager","model_res_log_report",base.group_erp_manager,1,0,0,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/caldav.pot b/addons/caldav/i18n/caldav.pot
index 4ee66ba785a..76186a5f033 100644
--- a/addons/caldav/i18n/caldav.pot
+++ b/addons/caldav/i18n/caldav.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,7 @@ msgid "Ok"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:861
 #, python-format
 msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
 msgstr ""
@@ -91,14 +91,15 @@ msgid "File name"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
 #, python-format
 msgid "Error!"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
-#: code:addons/caldav/wizard/calendar_event_import.py:0
+#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/wizard/calendar_event_import.py:63
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -114,7 +115,7 @@ msgid "Use the field"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:772
 #, python-format
 msgid "Can not create line \"%s\" more than once"
 msgstr ""
@@ -173,18 +174,13 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#. module: caldav
-#: field:basic.calendar,description:0
-msgid "description"
-msgstr ""
-
 #. module: caldav
 #: help:calendar.event.export,name:0
 msgid "Save in .ics format"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:1275
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -256,13 +252,12 @@ msgid "Calendar"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+#: view:basic.calendar:0
+msgid "Todo"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:0
+#: code:addons/caldav/wizard/calendar_event_import.py:63
 #, python-format
 msgid "Invalid format of the ics, file can not be imported"
 msgstr ""
@@ -296,7 +291,7 @@ msgid "Calendar Collections"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:798
 #: sql_constraint:basic.calendar.alias:0
 #, python-format
 msgid "The same filename cannot apply to two records!"
@@ -320,13 +315,18 @@ msgstr ""
 msgid "Collection"
 msgstr ""
 
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr ""
+
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
 #, python-format
 msgid "Please provide Proper URL !"
 msgstr ""
@@ -389,6 +389,7 @@ msgstr ""
 
 #. module: caldav
 #: view:basic.calendar:0
+#: field:basic.calendar,description:0
 msgid "Description"
 msgstr ""
 
@@ -403,13 +404,14 @@ msgid "Mapping"
 msgstr ""
 
 #. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
 msgstr ""
 
 #. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Modifided Date"
+#: view:calendar.event.import:0
+msgid "_Import"
 msgstr ""
 
 #. module: caldav
@@ -451,7 +453,7 @@ msgid "basic.calendar.alarm"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:1275
 #, python-format
 msgid "Attendee must have an Email Id"
 msgstr ""
@@ -462,7 +464,7 @@ msgid "Export .ics File"
 msgstr ""
 
 #. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:41
 #, python-format
 msgid "vobject Import Error!"
 msgstr ""
@@ -493,8 +495,9 @@ msgid "Color"
 msgstr ""
 
 #. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
 msgstr ""
 
 #. module: caldav
diff --git a/addons/caldav/i18n/de.po b/addons/caldav/i18n/de.po
index cf86f8cd445..df950d85f1b 100644
--- a/addons/caldav/i18n/de.po
+++ b/addons/caldav/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 17:53+0000\n"
+"PO-Revision-Date: 2010-12-31 09:27+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
@@ -57,7 +57,7 @@ msgstr "Teilnehmer"
 #. module: caldav
 #: sql_constraint:basic.calendar.fields:0
 msgid "Can not map a field more than once"
-msgstr ""
+msgstr "Das Feld kann nur einmal zugewiesen werden."
 
 #. module: caldav
 #: selection:basic.calendar,type:0
@@ -224,6 +224,31 @@ msgid ""
 "created\n"
 "        CALENDAR_NAME: Name of calendar to access\n"
 msgstr ""
+"\n"
+"    Dieses Modul beinhaltet die Basisfunktionen für ein caldav "
+"Kalendersystem:  \n"
+"  - WebDav Server, für den Remote Zugriff auf einen Kalender\n"
+"  - Synchronisation von Kalendern durch CalDav Nutzung\n"
+"  - Individuelle Konfiguration der Attribute Termin und Aufgabe für alle "
+"OpenERP Objekte\n"
+"  - Bereitstellung von ical Import/Export Funktionalität\n"
+"\n"
+"    Für einen Zugriff auf Kalender durch CalDav fähige Anwendungen, "
+"verwenden Sie folgende Adresse:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+"    Für einen Remote Zugriff auf OpenERP Kalender via WebCal verwenden Sie "
+"folgendes Adressmuster:\n"
+"        "
+"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+"      wobei folgendes gilt:\n"
+"        HOSTNAME: Host auf dem der OpenERP Server (mit WebDav) läuft\n"
+"        PORT: Port auf dem der OpenERP Server läuft (Standard: 8069)\n"
+"        DATABASE_NAME: Name der Datenbank mit dem erstellten OpenERP "
+"Kalender\n"
+"        CALENDAR_NAME: Name des Kalenders, der verbunden werden soll\n"
 
 #. module: caldav
 #: field:basic.calendar,create_date:0
@@ -269,12 +294,15 @@ msgstr "Kalender"
 msgid ""
 "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
 msgstr ""
+"Bitte installieren Sie python-vobject von "
+"http://vobject.skyhouseconsulting.com/"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_import.py:0
 #, python-format
 msgid "Invalid format of the ics, file can not be imported"
 msgstr ""
+"Ungültiges Format der .ics Datei. Diese Datei kann nicht importiert werden."
 
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
@@ -481,7 +509,7 @@ msgstr "Exportiere .ics Datei"
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "vobject Import Error!"
-msgstr ""
+msgstr "vobject Importfehler!"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/caldav/i18n/fr.po b/addons/caldav/i18n/fr.po
index f36dcf54a0c..7f4c70f1b09 100644
--- a/addons/caldav/i18n/fr.po
+++ b/addons/caldav/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-20 00:07+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-01-01 11:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
@@ -46,7 +45,7 @@ msgstr ""
 #. module: caldav
 #: view:calendar.event.export:0
 msgid "_Close"
-msgstr ""
+msgstr "_Fermer"
 
 #. module: caldav
 #: selection:basic.calendar.attributes,type:0
@@ -64,12 +63,12 @@ msgstr ""
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "TODO"
-msgstr ""
+msgstr "Á faire"
 
 #. module: caldav
 #: field:basic.calendar.lines,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Objet"
 
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
@@ -80,7 +79,7 @@ msgstr ""
 #: view:calendar.event.import:0
 #: view:calendar.event.subscribe:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
@@ -93,20 +92,20 @@ msgstr ""
 #. module: caldav
 #: field:calendar.event.export,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nom du fichier"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
 #: code:addons/caldav/wizard/calendar_event_import.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertissement !"
 
 #. module: caldav
 #: view:calendar.event.export:0
@@ -122,7 +121,7 @@ msgstr ""
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Can not create line \"%s\" more than once"
-msgstr ""
+msgstr "Impossible de créer la ligne \"%s\" plus d'une fois"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -192,7 +191,7 @@ msgstr "Sauvegarder au format .ics"
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attributes
@@ -229,7 +228,7 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -239,7 +238,7 @@ msgstr ""
 #. module: caldav
 #: model:ir.model,name:caldav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "Répertoire"
 
 #. module: caldav
 #: field:calendar.event.subscribe,url_path:0
@@ -249,12 +248,12 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar.lines,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Domaine"
 
 #. module: caldav
 #: field:basic.calendar,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Propriétaire"
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -262,7 +261,7 @@ msgstr ""
 #: field:basic.calendar.lines,calendar_id:0
 #: model:ir.ui.menu,name:caldav.menu_calendar
 msgid "Calendar"
-msgstr ""
+msgstr "Calendrier"
 
 #. module: caldav
 #: code:addons/caldav/calendar.py:0
@@ -290,7 +289,7 @@ msgstr ""
 #. module: caldav
 #: view:calendar.event.subscribe:0
 msgid "Message..."
-msgstr ""
+msgstr "Message..."
 
 #. module: caldav
 #: view:basic.calendar:0
@@ -323,7 +322,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:caldav.action_caldav_form
 #: model:ir.ui.menu,name:caldav.menu_caldav_directories
 msgid "Calendars"
-msgstr ""
+msgstr "Calendriers"
 
 #. module: caldav
 #: field:basic.calendar,collection_id:0
@@ -333,7 +332,7 @@ msgstr ""
 #. module: caldav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Le nom du répertoire doit être unique !"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_subscribe.py:0
@@ -349,7 +348,7 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar.fields,expr:0
 msgid "Expression"
-msgstr ""
+msgstr "Expression"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_attendee
@@ -380,7 +379,7 @@ msgstr ""
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Other Info"
-msgstr ""
+msgstr "Autres Informations"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
@@ -397,12 +396,12 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar.fields,fn:0
 msgid "Function"
-msgstr ""
+msgstr "Fonction"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: caldav
 #: help:basic.calendar.alias,cal_line_id:0
@@ -417,7 +416,7 @@ msgstr ""
 #. module: caldav
 #: view:calendar.event.import:0
 msgid "_Import"
-msgstr ""
+msgstr "_Importer"
 
 #. module: caldav
 #: field:basic.calendar,write_date:0
@@ -432,7 +431,7 @@ msgstr ""
 #. module: caldav
 #: selection:basic.calendar.fields,fn:0
 msgid "Interval in hours"
-msgstr ""
+msgstr "Intervalle (en heures)"
 
 #. module: caldav
 #: view:calendar.event.subscribe:0
@@ -449,13 +448,13 @@ msgstr ""
 #: field:basic.calendar.attributes,name:0
 #: field:basic.calendar.fields,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: caldav
 #: selection:basic.calendar.attributes,type:0
 #: selection:basic.calendar.lines,name:0
 msgid "Alarm"
-msgstr ""
+msgstr "Rappel"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_alarm
@@ -502,12 +501,12 @@ msgstr ""
 #. module: caldav
 #: field:basic.calendar,calendar_color:0
 msgid "Color"
-msgstr ""
+msgstr "Couleur"
 
 #. module: caldav
 #: view:basic.calendar:0
 msgid "Todo"
-msgstr ""
+msgstr "À faire"
 
 #. module: caldav
 #: model:ir.model,name:caldav.model_basic_calendar_fields
diff --git a/addons/caldav/i18n/it.po b/addons/caldav/i18n/it.po
index bbea214de58..2a99e0d2a75 100644
--- a/addons/caldav/i18n/it.po
+++ b/addons/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-30 18:49+0000\n"
+"PO-Revision-Date: 2011-01-01 13:26+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: caldav
@@ -56,7 +56,7 @@ msgstr "Partecipante"
 #. module: caldav
 #: sql_constraint:basic.calendar.fields:0
 msgid "Can not map a field more than once"
-msgstr ""
+msgstr "Non è possibile mappare un campo più di una volta"
 
 #. module: caldav
 #: selection:basic.calendar,type:0
@@ -269,12 +269,14 @@ msgstr "Calendario"
 msgid ""
 "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
 msgstr ""
+"Per favore installare python-vobject da "
+"http://vobject.skyhouseconsulting.com/"
 
 #. module: caldav
 #: code:addons/caldav/wizard/calendar_event_import.py:0
 #, python-format
 msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
+msgstr "Formato non valido dell ics, il file non può essere importato"
 
 #. module: caldav
 #: field:basic.calendar.fields,field_id:0
@@ -478,7 +480,7 @@ msgstr "Esporta file .ICS"
 #: code:addons/caldav/calendar.py:0
 #, python-format
 msgid "vobject Import Error!"
-msgstr ""
+msgstr "Errore importazione vobject!"
 
 #. module: caldav
 #: view:basic.calendar:0
diff --git a/addons/claim_from_delivery/i18n/claim_from_delivery.pot b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
index 833d0530e69..9fad6a894ab 100644
--- a/addons/claim_from_delivery/i18n/claim_from_delivery.pot
+++ b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/claim_from_delivery/i18n/fr.po b/addons/claim_from_delivery/i18n/fr.po
index 1b767834e16..0d711631a19 100644
--- a/addons/claim_from_delivery/i18n/fr.po
+++ b/addons/claim_from_delivery/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 08:48+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-01-01 13:04+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:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+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 "Réclamation"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,description:claim_from_delivery.module_meta_information
diff --git a/addons/claim_from_delivery/i18n/it.po b/addons/claim_from_delivery/i18n/it.po
index 216cca22574..0892a842fd9 100644
--- a/addons/claim_from_delivery/i18n/it.po
+++ b/addons/claim_from_delivery/i18n/it.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-22 07:34+0000\n"
+"PO-Revision-Date: 2010-12-29 12:12+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim"
-msgstr ""
+msgstr "Reclamo"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,description:claim_from_delivery.module_meta_information
 msgid "Create Claim from delivery order:\n"
-msgstr ""
+msgstr "Crea il reclamo dall'ordine di consegna:\n"
 
 #. module: claim_from_delivery
 #: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
 msgid "Claim from delivery"
-msgstr ""
+msgstr "Reclamo da consegna"
 
 #~ msgid "Picking List"
 #~ msgstr "Picking List"
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 89dc61bef59..74eb1a95b23 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -125,6 +125,7 @@ Create dashboard for CRM that includes:
             'test/test_crm_meeting.yml',
             'test/test_crm_opportunity.yml',
             'test/test_crm_phonecall.yml',
+            'test/test_crm_recurrent_meeting.yml',
              ],
     'installable': True,
     'active': False,
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index e629330751f..16ae0e73129 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -5,5 +5,12 @@
             <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
         </record>
 
+    <record id="ir_ui_view_sc_calendar_demo" model="ir.ui.view_sc">
+        <field name="name">Meetings</field>
+        <field name="resource">ir.ui.menu</field>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="res_id" ref="crm.menu_crm_case_categ_meet"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 9a61fda01bd..ae9f584d059 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -44,7 +44,7 @@
                     <field name="alarm_id" string="Reminder"
                         widget="selection" />
                     <group colspan="2" col="4" >
-                           <field name="recurrency"/>      
+                           <field name="recurrency"/>
                            <field name="edit_all" attrs="{'invisible':[('recurrency','=', False)]}"
                                 on_change="onchange_edit_all(rrule_type,edit_all)"/>
                     </group>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 6c66dc94848..7a60af9533b 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -60,7 +60,7 @@
             <form string="Phone Call">
                  <group colspan="6" col="7">
                     <field name="name" required="1"/>
-                    <field name="partner_phone" required="1"/>
+                    <field name="partner_phone"/>
                     <field name="duration" widget="float_time" required="1"/>
                     <button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
 
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index a3e29f91cfc..c2c03b740ea 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:57+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:57+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:24+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,6 @@ msgid "# Leads"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
@@ -81,6 +80,7 @@ msgid "Select Opportunities"
 msgstr ""
 
 #. module: crm
+#: view:crm.meeting:0
 #: view:crm.phonecall2opportunity:0
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
@@ -99,7 +99,7 @@ msgid "Previous Stage"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_add_note.py:0
+#: code:addons/crm/wizard/crm_add_note.py:26
 #, python-format
 msgid "Can not add note!"
 msgstr ""
@@ -123,13 +123,13 @@ msgid "The code of the sales team must be unique !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:228
 #, python-format
 msgid "The lead '%s' has been closed."
 msgstr ""
@@ -140,9 +140,10 @@ msgid "No Repeat"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#: code:addons/crm/wizard/crm_lead_to_partner.py:0
-#: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_partner.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -178,22 +179,24 @@ msgid "Search Opportunities"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
 #, python-format
 msgid "Opportunity must have Partner assigned before merging with other Opportunity."
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead.report:0
-#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
-#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
-msgid "Opportunities Analysis"
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Can not send mail!"
 msgstr ""
 
 #. module: crm
@@ -227,15 +230,22 @@ msgstr ""
 #: view:crm.phonecall:0
 #: view:crm.phonecall2phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
+#: view:res.partner:0
 msgid "Schedule Other Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:0
-#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:0
+#: help:crm.meeting,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
+#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:89
 #: model:crm.case.categ,name:crm.categ_meet3
 #: view:crm.phonecall:0
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
+#: view:res.partner:0
 #, python-format
 msgid "Phone Call"
 msgstr ""
@@ -246,7 +256,7 @@ msgid "Opt-Out"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_opportunity.py:108
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
 msgstr ""
@@ -304,11 +314,6 @@ msgstr ""
 msgid "Campaigns"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
-msgid "Create specific phone call categories to better sort the type of calls tracked in the system."
-msgstr ""
-
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -366,7 +371,7 @@ msgid "Regular Expression on Case History"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:209
 #, python-format
 msgid "The lead '%s' has been opened."
 msgstr ""
@@ -388,7 +393,6 @@ msgid "When a real project/opportunity is detected"
 msgstr ""
 
 #. module: crm
-#: selection:crm.case.stage,type:0
 #: field:crm.installer,crm_fundraising:0
 msgid "Fundraising"
 msgstr ""
@@ -419,6 +423,11 @@ msgstr ""
 msgid "Set State To"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid "Outbound Calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team."
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
 msgid "Convert/Merge Opportunity"
@@ -429,11 +438,6 @@ msgstr ""
 msgid "Update Date"
 msgstr ""
 
-#. module: crm
-#: help:crm.meeting,count:0
-msgid "Repeat max that times"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
@@ -504,8 +508,10 @@ msgid "Very first contact with new prospect"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#: code:addons/crm/crm_lead.py:278
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
 #: view:crm.lead2opportunity:0
 #: view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -521,7 +527,7 @@ msgid "Configure"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:378
 #: view:crm.lead:0
 #: view:res.partner:0
 #, python-format
@@ -566,11 +572,6 @@ msgstr ""
 msgid "crm.send.mail.attachment"
 msgstr ""
 
-#. module: crm
-#: field:crm.meeting,count:0
-msgid "Count"
-msgstr ""
-
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
@@ -621,11 +622,6 @@ msgstr ""
 msgid "Default state of mind for period preceeding the 'Max Interval' computation. This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
-#. module: crm
-#: selection:crm.case.stage,type:0
-msgid "Claim"
-msgstr ""
-
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
@@ -657,7 +653,7 @@ msgid "The channels represent the different communication
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
 msgstr ""
@@ -668,7 +664,7 @@ msgid "Responsible User"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
 #, python-format
 msgid "A partner is already defined on this phonecall."
 msgstr ""
@@ -698,11 +694,6 @@ msgstr ""
 msgid "Partner Segmentation Lines"
 msgstr ""
 
-#. module: crm
-#: help:crm.meeting,active:0
-msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
@@ -763,10 +754,10 @@ msgid "Statistics Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#: code:addons/crm/wizard/crm_partner_to_opportunity.py:0
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#: selection:crm.case.stage,type:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
@@ -798,8 +789,10 @@ msgid "Search Phonecalls"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
-msgid "Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their leads and sales opportunities. It will allow them to easily track how is positioned a specific lead or opportunity in the sales cycle."
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
 msgstr ""
 
 #. module: crm
@@ -834,7 +827,7 @@ msgid "Exclusive"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_opportunity.py:91
 #, python-format
 msgid "The opportunity '%s' has been won."
 msgstr ""
@@ -964,7 +957,7 @@ msgid "March"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:230
 #, python-format
 msgid "The opportunity '%s' has been closed."
 msgstr ""
@@ -980,7 +973,7 @@ msgid "Show time as"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:264
 #: view:crm.phonecall2partner:0
 #, python-format
 msgid "Create Partner"
@@ -998,7 +991,7 @@ msgid "Mobile"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
 #, python-format
 msgid "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
@@ -1024,9 +1017,10 @@ msgid "Opt-In"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#: code:addons/crm/crm_phonecall.py:0
-#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:208
+#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
 #: view:crm.meeting:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet
@@ -1039,9 +1033,16 @@ msgid "Meetings"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+#: view:crm.meeting:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
 msgstr ""
 
 #. module: crm
@@ -1055,18 +1056,12 @@ msgid "Deadline"
 msgstr ""
 
 #. module: crm
-#: view:crm.add.note:0
-#: view:crm.merge.opportunity:0
-#: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2phonecall:0
-#: view:crm.send.mail:0
-msgid "_Cancel"
+#: help:crm.meeting,active:0
+msgid "If the active field is set to          true, it will allow you to hide the event alarm information without removing it."
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
 msgstr ""
@@ -1076,6 +1071,15 @@ msgstr ""
 msgid "Partner Segmentations"
 msgstr ""
 
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,user_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,user_id:0
+#: view:res.partner:0
+msgid "Responsible"
+msgstr ""
+
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
@@ -1087,13 +1091,9 @@ msgid "Statistics"
 msgstr ""
 
 #. module: crm
-#: field:crm.meeting,attendee_ids:0
-msgid "Attendees"
-msgstr ""
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid "'Leads' allows you to manage and keep track of all first potential interests of a partner in one of your products or services. A lead is a first, unqualified, contact with a prospect or customer. After being qualified, a lead can be converted into a business opportunity with the creation of the related partner for further detailed tracking of any linked activities. You can use leads when you import a database of prospects or to integrate your website's contact form with OpenERP."
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_from:0
+msgid "From"
 msgstr ""
 
 #. module: crm
@@ -1136,6 +1136,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
+#: view:res.partner:0
 msgid "Type"
 msgstr ""
 
@@ -1176,11 +1177,6 @@ msgstr ""
 msgid "Creation Date"
 msgstr ""
 
-#. module: crm
-#: help:crm.meeting,interval:0
-msgid "Repeat every x"
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
@@ -1205,7 +1201,7 @@ msgid "Tue"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:300
 #: view:crm.case.stage:0
 #: view:crm.lead:0
 #: field:crm.lead,stage_id:0
@@ -1235,6 +1231,11 @@ msgstr ""
 msgid "Mark as"
 msgstr ""
 
+#. module: crm
+#: field:crm.meeting,count:0
+msgid "Repeat"
+msgstr ""
+
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
@@ -1265,6 +1266,11 @@ msgstr ""
 msgid "Expected Revenue"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid "Create specific phone call categories to better define the type of calls tracked in the system."
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead.report,month:0
 #: selection:crm.meeting,month_list:0
@@ -1294,13 +1300,6 @@ msgstr ""
 msgid "Duration in Minutes"
 msgstr ""
 
-#. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
@@ -1323,7 +1322,7 @@ msgid "  Year  "
 msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0
+#: field:crm.meeting,edit_all:0
 msgid "Edit All"
 msgstr ""
 
@@ -1332,11 +1331,21 @@ msgstr ""
 msgid "Fri"
 msgstr ""
 
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
 msgstr ""
 
+#. module: crm
+#: view:crm.meeting:0
+msgid "End of recurrency"
+msgstr ""
+
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
@@ -1354,6 +1363,7 @@ msgstr ""
 #: view:crm.phonecall2partner:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
+#: view:res.partner:0
 msgid "Create a Partner"
 msgstr ""
 
@@ -1430,6 +1440,11 @@ msgstr ""
 msgid "Interval"
 msgstr ""
 
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
@@ -1441,6 +1456,11 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid "Create specific partner categories which you can assign to your partners to better manage your interactions with them. The segmentation tool is able to assign categories to partners according to criteria you set."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
@@ -1480,13 +1500,12 @@ msgid "References"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:392
 #: view:crm.lead:0
 #: view:crm.lead2opportunity:0
 #: view:crm.lead2opportunity.action:0
 #: view:crm.lead2opportunity.partner:0
 #: view:crm.lead2partner:0
-#: view:crm.meeting:0
 #: view:crm.phonecall:0
 #: view:crm.phonecall2partner:0
 #: view:res.partner:0
@@ -1504,11 +1523,6 @@ msgstr ""
 msgid "Merge two Opportunities"
 msgstr ""
 
-#. module: crm
-#: selection:crm.meeting,rrule_type:0
-msgid "Custom"
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
@@ -1552,7 +1566,7 @@ msgid "Sale Amount"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_send_email.py:0
+#: code:addons/crm/wizard/crm_send_email.py:141
 #, python-format
 msgid "Unable to send mail. Please check SMTP is configured properly."
 msgstr ""
@@ -1562,6 +1576,11 @@ msgstr ""
 msgid "="
 msgstr ""
 
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Leads"
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
@@ -1581,17 +1600,17 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
-msgid "The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form for the traceability of every contact you get with a partner. From the call record, you can trigger a request for another call, a meeting or a business opportunity."
-msgstr ""
-
 #. module: crm
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid "Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle."
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -1632,11 +1651,6 @@ msgstr ""
 msgid "High"
 msgstr ""
 
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
-msgstr ""
-
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
@@ -1647,6 +1661,11 @@ msgstr ""
 msgid "_Convert"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid "With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer."
+msgstr ""
+
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
@@ -1727,7 +1746,7 @@ msgid "Zip"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:213
 #, python-format
 msgid "The case '%s' has been opened."
 msgstr ""
@@ -1783,6 +1802,16 @@ msgstr ""
 msgid "Highest"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid "The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity."
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
 #. module: crm
 #: view:crm.case.section:0
 #: view:crm.lead:0
@@ -1827,11 +1856,6 @@ msgstr ""
 msgid "Reply-To"
 msgstr ""
 
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Minutes"
-msgstr ""
-
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select stages for this Sales Team"
@@ -1842,6 +1866,11 @@ msgstr ""
 msgid "Opportunities by Stage"
 msgstr ""
 
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency Option"
+msgstr ""
+
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
@@ -1864,6 +1893,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
+#: view:res.partner:0
 msgid "Reset to Draft"
 msgstr ""
 
@@ -1905,7 +1935,7 @@ msgid "Create"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:492
 #, python-format
 msgid "Send"
 msgstr ""
@@ -1952,7 +1982,7 @@ msgid "Schedule a normal or phone meeting"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:375
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -2006,6 +2036,16 @@ msgstr ""
 msgid "July"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid "Define a Sales Team to organize your different salesmen or sales departments into separate teams. Each team will work in its own list of opportunities, sales orders, etc. Each user can set a default team in his user preferences. The opportunities and sales order displayed, will automatically be filtered according to his team."
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,count:0
+msgid "Repeat x times"
+msgstr ""
+
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
@@ -2064,6 +2104,11 @@ msgstr ""
 msgid "Leads"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid "Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect."
+msgstr ""
+
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2partner,action:0
@@ -2104,7 +2149,7 @@ msgid "Reset to Unconfirmed"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_add_note.py:0
+#: code:addons/crm/wizard/crm_add_note.py:40
 #: view:crm.add.note:0
 #, python-format
 msgid "Note"
@@ -2148,12 +2193,7 @@ msgid "Internal Meeting"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
-msgid "Create specific categories that fit your company's  activities in order to better classify and analyse them after they have been maintained in your leads and opportunities. You can use categories to reflect your product structure or the different types of sales you do."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:411
 #: selection:crm.add.note,state:0
 #: view:crm.lead:0
 #: selection:crm.lead,state:0
@@ -2172,11 +2212,6 @@ msgstr ""
 msgid "Customer Meeting"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_section_act
-msgid "Sales team allows you to organize your different salesmen or departments into separate teams. Each team will work in his own list of opportunities, sales orders, eso. Each user can set a team by default in his preferences. The opportunities and sales order he will see, will be automatically filtered according to his team."
-msgstr ""
-
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,email_cc:0
@@ -2213,7 +2248,7 @@ msgid "Active"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:306
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
 msgstr ""
@@ -2259,18 +2294,6 @@ msgstr ""
 msgid "This may help associations in their fundraising process and tracking."
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid "Opportunities allows you to manage and keep track of your sales pipeline by creating specific customer or prospect related sales documents in order to follow up potential sales. Information such as the expected revenue, opportunity stage, expected closing date, communication history and so on can be maintained in them. Opportunities can be connected with the email gateway: new emails create opportunities, each of them automatically gets the history of the conversation with the customer.\n"
-"\n"
-"You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more."
-msgstr ""
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
-msgid "Outbound Calls lists all the calls to be performed by your sales team. They can record the information about the call on the form view. These information will appear on the partner form for the traceability of every contact you get with a customer. You can import a .CSV file with a list of calls to be done for your sales team."
-msgstr ""
-
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2partner,action:0
@@ -2301,9 +2324,10 @@ msgid "Weekly"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_send_email.py:0
-#, python-format
-msgid "Can not send mail!"
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
+#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
+msgid "Opportunities Analysis"
 msgstr ""
 
 #. module: crm
@@ -2311,11 +2335,6 @@ msgstr ""
 msgid "Misc"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
-msgid "Create specific partner categories that you will then be able to assign to your partners to better manage your interactions with them. The segmentation tool will assign categories to partners based on defined criteria."
-msgstr ""
-
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
 #: view:crm.meeting:0
@@ -2329,6 +2348,11 @@ msgstr ""
 msgid "Done"
 msgstr ""
 
+#. module: crm
+#: help:crm.meeting,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
@@ -2340,7 +2364,7 @@ msgid "_Schedule Call"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:326
 #: selection:crm.add.note,state:0
 #: view:crm.lead:0
 #: selection:crm.lead,state:0
@@ -2375,16 +2399,12 @@ msgid "Helpdesk"
 msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0
-#: field:crm.meeting,user_id:0
-#: view:crm.phonecall:0
-#: field:crm.phonecall,user_id:0
-#: view:res.partner:0
-msgid "Responsible"
+#: field:crm.meeting,recurrency:0
+msgid "Recurrent"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:397
 #, python-format
 msgid "The case '%s' has been cancelled."
 msgstr ""
@@ -2439,7 +2459,7 @@ msgid "Meeting Type"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
 #, python-format
 msgid "Merge with Existing Opportunity"
 msgstr ""
@@ -2474,11 +2494,6 @@ msgstr ""
 msgid "My Win/Lost Ratio for the Last Year"
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "Custom Recurrency Rule"
-msgstr ""
-
 #. module: crm
 #: field:crm.installer,thunderbird:0
 msgid "Thunderbird"
@@ -2490,8 +2505,8 @@ msgid "# of Emails"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead:0
-msgid "Search Leads"
+#: view:crm.meeting:0
+msgid "Repeat interval"
 msgstr ""
 
 #. module: crm
@@ -2502,8 +2517,8 @@ msgid "Delay to open"
 msgstr ""
 
 #. module: crm
-#: model:ir.model,name:crm.model_crm_lead
-msgid "crm.lead"
+#: view:crm.meeting:0
+msgid "Recurrency period"
 msgstr ""
 
 #. module: crm
@@ -2572,12 +2587,6 @@ msgstr ""
 msgid "Duration"
 msgstr ""
 
-#. module: crm
-#: field:crm.opportunity2phonecall,name:0
-#: field:crm.phonecall2phonecall,name:0
-msgid "Call summary"
-msgstr ""
-
 #. module: crm
 #: field:crm.send.mail,reply_to:0
 msgid "Reply To"
@@ -2591,7 +2600,7 @@ msgid "Sales Dashboard"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:0
+#: code:addons/crm/wizard/crm_lead_to_partner.py:56
 #, python-format
 msgid "A partner is already defined on this lead."
 msgstr ""
@@ -2636,6 +2645,13 @@ msgstr ""
 msgid "Fax"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid "With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more."
+msgstr ""
+
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
@@ -2694,7 +2710,7 @@ msgid "Add Internal Note"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:304
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
 msgstr ""
@@ -2717,16 +2733,18 @@ msgid "Change Probability on next and previous stages."
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
-#: code:addons/crm/crm_action_rule.py:0
-#: code:addons/crm/wizard/crm_send_email.py:0
+#: code:addons/crm/crm.py:455
+#: code:addons/crm/crm.py:457
+#: code:addons/crm/crm_action_rule.py:66
+#: code:addons/crm/wizard/crm_send_email.py:141
 #, python-format
 msgid "Error!"
 msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0
-msgid "Exclude range"
+#: field:crm.opportunity2phonecall,name:0
+#: field:crm.phonecall2phonecall,name:0
+msgid "Call summary"
 msgstr ""
 
 #. module: crm
@@ -2746,11 +2764,6 @@ msgstr ""
 msgid "Note Body"
 msgstr ""
 
-#. module: crm
-#: model:ir.actions.act_window,help:crm.action_view_attendee_form
-msgid "'Meeting Invitations' allows you to create and manage the meeting invitations sent/to be sent to your colleagues/partners."
-msgstr ""
-
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
@@ -2774,8 +2787,8 @@ msgid "Links"
 msgstr ""
 
 #. module: crm
-#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
-msgid "From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report."
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid "Create specific categories that fit your company's activities to better classify and analyse your leads and opportunities. Such categories could for instance reflect your product structure or the different types of sales you do."
 msgstr ""
 
 #. module: crm
@@ -2783,6 +2796,11 @@ msgstr ""
 msgid "If the partner has not purchased (or bought) during a period, decrease the state of mind by this factor. It's a multiplication"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid "From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report."
+msgstr ""
+
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mailgateway"
@@ -2799,7 +2817,7 @@ msgid "# Mails"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -2861,7 +2879,7 @@ msgid "Total of Planned Revenue"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:375
 #, python-format
 msgid "You can not escalate, You are already at the top level regarding your sales-team category."
 msgstr ""
@@ -2915,11 +2933,10 @@ msgid "Schedule Call"
 msgstr ""
 
 #. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
 msgstr ""
 
 #. module: crm
@@ -2994,6 +3011,17 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.partner2opportunity:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid "_Cancel"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
@@ -3005,11 +3033,6 @@ msgstr ""
 msgid "This module relates sale from opportunity cases in the CRM."
 msgstr ""
 
-#. module: crm
-#: view:crm.meeting:0
-msgid "of"
-msgstr ""
-
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
@@ -3135,6 +3158,7 @@ msgstr ""
 #: field:crm.lead,job_ids:0
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
+#: view:res.partner:0
 msgid "Contacts"
 msgstr ""
 
@@ -3170,7 +3194,7 @@ msgid "Success Probability"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:426
 #: selection:crm.add.note,state:0
 #: selection:crm.lead,state:0
 #: selection:crm.lead.report,state:0
@@ -3188,19 +3212,16 @@ msgid "Cases by Sales Team"
 msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0
-#: field:crm.send.mail,email_from:0
-msgid "From"
+#: field:crm.meeting,attendee_ids:0
+msgid "Attendees"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_meeting.py:0
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 #: model:ir.model,name:crm.model_crm_meeting
 #: model:process.node,name:crm.process_node_meeting0
 #: model:res.request.link,name:crm.request_link_meeting
-#, python-format
 msgid "Meeting"
 msgstr ""
 
@@ -3275,7 +3296,7 @@ msgid "November"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_action_rule.py:0
+#: code:addons/crm/crm_action_rule.py:67
 #, python-format
 msgid "No E-Mail ID Found for your Company address!"
 msgstr ""
@@ -3313,8 +3334,10 @@ msgid "Twitter Ads"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_add_note.py:0
-#: code:addons/crm/wizard/crm_send_email.py:0
+#: code:addons/crm/wizard/crm_add_note.py:26
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
 #, python-format
 msgid "Error"
 msgstr ""
@@ -3335,7 +3358,7 @@ msgid "Error ! You can not create recursive profiles."
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:232
 #, python-format
 msgid "The case '%s' has been closed."
 msgstr ""
@@ -3358,13 +3381,13 @@ msgid "You can not have two users with the same login !"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#: code:addons/crm/wizard/crm_merge_opportunities.py:100
 #, python-format
 msgid "Merged into Opportunity: %s"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:347
 #: view:crm.lead:0
 #: view:res.partner:0
 #, python-format
@@ -3374,6 +3397,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.phonecall:0
+#: view:res.partner:0
 msgid "Categorization"
 msgstr ""
 
@@ -3383,7 +3407,6 @@ msgid "Action Rules"
 msgstr ""
 
 #. module: crm
-#: view:crm.meeting:0
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
 msgstr ""
@@ -3431,6 +3454,7 @@ msgstr ""
 #: view:crm.phonecall:0
 #: field:crm.phonecall,description:0
 #: field:crm.segmentation,description:0
+#: view:res.partner:0
 msgid "Description"
 msgstr ""
 
@@ -3467,7 +3491,7 @@ msgid "Interest in Accessories"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:211
 #, python-format
 msgid "The opportunity '%s' has been opened."
 msgstr ""
@@ -3508,6 +3532,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
+#: view:res.partner:0
 msgid "Schedule a Meeting"
 msgstr ""
 
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index 5e733112b40..73b63fb09ca 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-14 23:10+0000\n"
+"PO-Revision-Date: 2010-12-31 10:03+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -383,7 +383,7 @@ msgstr "Ansprechpartner"
 #. module: crm
 #: view:crm.installer:0
 msgid "Enhance your core CRM Application with additional functionalities."
-msgstr ""
+msgstr "Erweitern Sie die CRM Anwendung durch zusätzliche Funktionen."
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -548,7 +548,7 @@ msgstr "Erstelle Verkaufschance"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -669,7 +669,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Claim"
-msgstr ""
+msgstr "Reklamation"
 
 #. module: crm
 #: constraint:base.action.rule:0
@@ -754,7 +754,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Arbeitszeit"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -1228,7 +1228,7 @@ msgid ""
 "can use leads when you import a database of prospects or to integrate your "
 "website's contact form with OpenERP."
 msgstr ""
-"'Kundenkontakte' ermöglichen die Verfolgung von interessanten Kontaktdaten "
+"Verkaufskontakte ermöglichen die Verfolgung von interessanten Kontaktdaten "
 "für bestimmte Produktangebote des Unternehmens. Zunächst ist ein "
 "Kundenkontakt lediglich eine noch noch nicht qualifizierte Kundenadresse. Es "
 "muss qualifiziert werden, inwieweit eine weitere Bearbeitung durch den "
@@ -1699,7 +1699,7 @@ msgstr "Suche Termine"
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr "Betrag Verkauf"
+msgstr "Umsatz Verkauf"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_send_email.py:0
@@ -2115,7 +2115,7 @@ msgstr "Priorität"
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr "Aktiviere Verkauf / Einkauf Regel"
+msgstr "Aktiviere Umsatz / Zufriedenheit Segmentierung"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
@@ -2819,7 +2819,7 @@ msgstr "Information zu Teilnehmern"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr "Test Segmentierung"
+msgstr "Kriterien Segmentierung"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2829,7 +2829,7 @@ msgstr "Prozess fortsetzen"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure Your CRM Application"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre CRM Anwendung"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
@@ -3240,7 +3240,7 @@ msgstr "Nächste Aktion"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr "Profilierung Aufgaben & Rechnungen"
+msgstr "Profilerstellung"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -3642,6 +3642,10 @@ msgid ""
 "them to easily track how is positioned a specific opportunity in the sales "
 "cycle."
 msgstr ""
+"Erstellen Sie spezifische Vertriebsstufen, deren Anwendung die Bearbeitung "
+"von Vertriebschancen erleichtert. Hilfreich ist die Angabe der Stufe für die "
+"Rückverfolgung von Verkaufsvorgängen sowie als zusätzliche Information zum "
+"Bearbeitungsstatus."
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 62b1465ecea..8a75fd1dfdb 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 13:20+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-01-01 09: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-24 05:10+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -38,7 +37,7 @@ msgstr "Besoin de services"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr "Mensuel"
+msgstr "Mensuelle"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0
@@ -48,7 +47,7 @@ msgstr "Planifier un appel"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "Etape des cas"
+msgstr "Etape de cas"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -122,7 +121,7 @@ msgstr "Jour"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr ""
+msgstr "Le code de l'équipe de vente doit être unique !"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -329,6 +328,8 @@ msgid ""
 "Create specific phone call categories to better sort the type of calls "
 "tracked in the system."
 msgstr ""
+"Créer une catégorie d'appels téléphoniques spécifique pour mieux trier le "
+"suivi des types d'appels dans le système."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -380,6 +381,7 @@ msgstr "Contact"
 #: view:crm.installer:0
 msgid "Enhance your core CRM Application with additional functionalities."
 msgstr ""
+"Ajoutez des fonctionnalités supplémentaires à votre application de CRM."
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -544,7 +546,7 @@ msgstr "Créer une opportunité"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurer"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -670,7 +672,7 @@ msgstr "Réclamation"
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Erreur : email mal formé."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -751,7 +753,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 msgid "Working Time"
-msgstr ""
+msgstr "Temps de travail"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -1197,6 +1199,8 @@ msgstr "_Annuler"
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
 msgstr ""
+"Les appels téléphoniques fermés ou annulés ne peuvent pas être convertis en "
+"opportunités."
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1731,6 +1735,11 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"L'analyse des opportunités donne un accès instantané à vos opportunités avec "
+"des informations telles que les recettes attendues, les coûts prévus, les "
+"dépassements de délais ou le nombre d'interactions par opportunités. Ce "
+"rapport est principalement utilisé par le directeur des ventes pour les "
+"revues de compte périodiques avec les équipes commerciales."
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1749,6 +1758,10 @@ msgid ""
 "contact you get with a partner. From the call record, you can trigger a "
 "request for another call, a meeting or a business opportunity."
 msgstr ""
+"L'outil \"Appels entrants\" enregistre les appels entrants à la volée. "
+"Chaque appel vous apparaîtra sur le formulaire du partenaire afin de tracer "
+"chaque contact obtenu. A partir de l'appel enregidté, on peut programmer un "
+"nouvel appel, une réunion ou une opportunité d'affaires."
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0
@@ -1994,6 +2007,10 @@ msgid ""
 "opportunities. You can also synchronize meetings with your mobile phone "
 "using the caldav interface."
 msgstr ""
+"Le calendrier des réunions est partagé entre les équipes de vente et "
+"pleinement intégré avec d'autres applications comme les congés ou les "
+"opportunités d'affaires. On peut également synchroniser des réunions avec "
+"les téléphones mobiles en utilisant l'interface CalDAV."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
@@ -2545,6 +2562,10 @@ msgid ""
 "your partners to better manage your interactions with them. The segmentation "
 "tool will assign categories to partners based on defined criteria."
 msgstr ""
+"Créer des catégories de partenaires que vous serez alors en mesure "
+"d'affecter à vos partenaires afin de mieux gérer les interactions avec eux. "
+"L'outil de segmentation affecte des catégories aux partenaires en fonction "
+"des critères définis"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -2787,7 +2808,7 @@ msgstr "Continuer le processus"
 #. module: crm
 #: view:crm.installer:0
 msgid "Configure Your CRM Application"
-msgstr ""
+msgstr "Configurer l'application CRM"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
@@ -3000,6 +3021,8 @@ msgid ""
 "'Meeting Invitations' allows you to create and manage the meeting "
 "invitations sent/to be sent to your colleagues/partners."
 msgstr ""
+"\"Invitations à réunion\"  permet de créer et de gérer les invitations aux "
+"réunions envoyées ou à envoyer aux collaborateurs et aux partenaires."
 
 #. module: crm
 #: view:board.board:0
@@ -3031,6 +3054,10 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"A partir de ce rapport, vous pouvez analyser les performances de votre "
+"équipe de ventes, selon leurs appels téléphoniques. Vous pouvez grouper ou "
+"filtrer les informations en fonction de plusieurs critères et extraire les "
+"informations, en ajoutant plus de groupes dans le rapport."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -3458,7 +3485,7 @@ msgstr ""
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de membres associés récursifs."
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3633,7 +3660,7 @@ msgstr "A besoin de consultation"
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer des profils récursifs."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -3657,6 +3684,7 @@ msgstr "Date de l'identifiant récurrent"
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
 msgstr ""
+"Vous ne pouvez pas avoir deux utilisateurs avec le même identifiant !"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index 86a19467964..872a60b826c 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-24 09:40+0000\n"
+"PO-Revision-Date: 2010-12-29 12:32+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:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -662,7 +662,7 @@ msgstr ""
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Errore: La mail non è formattata correttamente"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1041,7 +1041,7 @@ msgstr "L'opportunità \"%s\" è stata chiusa."
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Giorni per l'apertura"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1072,6 +1072,8 @@ msgstr "Cellulare"
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
+"Non ci sono altre opportunità \"Aperte\" o \"In corso\" per il partner "
+"\"%s\"."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1196,7 +1198,7 @@ msgstr "Vinto"
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Scadenza superata"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
@@ -1366,7 +1368,7 @@ msgstr "Analisi telefonate"
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Data apertura"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
@@ -1458,7 +1460,7 @@ msgstr "Lunedì"
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Giorni per la chiusura"
 
 #. module: crm
 #: field:crm.add.note,attachment_ids:0
@@ -1511,7 +1513,7 @@ msgstr "Cerca"
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "Opportunità per categorie"
 
 #. module: crm
 #: field:crm.meeting,interval:0
@@ -1537,7 +1539,7 @@ msgstr "Codice"
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Team figli"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1627,7 +1629,7 @@ msgstr "Invita persone"
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Errore! Non è possibile creare un team di vendita ricorsivo."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1757,7 +1759,7 @@ msgstr "Sabato"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Quinto"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
@@ -1808,12 +1810,12 @@ msgstr "Dettagli invito"
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Team padre"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Data prossima azione"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1952,7 +1954,7 @@ msgstr ""
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Opportunità per fase"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -2341,7 +2343,7 @@ msgstr "Attivo"
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "La fare dell'opportunità \"%s\" è cambiata a \"%s\"."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2356,7 +2358,7 @@ msgstr ">"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Non sicuro"
 
 #. module: crm
 #: field:crm.send.mail,email_cc:0
@@ -2508,7 +2510,7 @@ msgstr "Martedì"
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "Città"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
@@ -2567,7 +2569,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Lavoro principale"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2646,12 +2648,12 @@ msgstr ""
 #. module: crm
 #: field:crm.installer,thunderbird:0
 msgid "Thunderbird"
-msgstr ""
+msgstr "Thunderbird"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "# di email"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2663,7 +2665,7 @@ msgstr "Ricerca iniziative"
 #: view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Ritardo di apertura"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
@@ -2673,7 +2675,7 @@ msgstr "crm.lead"
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Giorno della settimana"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2708,7 +2710,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Telefonata al partner"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2752,7 +2754,7 @@ msgstr "Rispondi a"
 #: model:ir.actions.act_window,name:crm.open_board_crm
 #: model:ir.ui.menu,name:crm.menu_board_crm
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Dashboard vendite"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:0
@@ -2770,7 +2772,7 @@ msgstr "Numero di Casi"
 #: help:crm.meeting,section_id:0
 #: help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Team di vendita a cui il caso appartiene"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2793,7 +2795,7 @@ msgstr "Invariato"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr ""
+msgstr "Segmentazione dei partner"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2839,7 +2841,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Nome Oggetto"
 
 #. module: crm
 #: help:crm.lead,email_from:0
@@ -2855,13 +2857,13 @@ msgstr ""
 #: view:crm.lead:0
 #: model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Aggiungi nota interna"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "La fase dell'iniziativa \"%s\" è cambiata in \"%s\""
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2873,12 +2875,12 @@ msgstr ""
 #: field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Messaggi"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid "Change Probability on next and previous stages."
-msgstr ""
+msgstr "Cambia la probabilità nella prossimo e nella precedente fase"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -2891,7 +2893,7 @@ msgstr "Errore!"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Exclude range"
-msgstr ""
+msgstr "Intervallo di esclusione"
 
 #. module: crm
 #: selection:crm.add.note,state:0
@@ -2937,7 +2939,7 @@ msgstr "   Mese   "
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Collegamenti"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2975,7 +2977,7 @@ msgstr "# Mail"
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Attenzione"
 
 #. module: crm
 #: field:crm.phonecall,name:0
@@ -3056,7 +3058,7 @@ msgstr "Giorno del mese"
 #. module: crm
 #: field:crm.lead2opportunity,probability:0
 msgid "Success Rate (%)"
-msgstr ""
+msgstr "Tasso di successo (%)"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3067,7 +3069,7 @@ msgstr "Nuovo"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail TO"
-msgstr ""
+msgstr "Mail A"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3129,6 +3131,7 @@ msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
 msgstr ""
+"La data di scadenza è calcolata automaticamente dalla data inizio + durata"
 
 #. module: crm
 #: field:crm.lead,state_id:0
@@ -3138,7 +3141,7 @@ msgstr "Stato fed."
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Crea opportunità di business dall'iniziativa"
 
 #. module: crm
 #: help:crm.send.mail,html:0
@@ -3164,7 +3167,7 @@ msgstr ""
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Imposta categoria a"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -3206,7 +3209,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Definition"
-msgstr ""
+msgstr "Definizione fase"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3223,7 +3226,7 @@ msgstr "Dicembre"
 #. module: crm
 #: field:crm.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Immagine"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -3327,12 +3330,12 @@ msgstr "Contatti"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Interessato ai Computer"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Dettagli Invito"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3350,7 +3353,7 @@ msgstr ""
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Errore! Non è possibile creare dei membri associati ricorsivi."
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3374,7 +3377,7 @@ msgstr "Bozza"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Casi per Team di vendita"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3396,7 +3399,7 @@ msgstr "Riunione"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Categoria del caso"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3436,7 +3439,7 @@ msgstr "VIa (2)"
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "Categorie Meeting"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0
@@ -3472,7 +3475,7 @@ msgstr "Non è stata ritrovata email per il tuo indirizzo"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Opportunità per fase"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index b78872d6db2..80d8c956542 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-20 13:29+0000\n"
+"PO-Revision-Date: 2010-12-31 10:21+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:12+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "# Prospecções"
+msgstr "Nº Prospecções"
 
 #. module: crm
 #: selection:crm.case.stage,type:0
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 2cbc87ccd30..b321463f385 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-21 14:48+0000\n"
+"PO-Revision-Date: 2011-01-01 10:09+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:11+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -634,6 +634,8 @@ msgid ""
 "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 ""
+"Позволяет связать эл. почту с документами OpenERP. Вы можете прикрепить его "
+"к любому существующему в OpenERP или создать новый."
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -660,7 +662,7 @@ msgstr "Ошибка: письмо плохо отформатировано"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr ""
+msgstr "Опции профилирования"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -754,6 +756,8 @@ msgid ""
 "Helps you to synchronize the meetings with other calendar clients and "
 "mobiles."
 msgstr ""
+"Помогает вам синхронизировать встречи с другими календарями и календарями "
+"мобильных телефонов."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml
index 3c4a988cc79..353a8c95432 100644
--- a/addons/crm/test/test_crm_lead.yml
+++ b/addons/crm/test/test_crm_lead.yml
@@ -1,12 +1,12 @@
 -  |
-   In order to test the CRM in OpenERP, 
+   In order to test the CRM in OpenERP,
    I will do a customer qualification process that
    starts with a fist contact with a customer (a lead), which will be converted to a
    business opportunity and a partner.
 -  |
    In order to test the flow, I create a two new users "user_crm" and
    I assign the group "salesman".
-- 
+-
    !record {model: res.users, id: res_users_usercrm0}:
      company_id: base.main_company
      context_lang: en_US
@@ -16,11 +16,11 @@
      login: user_crm
      name: user_crm
      password: user_crm
-  
+
 -  |
    I start by creating a new lead "New Customer" and I provide an address to this
    new customer, as well as an email "info@mycustomer.com".
-- 
+-
    !record {model: crm.lead, id: crm_lead_newcustomer0}:
      email_from: info@mycustomer.com
      name: New Customer
@@ -30,26 +30,26 @@
      section_id: crm.section_sales_department
      referred: False
 -  |
-   I check that the lead is in 'draft' state, 
--    
+   I check that the lead is in 'draft' state,
+-
    !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in Draft}:
      - state == "draft"
 -
    I open lead by click on "Open" button,
--   
+-
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_lead_newcustomer0")])
 - |
   I check that lead is now in 'open' state.
 -
   !assert {model: crm.lead, id: crm_lead_newcustomer0, string: Lead in open state}:
-     - state == "open"  
-       
+     - state == "open"
+
 -  |
    As the lead seems to be a real business opportunity, I will convert it to a
-   partner 
+   partner
    and a business opportunity by clicking on the "Convert" button.
--  
+-
    !python {model: crm.lead}: |
      lead = self.browse(cr, uid, ref('crm_lead_newcustomer0'))
      action = self.convert_opportunity(cr, uid, [ref("crm_lead_newcustomer0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
@@ -66,21 +66,21 @@
    !python {model: crm.lead2opportunity.partner}: |
       self.make_partner(cr, uid, [ref("crm_lead2opportunity_partner_create_0")], {'active_ids': [ref("crm_lead_newcustomer0")]})
 -
-  Now, I give value to this wizard field.     
+  Now, I give value to this wizard field.
 -
-  !record {model: crm.lead2opportunity, id: crm_lead2opportunity_stonage_0}: 
+  !record {model: crm.lead2opportunity, id: crm_lead2opportunity_stonage_0}:
       name:  Capegemini
       planned_revenue: 0.00
       probability: 0.00
 -
   Then, Click on "Create Opportunity" button of this wizard.
--      
+-
   !python {model: crm.lead2opportunity}: |
      self.action_apply(cr, uid, [ref('crm_lead2opportunity_stonage_0')], {'active_id': ref('crm_lead_newcustomer0')})
 
 -  |
    In order to check the opportunity is created or not, I check type.
--  
+-
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref("crm_lead_newcustomer0"))
     assert lead.type == 'opportunity'
diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml
index 99e81afc828..1392402965a 100644
--- a/addons/crm/test/test_crm_opportunity.yml
+++ b/addons/crm/test/test_crm_opportunity.yml
@@ -11,13 +11,13 @@
     stage_id: crm.stage_opportunity1
     categ_id: crm.categ_oppor2
     section_id: crm.section_sales_department
-    
+
 -  |
    I check that the opportunity is in 'New' state.
 -
    !assert {model: crm.lead, id: crm_opportunity_abcfuelcounits0}:
      - state == "draft"
--  |  
+-  |
    I open opportunity by click on "Open" button,
 -
    !python {model: crm.lead}: |
@@ -29,7 +29,7 @@
 -
    !python {model: crm.lead}: |
     self.action_makeMeeting(cr, uid, [ref("crm_opportunity_abcfuelcounits0")])
-    
+
 -  |
    I can see that Meeting's calendar view is shown.
    then I click on the date on which I want to schedule meeting.
@@ -49,26 +49,27 @@
 - |
   In order to schedule a phonecall to the partner
   I click on "schedule call" button and select planned date for the call.
-- 
+-
   !record {model: crm.opportunity2phonecall, id: crm_opportunity2phonecall_abcfuelcounits0}:
     date: '2010-04-17 11:15:00'
     name: 'ABC FUEL CO 829264 - 10002 units'
     section_id: crm.section_sales_department
     user_id: base.user_demo
-- |    
-  schedule phonecall by apply (action_apply)function of opportunity2phoncall wizard  
--    
+    categ_id: crm.categ_phone1
+- |
+  schedule phonecall by apply (action_apply)function of opportunity2phoncall wizard
+-
   !python {model: crm.opportunity2phonecall}: |
       self.action_apply(cr, uid, [ref('crm_opportunity2phonecall_abcfuelcounits0')], {'active_ids': [ref("crm_opportunity_abcfuelcounits0")]})
 - |
-  I  check that phonecall record is created for that opportunity.       
--   
+  I  check that phonecall record is created for that opportunity.
+-
   !python {model: crm.phonecall}: |
     phone_obj = self.pool.get('crm.phonecall')
     ids = phone_obj.search(cr, uid, [('name', '=', 'ABC FUEL CO 829264 - 10002 units')])
     assert len(ids)
-- |    
-  I can see phonecall record after click on "Schedule call" wizard.     
+- |
+  I can see phonecall record after click on "Schedule call" wizard.
 -
   !record {model: crm.phonecall, id: crm_phonecall_abcfuelcounits0}:
     date: '2010-04-17 11:15:00'
@@ -77,4 +78,4 @@
     partner_address_id:  base.res_partner_address_1
     partner_id:  base.res_partner_9
     section_id: crm.section_sales_department
-    
+
diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml
index 1351ba88199..5c12da99a7d 100644
--- a/addons/crm/test/test_crm_phonecall.yml
+++ b/addons/crm/test/test_crm_phonecall.yml
@@ -1,36 +1,35 @@
 - |
   I start by creating a new phonecall.
-- 
+-
   !record {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
     date: '2010-04-21 18:59:00'
     name: Interview call
     section_id: crm.section_sales_department
-- |
+-
   Now , I select partner by click on "Create a Partner" button.
-  	 
-- 
+-
   !record {model: crm.phonecall2partner, id: crm_phonecall2partner_1}:
     action: exist
     partner_id: base.res_partner_9
 
-- 
+-
   Now, click on "Continue" button of this wizard.
-- 
+-
   !python {model: crm.phonecall2partner}: |
-    self.make_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})    
-    
+    self.make_partner(cr, uid, [ref("crm_phonecall2partner_1")], {"active_ids": [ref("crm_phonecall_interviewcall0")]})
+
 - |
   As the success of phonecall seems to be a real business opportunity, I will convert
   it to opportunity by clicking on the "Convert to Opportunity" button.
-- 
+-
   !record {model: crm.phonecall2opportunity, id: crm_phonecall2opportunity_interviewcall0}:
     name: Interview call
     partner_id: base.res_partner_9
     planned_revenue: 0.0
-    probability: 0.0  
+    probability: 0.0
+-
+   Now, I click on "Convert" button of this wizard.
 -
-   Now, I click on "Convert" button of this wizard.    
--    
   !python {model: crm.phonecall2opportunity}: |
      self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")})
 
@@ -39,29 +38,29 @@
 -
   !assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
      - opportunity_id != False
-      
+
 - |
   And I check that the phonecall and the newly created business opportunity is linked
   to same  partner
 -
-  !python {model:  crm.phonecall}: | 
+  !python {model:  crm.phonecall}: |
     obj_phonecall = self.browse(cr, uid, ref('crm_phonecall_interviewcall0'))
     ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)])
     obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0]
     assert obj_phonecall.partner_id == obj_opp.partner_id
-  
+
 - |
   I schedule Meeting on this current phonecall by clicking on "schedule
   Meeting"
 -
    !python {model: crm.phonecall}: |
      self.action_make_meeting(cr, uid, [ref('crm_phonecall_interviewcall0')])
-    
+
 -  |
    I can see that Meeting's calendar view is shown.
    then I click on the date on which I want schedule meeting.
    I fill proper data for that meeting and save it
-- 
+-
   !record {model: crm.meeting, id: crm_meeting_interviewcall0}:
     alarm_id: base_calendar.alarm3
     date: '2010-04-20 00:00:00'
@@ -73,20 +72,21 @@
     partner_id: base.res_partner_9
     phonecall_id: 'crm_phonecall_interviewcall0'
     state: open
-  
+
 - |
   In order to schedule other phonecall to the partner
   I click on "schedule other call" button. and plan for other call
   I can see that it will open other phonecall view with some data same as current
   phonecall.
-- 
+-
   !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_interviewcall0}:
     date: '2010-04-21 19:49:00'
     name: Interview call
     section_id: crm.section_sales_department
     user_id: base.user_root
+    categ_id: crm.categ_phone1
 - |
-  I click on "Schedule" button of this  wizard.    
+  I click on "Schedule" button of this  wizard.
 -
   !python {model: crm.phonecall2phonecall}: |
-    self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')})     
+    self.action_apply(cr, uid, [ref('crm_phonecall2phonecall_interviewcall0')], {'active_id': ref('crm_phonecall_interviewcall0')})
diff --git a/addons/crm/test/test_crm_recurrent_meeting.yml b/addons/crm/test/test_crm_recurrent_meeting.yml
new file mode 100644
index 00000000000..297ca8d5e4e
--- /dev/null
+++ b/addons/crm/test/test_crm_recurrent_meeting.yml
@@ -0,0 +1,106 @@
+-
+  In order to test recurrent meetings in OpenERP, I create meetings with different recurrency.
+-
+  I create a customer meeting record with daily recurrency.
+- 
+  !record {model: crm.meeting, id: crm_meeting_pricelistdiscussion0}:
+    categ_id: crm.categ_meet1
+    count: 0.0
+    date: '2011-01-05 00:00:00'
+    date_deadline: '2011-01-05 01:00:00'
+    day: 0.0
+    duration: 1.0
+    end_date: '2011-01-12'
+    end_type: end_date
+    name: Pricelist Discussion
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=DAILY;INTERVAL=1;UNTIL=20110112T235959Z
+    rrule_type: daily
+    sequence: 0.0
+- 
+  I create another meeting record with weekly recurrency.
+- 
+  !record {model: crm.meeting, id: crm_meeting_changesindesigning0}:
+    categ_id: crm.categ_meet2
+    count: 15
+    date: '2011-01-22 11:05:05'
+    date_deadline: '2011-01-22 16:05:05'
+    day: 0.0
+    duration: 5.0
+    email_from: info@opensides.be
+    end_type: count
+    fr: true
+    mo: true
+    name: Changes in Designing
+    partner_address_id: base.res_partner_address_1
+    partner_id: base.res_partner_9
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=WEEKLY;BYDAY=FR,TU,TH,WE,MO;INTERVAL=1;COUNT=15
+    rrule_type: weekly
+    section_id: crm.section_sales_department
+    sequence: 0.0
+    th: true
+    tu: true
+    user_id: base.user_demo
+    we: true
+-
+  I create a meeting record with monthly recurrency.
+- 
+  !record {model: crm.meeting, id: crm_meeting_reviewneeds0}:
+    categ_id: crm.categ_meet3
+    count: 0.0
+    date: '2011-01-20 10:02:02'
+    date_deadline: '2011-01-20 16:02:02'
+    day: 15
+    duration: 6.0
+    end_date: '2011-05-31'
+    end_type: end_date
+    name: Review needs
+    partner_address_id: base.res_partner_address_15
+    partner_id: base.res_partner_11
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=MONTHLY;INTERVAL=1;UNTIL=20110531T235959Z;BYMONTHDAY=15
+    rrule_type: monthly
+    section_id: crm.section_sales_department
+    sequence: 0.0
+    user_id: base.user_demo
+- 
+  I create a record for daily scrum meeting.
+- 
+  !record {model: crm.meeting, id: crm_meeting_scrummeeting0}:
+    categ_id: crm.categ_meet2
+    count: 0.0
+    date: '2011-01-06 00:00:00'
+    date_deadline: '2011-01-06 01:00:00'
+    day: 0.0
+    duration: 1.0
+    name: Scrum meeting
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=DAILY;INTERVAL=1
+    rrule_type: daily
+    sequence: 0.0    
+-
+  I create a meeting record for yearly recurrency.
+- 
+  !record {model: crm.meeting, id: crm_meeting_updatethedata0}:
+    categ_id: crm.categ_meet2
+    count: 0.0
+    date: '2011-01-18 13:12:49'
+    date_deadline: '2011-01-19 02:30:49'
+    day: 0.0
+    duration: 13.300000000000001
+    end_date: '2015-01-06'
+    end_type: end_date
+    name: Update the data
+    partner_address_id: base.res_partner_address_7
+    partner_id: base.res_partner_4
+    recurrency: true
+    recurrent_uid: 0.0
+    rrule: FREQ=YEARLY;INTERVAL=1;UNTIL=20150106T235959Z
+    rrule_type: yearly
+    section_id: crm.section_sales_department
+    sequence: 0.0
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..661180c0874 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -73,7 +73,7 @@ class crm_merge_opportunity(osv.osv_memory):
 
             for this in self.browse(cr, uid, ids, context=context):
                 for opp in this.opportunity_ids:
-                    opp_obj.write(cr, uid, opp.id, {
+                    opp_obj.write(cr, uid, [opp.id], {
                                     'stage_id': opp.stage_id.id or current_opp.stage_id.id or False,
                                     'priority': opp.priority or current_opp.priority,
                                     'email_from': opp.email_from or current_opp.email_from,
@@ -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_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py
index bd2aaca0607..0b68d7f37ba 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall.py
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py
@@ -85,7 +85,7 @@ class crm_opportunity2phonecall(osv.osv_memory):
         This converts Opportunity to Phonecall and opens Phonecall view
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
+        @param uid: the current user's ID for security checks,
         @param ids: List of Opportunity to Phonecall IDs
         @param context: A standard dictionary for contextual values
 
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/i18n/crm_caldav.pot b/addons/crm_caldav/i18n/crm_caldav.pot
index a375283849c..e60e0872cd8 100644
--- a/addons/crm_caldav/i18n/crm_caldav.pot
+++ b/addons/crm_caldav/i18n/crm_caldav.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:58+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:58+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:24+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,20 +15,20 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: crm_caldav
-#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
-msgid "Extened Module to Add CalDav future on Meeting"
-msgstr ""
-
 #. module: crm_caldav
 #: model:ir.model,name:crm_caldav.model_crm_meeting
 msgid "Meeting"
 msgstr ""
 
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extended Module to Add CalDav feature on Meeting"
+msgstr ""
+
 #. module: crm_caldav
 #: model:ir.module.module,description:crm_caldav.module_meta_information
 msgid "\n"
-"    New Futures in Meeting:\n"
+"    New Features in Meeting:\n"
 "        *  Share meeting with other calendar clients like sunbird\n"
 ""
 msgstr ""
diff --git a/addons/crm_caldav/i18n/de.po b/addons/crm_caldav/i18n/de.po
index 4454d7f4295..fbe758bde31 100644
--- a/addons/crm_caldav/i18n/de.po
+++ b/addons/crm_caldav/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-30 14:57+0000\n"
+"PO-Revision-Date: 2010-12-29 12:37+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_caldav
@@ -35,6 +35,10 @@ msgid ""
 "    New Futures in Meeting:\n"
 "        *  Share meeting with other calendar clients like sunbird\n"
 msgstr ""
+"\n"
+"    Neue Funktion für Termine:\n"
+"           * Veröffentlichen Sie Termine zwecks Zugriff durch andere "
+"Kalenderanwendungen (z.B. Sunbird)\n"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/crm_caldav/i18n/fr.po b/addons/crm_caldav/i18n/fr.po
index 10544e2c84a..91ec8548f5d 100644
--- a/addons/crm_caldav/i18n/fr.po
+++ b/addons/crm_caldav/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-04 09:46+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-01-01 12:15+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_caldav
@@ -35,6 +34,9 @@ msgid ""
 "    New Futures in Meeting:\n"
 "        *  Share meeting with other calendar clients like sunbird\n"
 msgstr ""
+"\n"
+"    Nouvelles fonctionnalités pour les rendez-vous:\n"
+"        *Partager les réunions avec d'autres outils d'agenda comme 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 6606934e772..89fc439ac97 100644
--- a/addons/crm_caldav/i18n/it.po
+++ b/addons/crm_caldav/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-27 12:40+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 07:42+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_caldav
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index ea9797efc22..f33b6f7ad31 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -12,7 +12,7 @@
             <field name="name">Claims</field>
             <field name="res_model">crm.claim</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,calendar,form,graph</field>
+            <field name="view_mode">tree,calendar,form</field>
             <field name="view_id" ref="crm_case_claims_tree_view"/>
             <field name="context">{'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid, "stage_type":'claim'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
@@ -40,12 +40,6 @@
             <field name="act_window_id" ref="crm_case_categ_claim0"/>
         </record>
 
-        <record model="ir.actions.act_window.view" id="action_crm_sec_graph_view_act_job">
-            <field name="sequence" eval="4"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="crm_case_graph_view_stage_cost"/>
-            <field name="act_window_id" ref="crm_case_categ_claim0"/>
-        </record>
 
         <menuitem name="Claims" id="menu_crm_case_claims"
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 70772e6ebfd..114989c4e8c 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -226,20 +226,6 @@
             </field>
         </record>
 
-        <!-- Claim Graph view -->
-
-        <record model="ir.ui.view" id="crm_case_graph_view_stage_cost">
-            <field name="name">CRM -Graph</field>
-            <field name="model">crm.claim</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Cases By Stage and Estimates" type="bar" orientation="vertical">
-                    <field name="stage_id"/>
-                    <field name="planned_cost" operator="+"/>
-                    <field name="planned_revenue" operator="+"/>
-                </graph>
-            </field>
-        </record>
 
         <!-- Crm claim Search view -->
 
diff --git a/addons/crm_claim/i18n/crm_claim.pot b/addons/crm_claim/i18n/crm_claim.pot
index bc13ec8ecd2..59efe9d7b8e 100644
--- a/addons/crm_claim/i18n/crm_claim.pot
+++ b/addons/crm_claim/i18n/crm_claim.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -529,8 +529,8 @@ msgid "Attachments"
 msgstr ""
 
 #. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
-msgid "Record and track your customers' claims. Claims can be linked to a sales order or a lot. You can send emails with attachments and get the history of everything that happened on a specific claim (emails sent, interventions type and so on..). Claims can be automatically linked to an email address using the mail gateway module."
+#: model:ir.model,name:crm_claim.model_crm_case_stage
+msgid "Stage of case"
 msgstr ""
 
 #. module: crm_claim
@@ -644,6 +644,11 @@ msgstr ""
 msgid "Report a Claim"
 msgstr ""
 
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid "Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module."
+msgstr ""
+
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
diff --git a/addons/crm_claim/i18n/el.po b/addons/crm_claim/i18n/el.po
index 97c243aae15..82d2f8514aa 100644
--- a/addons/crm_claim/i18n/el.po
+++ b/addons/crm_claim/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-19 07:50+0000\n"
+"PO-Revision-Date: 2010-12-29 10:19+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -168,7 +168,7 @@ msgstr "Επαναφορά σε Πρόχειρο"
 #: field:crm.claim,date_deadline:0
 #: field:crm.claim.report,date_deadline:0
 msgid "Deadline"
-msgstr "Προθεσμεία"
+msgstr "Προσθεσμία"
 
 #. module: crm_claim
 #: view:crm.claim:0
diff --git a/addons/crm_claim/i18n/fr.po b/addons/crm_claim/i18n/fr.po
index d16b0797cd2..cc19f6f27cf 100644
--- a/addons/crm_claim/i18n/fr.po
+++ b/addons/crm_claim/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-21 14:09+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2011-01-01 11:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -136,7 +136,7 @@ msgstr "Préventive"
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim2
 msgid "Fixed"
-msgstr ""
+msgstr "Résolu"
 
 #. module: crm_claim
 #: field:crm.claim,partner_address_id:0
@@ -456,7 +456,7 @@ msgstr "Utilisateur"
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Awaiting Response"
-msgstr ""
+msgstr "En attente de réponse"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index e9b908290de..5458da5cc48 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-12-27 21:02+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 07:08+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
@@ -36,7 +36,7 @@ msgstr "Responsabilità"
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Data prossima azione"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -68,7 +68,7 @@ msgstr "Email osservatori"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "#Claim"
-msgstr "# Iniziative"
+msgstr "# Reclami"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
@@ -77,6 +77,9 @@ msgid ""
 "in the system. The stages define all the steps required for the resolution "
 "of a claim."
 msgstr ""
+"E' possibile creare fasi del reclamo per categorizzare lo stato di ogni "
+"reclamo entrato nel sistema. Le fasi definiscono tutti i passaggi richiesti "
+"per la risoluzione di un reclamo."
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -105,7 +108,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Description"
-msgstr ""
+msgstr "Descrizione del reclamo"
 
 #. module: crm_claim
 #: field:crm.claim,message_ids:0
@@ -115,7 +118,7 @@ msgstr "Messaggi"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim1
 msgid "Factual Claims"
-msgstr "Richiami reali"
+msgstr "Reclami reali"
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
@@ -141,7 +144,7 @@ msgstr "Contatto Partner"
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Data chiusura"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -220,7 +223,7 @@ msgstr "Scadenza superata"
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: crm_claim
 #: field:crm.claim,email_from:0
@@ -241,7 +244,7 @@ msgstr "Data creazione"
 #. module: crm_claim
 #: field:crm.claim,name:0
 msgid "Claim Subject"
-msgstr ""
+msgstr "Oggetto del reclamo"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
@@ -271,7 +274,7 @@ msgstr "Categorie"
 #: view:crm.claim.report:0
 #: field:crm.claim.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -311,7 +314,7 @@ msgstr "Numero di giorni per chiudere il caso"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr ""
+msgstr "Report reclamo CRM"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
@@ -321,7 +324,7 @@ msgstr "Accettato come reclamo"
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
 msgid "Corrective"
-msgstr ""
+msgstr "Correttivo"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -348,7 +351,7 @@ msgstr "Tipo azione"
 #. module: crm_claim
 #: field:crm.claim,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Data Aggiornamento"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -365,7 +368,7 @@ msgstr "Categoria"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr ""
+msgstr "Valore reclami"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -391,7 +394,7 @@ msgstr "Bozza"
 #: selection:crm.claim,priority:0
 #: selection:crm.claim.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Basso"
 
 #. module: crm_claim
 #: field:crm.claim,date_closed:0
@@ -406,7 +409,7 @@ msgstr ""
 #: view:crm.claim.report:0
 #: selection:crm.claim.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "In sospeso"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -447,7 +450,7 @@ msgstr "Utente"
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Awaiting Response"
-msgstr ""
+msgstr "In attesa di risposta"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@@ -489,6 +492,12 @@ msgid ""
 "automatically new claims based on incoming emails.\n"
 "    "
 msgstr ""
+"\n"
+"Questo modulo permette di tenere traccia dei reclami di clienti e "
+"fornitori.\n"
+"E' totalmente integrato con il supporto mail cosicché è possibile creare\n"
+"automaricamente nuovi reclami basandosi sulle mail in arrivo.\n"
+"    "
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -519,17 +528,17 @@ msgstr "Reclami"
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Corrective Action"
-msgstr ""
+msgstr "Azione correttiva"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr ""
+msgstr "Politiche reclami"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "History"
-msgstr ""
+msgstr "Storico"
 
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim
@@ -575,7 +584,7 @@ msgstr ""
 #: view:crm.claim:0
 #: view:crm.claim.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -593,38 +602,38 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress"
-msgstr ""
+msgstr "In corso"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsabile"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Current"
-msgstr ""
+msgstr "Attuale"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Details"
-msgstr ""
+msgstr "Dettagli"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Cases By Stage and Estimates"
-msgstr ""
+msgstr "Casi di studio e stime"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reply"
-msgstr ""
+msgstr "Rispondi"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr ""
+msgstr "Causa principale"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -634,7 +643,7 @@ msgstr "Descrizione reclamo/azione"
 #. module: crm_claim
 #: field:crm.claim,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -645,17 +654,17 @@ msgstr "Cerca reclami"
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Team di vendita"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Resolution Actions"
-msgstr ""
+msgstr "Azione risolutiva"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.act_claim_partner
@@ -679,11 +688,19 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Lo stato è impostato a \"Bozza\", quando il caso è creato.                   "
+"           \n"
+"Se il caso è in corso lo stato è impostato su \"Aperto\".                    "
+"          \n"
+"Quando il caso è finito, lo stato è impostato su \"Completato\".             "
+"                 \n"
+"Se il caso necessita di essere revisionato allora lo stato è impostato su "
+"\"In sospeso\"."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
@@ -693,22 +710,22 @@ msgstr ""
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "I miei casi(o)"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "Azioni"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -722,17 +739,20 @@ msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
 msgstr ""
+"Crea categorie di reclamo, per meglio gestire e classificare i vostri "
+"reclami. Qualche esempio di reclami può essere: azione preventiva, azione "
+"correttiva."
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data creazione"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 #: field:crm.claim.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Anno"
 
 #~ msgid "This Year"
 #~ msgstr "Anno attuale"
diff --git a/addons/crm_fundraising/i18n/crm_fundraising.pot b/addons/crm_fundraising/i18n/crm_fundraising.pot
index 9129ae0a45b..3f974e8628e 100644
--- a/addons/crm_fundraising/i18n/crm_fundraising.pot
+++ b/addons/crm_fundraising/i18n/crm_fundraising.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -378,11 +378,6 @@ msgstr ""
 msgid "Category"
 msgstr ""
 
-#. module: crm_fundraising
-#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
-msgid "If you need to support your organization or a campaign, with 'Fund Raising' you can track all you fund raising activities. The search list allows you to filter by funds description, email, history and probability of success."
-msgstr ""
-
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "  Year  "
@@ -538,6 +533,11 @@ msgstr ""
 msgid "Attachments"
 msgstr ""
 
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_case_stage
+msgid "Stage of case"
+msgstr ""
+
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Estimates"
@@ -576,6 +576,11 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid "If you need to collect money for your organization or a campaign, Fund Raising allows you to track all your fund raising activities. In the search list, filter by funds description, email, history and probability of success."
+msgstr ""
+
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,user_id:0
diff --git a/addons/crm_fundraising/i18n/de.po b/addons/crm_fundraising/i18n/de.po
index 9459138a37f..ec08214fd9e 100644
--- a/addons/crm_fundraising/i18n/de.po
+++ b/addons/crm_fundraising/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-11-26 23:32+0000\n"
+"PO-Revision-Date: 2010-12-29 12:27+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
@@ -266,7 +266,7 @@ msgstr "Email Mitarbeiter"
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Monat -1    "
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
diff --git a/addons/crm_fundraising/i18n/fr.po b/addons/crm_fundraising/i18n/fr.po
index b00d5a961ab..999aca88d49 100644
--- a/addons/crm_fundraising/i18n/fr.po
+++ b/addons/crm_fundraising/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:43+0000\n"
-"PO-Revision-Date: 2010-12-20 21:23+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-29 13:06+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
@@ -265,7 +265,7 @@ msgstr "Courriel de l'employé"
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mois -1    "
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
diff --git a/addons/crm_helpdesk/i18n/crm_helpdesk.pot b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
index 3a6d643c29c..dc5b3564dd6 100644
--- a/addons/crm_helpdesk/i18n/crm_helpdesk.pot
+++ b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:00+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:00+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:26+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -549,11 +549,6 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
-#. module: crm_helpdesk
-#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
-msgid "Create and manage helpdesk categories to better manage and classify your support request."
-msgstr ""
-
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
 msgid "Description"
@@ -564,11 +559,6 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#. module: crm_helpdesk
-#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
-msgid "'Helpdesk and Support' allows you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary and assign a priority level. Depending on your need, you may consider using the issues system of OpenERP to manage your support activities."
-msgstr ""
-
 #. module: crm_helpdesk
 #: field:crm.helpdesk,probability:0
 msgid "Probability (%)"
@@ -632,6 +622,11 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Create and manage helpdesk categories to better manage and classify your support requests."
+msgstr ""
+
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
 #: selection:crm.helpdesk.report,priority:0
@@ -650,6 +645,11 @@ msgstr ""
 msgid "Last Action"
 msgstr ""
 
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer."
+msgstr ""
+
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,name:0
diff --git a/addons/crm_helpdesk/i18n/de.po b/addons/crm_helpdesk/i18n/de.po
index 7f15f25ed2b..f2ec4ae68c4 100644
--- a/addons/crm_helpdesk/i18n/de.po
+++ b/addons/crm_helpdesk/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-15 12:54+0000\n"
+"PO-Revision-Date: 2010-12-31 10:13+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: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -251,7 +251,7 @@ msgstr "Daten"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Monat -1    "
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -303,7 +303,7 @@ msgstr "Datum Aktualisierung"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Query"
-msgstr "Abfrage"
+msgstr "Anfrage"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
diff --git a/addons/crm_helpdesk/i18n/fr.po b/addons/crm_helpdesk/i18n/fr.po
index d7e46a528d0..ed515ce4b43 100644
--- a/addons/crm_helpdesk/i18n/fr.po
+++ b/addons/crm_helpdesk/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 10:15+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-31 10:37+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:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
@@ -251,7 +250,7 @@ msgstr "Dates"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mois -1    "
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 3068bf25fbe..0c91627d518 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -31,6 +31,7 @@ based on geolocalization.
     'author': 'OpenERP SA',
     'depends': ['crm'],
     'update_xml': [
+        'security/ir.model.access.csv',
         'res_partner_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
         'crm_lead_view.xml',
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 7a2b29b4819..ba918893d3f 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:01+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:01+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:26+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgid "Company"
 msgstr ""
 
 #. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:0
+#: code:addons/crm_partner_assign/partner_geo_assign.py:41
 #, python-format
 msgid "Could not contact geolocation servers, please make sure you have a working internet connection (%s)"
 msgstr ""
@@ -171,7 +171,7 @@ msgid "Previous"
 msgstr ""
 
 #. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:0
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
 #, python-format
 msgid "Network error"
 msgstr ""
@@ -283,7 +283,7 @@ msgid "Stage"
 msgstr ""
 
 #. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:0
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
 #, python-format
 msgid "Fwd"
 msgstr ""
diff --git a/addons/crm_partner_assign/i18n/de.po b/addons/crm_partner_assign/i18n/de.po
index 010027e8e2c..e0e5abbb411 100644
--- a/addons/crm_partner_assign/i18n/de.po
+++ b/addons/crm_partner_assign/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 14:49+0000\n"
+"PO-Revision-Date: 2010-12-29 12:45+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_partner_assign
@@ -155,6 +155,11 @@ msgid ""
 "based on geolocalization.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul wird durch OpenERP SA für die geografische Zuordnung von "
+"Interessenten \n"
+"zu Partnern eingesetzt.\n"
+"    "
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
@@ -411,7 +416,7 @@ msgstr "Partner Geo - Lokalisierung"
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,state:0
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 33d297928e5..c71d19df49d 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -86,7 +86,20 @@
             </field>
         </record>
 
+<!-- Crm Lead Assign report Graph View -->
 
+        <record id="view_report_crm_lead_assign_graph" model="ir.ui.view">
+            <field name="name">crm.lead.assign.graph</field>
+            <field name="model">crm.lead.report.assign</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph orientation="horizontal" string="Lead Assign" type="bar">
+                    <field name="state"/>
+                    <field name="nbr" operator="+"/>
+                    <field group="True" name="user_id"/>
+                </graph>
+            </field>
+        </record>
 
         <record id="view_report_crm_opportunity_assign_tree" model="ir.ui.view">
             <field name="name">crm.lead.assign.report.tree</field>
@@ -139,6 +152,13 @@
             <field name="view_id" ref="view_report_crm_opportunity_assign_tree"/>
             <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
        </record>
+       
+       <record model="ir.actions.act_window.view" id="action_report_crm_lead_assign_graph">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_lead_assign_graph"/>
+            <field name="act_window_id" ref="action_report_crm_opportunity_assign"/>
+       </record>       
 
        <menuitem id="menu_report_crm_opportunities_assign_tree"
            groups="base.group_extended"
diff --git a/addons/crm_partner_assign/security/ir.model.access.csv b/addons/crm_partner_assign/security/ir.model.access.csv
new file mode 100644
index 00000000000..79e7611eedb
--- /dev/null
+++ b/addons/crm_partner_assign/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_ crm_lead_report_assign"," crm.lead.report.assign","model_crm_lead_report_assign","base.group_sale_salesman",1,1,1,0
+"access_ crm_lead_report_assign_all","crm.lead.report.assign.all","model_crm_lead_report_assign","base.group_user",1,0,0,0
+"access_res_partner_grade","res.partner.grade","model_res_partner_grade","base.group_sale_salesman",1,1,1,0
+"access_res_partner_grade_manager","res.partner.grade.manager","model_res_partner_grade","base.group_sale_manager",1,1,1,1
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/crm_profiling/i18n/crm_profiling.pot b/addons/crm_profiling/i18n/crm_profiling.pot
index f6029745a3f..71488840491 100644
--- a/addons/crm_profiling/i18n/crm_profiling.pot
+++ b/addons/crm_profiling/i18n/crm_profiling.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:01+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:01+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:27+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,11 @@ msgid "\n"
 "    "
 msgstr ""
 
+#. module: crm_profiling
+#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
+msgid "You can create specific topic-related questionnaires to guide your team(s) in the sales cycle by helping them to ask the right questions. The segmentation tool allows you to automatically assign a partner to a category according to his answers to the different questionnaires."
+msgstr ""
+
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
 #: field:crm_profiling.question,name:0
@@ -47,11 +52,6 @@ msgstr ""
 msgid "Open Questionnaire"
 msgstr ""
 
-#. module: crm_profiling
-#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
-msgid "You can create specific topic related questionnaires that will be used to guide your team(s) in the sales cycle by helping them to ask the right questions. Using the segmentation tool, you will be able to automatically assign a partner to a category based on his answers to the different questionnaires."
-msgstr ""
-
 #. module: crm_profiling
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
@@ -174,7 +174,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: crm_profiling
-#: code:addons/crm_profiling/crm_profiling.py:0
+#: code:addons/crm_profiling/crm_profiling.py:178
 #: field:crm_profiling.questionnaire,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
 #: wizard_view:open_questionnaire,init:0
diff --git a/addons/crm_profiling/i18n/de.po b/addons/crm_profiling/i18n/de.po
index 550316b0a3e..99be91f0cdf 100644
--- a/addons/crm_profiling/i18n/de.po
+++ b/addons/crm_profiling/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-15 12:01+0000\n"
+"PO-Revision-Date: 2010-12-31 10:12+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:42+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
@@ -42,6 +42,24 @@ msgid ""
 "since it's the same which has been renamed.\n"
 "    "
 msgstr ""
+"\n"
+"    Dieses Modul ermöglicht eine gezielte Segmentierung von "
+"Geschäftspartnern.\n"
+"    Hierzu wurde die bisherige Funktion der Erstellung von Kundenprofilen "
+"überarbeitet. Unter Verwendung der neuen\n"
+"    Funktionalität der Umfragen können Sie gezielt Fragen zu Fragebögen "
+"zusammenfassen und direkt bei einem \n"
+"    Partner anwenden.\n"
+"\n"
+"    Die neue Funktionalität ersetzt aufgrund sich überschneidender "
+"Funktionen die bisherige Segmentierungslogik.\n"
+"\n"
+"    Die entsprechenden Untermenüs finden Sie unterhalb von "
+"\"Verkauf/Automatische Aktionen/Partner Segmentierung\".\n"
+"\n"
+"    *Hinweis: Dieses Modul ist nicht Kompatibel mit dem bisherigen Modul für "
+"die Segmentierung.\n"
+"    "
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
@@ -84,7 +102,7 @@ msgstr "Partner Segmente"
 #: field:crm_profiling.answer,name:0
 #: model:ir.model,name:crm_profiling.model_crm_profiling_answer
 msgid "Answer"
-msgstr "Anwtort"
+msgstr "Antwort"
 
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_crm_segmentation
@@ -155,7 +173,7 @@ msgstr "Fehler! Es können keine rekursiven Profile erstellt werden."
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr "Benutze die Profileregel"
+msgstr "Aktiviere Profile Segmentierung"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -184,7 +202,7 @@ msgstr "Vertriebsfragen"
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr "Profile Hauptelement"
+msgstr "Auswahl Kundensegement"
 
 #. module: crm_profiling
 #: wizard_button:open_questionnaire,init,end:0
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index 1f04715054f..95b582f4ec2 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 15:09+0000\n"
+"PO-Revision-Date: 2010-12-29 12:27+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
@@ -58,7 +58,7 @@ msgstr "Verwendung"
 #. module: decimal_precision
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
-msgstr ""
+msgstr "Es kann nur ein Wert für alle Anwendungsfälle hinterlegt werden"
 
 #. module: decimal_precision
 #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot
index a613ae9ff27..45c3c12a75f 100644
--- a/addons/decimal_precision/i18n/decimal_precision.pot
+++ b/addons/decimal_precision/i18n/decimal_precision.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:02+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:02+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:27+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/decimal_precision/i18n/fr.po b/addons/decimal_precision/i18n/fr.po
index bf86738ebb7..c035f98e73c 100644
--- a/addons/decimal_precision/i18n/fr.po
+++ b/addons/decimal_precision/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-16 17:46+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-01-01 13:17+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
@@ -31,7 +30,7 @@ msgstr "Précision décimale"
 #: 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 ""
+msgstr "Définitions de la précisions décimale"
 
 #. module: decimal_precision
 #: model:ir.module.module,description:decimal_precision.module_meta_information
@@ -43,6 +42,12 @@ msgid ""
 "\n"
 "The decimal precision is configured per company.\n"
 msgstr ""
+"\n"
+"Ce module autorise la configuration du nombre de décimale pour les "
+"différents cas\n"
+"d'usage: comptabilité, ventes, achats ...\n"
+"\n"
+"La précision du nombre de décimal est confgurable par société.\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,name:0
diff --git a/addons/decimal_precision/i18n/it.po b/addons/decimal_precision/i18n/it.po
index 41fc1c204c4..088ef2a307e 100644
--- a/addons/decimal_precision/i18n/it.po
+++ b/addons/decimal_precision/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-22 07:26+0000\n"
+"PO-Revision-Date: 2010-12-29 10:11+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
@@ -58,7 +58,7 @@ msgstr "Utilizzo"
 #. module: decimal_precision
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
-msgstr ""
+msgstr "Solo un valore può essere definito per ogni utilizzo dato!"
 
 #. module: decimal_precision
 #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
diff --git a/addons/delivery/delivery_data.xml b/addons/delivery/delivery_data.xml
index ff0c90ad193..c1d9d99b33a 100644
--- a/addons/delivery/delivery_data.xml
+++ b/addons/delivery/delivery_data.xml
@@ -6,53 +6,5 @@
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
         </record>
 
-        <!-- Create a transporter -->
-        
-        <record id="delivery_partner" model="res.partner">
-            <field name="name">The Poste</field>
-        </record>
-        <record id="delivery_partner_address" model="res.partner.address">
-            <field name="type">default</field>
-            <field name="partner_id" ref="delivery_partner"/>
-        </record>
-        
-        <!-- Create a partner -->
-        
-        <record id="delivery_product" model="product.product">
-            <field name="name">Delivery by Poste</field>
-            <field name="type">service</field>
-            <field model="product.category" name="categ_id" search="[]"/>
-        </record>
-
-        <!-- Carrier -->
-        
-        <record id="delivery_carrier" model="delivery.carrier">
-            <field name="name">The Poste</field>
-            <field name="partner_id" ref="delivery_partner"/>
-            <field name="product_id" ref="delivery_product"/>
-        </record>
-        
-        <!-- Carrier Grids -->
-        
-        <record id="delivery_grid" model="delivery.grid">
-            <field name="name">The Poste - Pricelist</field>
-            <field name="carrier_id" ref="delivery_carrier"/>
-        </record>
-        <record id="delivery_grid_line1" model="delivery.grid.line">
-            <field name="name">Weight &lt;= 5kg</field>
-            <field name="grid_id" ref="delivery_grid"/>
-            <field eval="5" name="max_value"/>
-            <field eval="20" name="list_price"/>
-            <field eval="10" name="standard_price"/>
-        </record>
-        <record id="delivery_grid_line2" model="delivery.grid.line">
-            <field name="name">Weight &gt; 5kg</field>
-            <field name="grid_id" ref="delivery_grid"/>
-            <field name="operator">&gt;=</field>
-            <field eval="5" name="max_value"/>
-            <field eval="50" name="list_price"/>
-            <field eval="30" name="standard_price"/>
-        </record>
-        
     </data>
 </openerp>
diff --git a/addons/delivery/delivery_demo.xml b/addons/delivery/delivery_demo.xml
index f247c53ed82..44fffc2f985 100644
--- a/addons/delivery/delivery_demo.xml
+++ b/addons/delivery/delivery_demo.xml
@@ -1,9 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+
+         <!-- Create a transporter -->
+
+        <record id="delivery_partner" model="res.partner">
+            <field name="name">The Poste</field>
+        </record>
+        <record id="delivery_partner_address" model="res.partner.address">
+            <field name="type">default</field>
+            <field name="partner_id" ref="delivery_partner"/>
+        </record>
+
+        <!-- Create a partner -->
+
+        <record id="delivery_product" model="product.product">
+            <field name="name">Delivery by Poste</field>
+            <field name="type">service</field>
+            <field model="product.category" name="categ_id" search="[]"/>
+        </record>
+
+        <!-- Carrier -->
+
+        <record id="delivery_carrier" model="delivery.carrier">
+            <field name="name">The Poste</field>
+            <field name="partner_id" ref="delivery_partner"/>
+            <field name="product_id" ref="delivery_product"/>
+        </record>
+
+        <!-- Carrier Grids -->
+
+        <record id="delivery_grid" model="delivery.grid">
+            <field name="name">The Poste - Pricelist</field>
+            <field name="carrier_id" ref="delivery_carrier"/>
+        </record>
+        <record id="delivery_grid_line1" model="delivery.grid.line">
+            <field name="name">Weight &lt;= 5kg</field>
+            <field name="grid_id" ref="delivery_grid"/>
+            <field eval="5" name="max_value"/>
+            <field eval="20" name="list_price"/>
+            <field eval="10" name="standard_price"/>
+        </record>
+        <record id="delivery_grid_line2" model="delivery.grid.line">
+            <field name="name">Weight &gt; 5kg</field>
+            <field name="grid_id" ref="delivery_grid"/>
+            <field name="operator">&gt;=</field>
+            <field eval="5" name="max_value"/>
+            <field eval="50" name="list_price"/>
+            <field eval="30" name="standard_price"/>
+        </record>
+
         <record id="delivery_grid_line3" model="delivery.grid.line">
             <field name="name">Free if price &gt;= 300</field>
-            <field name="grid_id" ref="delivery.delivery_grid"/>
+            <field name="grid_id" ref="delivery_grid"/>
             <field eval="300" name="max_value"/>
             <field name="operator">&gt;=</field>
             <field name="type">price</field>
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index 879de61634a..1f0a295c09f 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 11:38+0000\n"
+"PO-Revision-Date: 2010-12-29 10:28+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -40,7 +40,7 @@ msgstr "Nettogewicht"
 #. module: delivery
 #: view:stock.picking:0
 msgid "Delivery Order"
-msgstr ""
+msgstr "Lieferauftrag"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:0
@@ -173,7 +173,7 @@ msgstr "Partner"
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -229,7 +229,7 @@ msgstr "Tarif"
 msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
-msgstr ""
+msgstr "Durch Deaktivierung können Sie die  Liefertarife ausblenden"
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -271,6 +271,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
 msgstr ""
+"Durch Aktivierung dieses Feldes, können Sie diesen Frachtführer ausblenden."
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
@@ -303,6 +304,7 @@ msgstr "Los"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: delivery
 #: field:delivery.carrier,active:0
@@ -339,7 +341,7 @@ msgstr ""
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index 7dd002cbe27..3e69ca4ca77 100644
--- a/addons/delivery/i18n/delivery.pot
+++ b/addons/delivery/i18n/delivery.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:02+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:02+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:28+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:28+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgid "Delivery Order"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
 #, python-format
 msgid "No price available !"
 msgstr ""
@@ -63,6 +63,11 @@ msgstr ""
 msgid "Volume"
 msgstr ""
 
+#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
@@ -104,6 +109,11 @@ msgstr ""
 msgid "Variable Factor"
 msgstr ""
 
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid "The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range."
+msgstr ""
+
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 msgid "Fixed"
@@ -125,7 +135,7 @@ msgid "Stock Move"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
 #, python-format
 msgid "No line matched this order in the choosed delivery grids !"
 msgstr ""
@@ -141,7 +151,12 @@ msgid "Net Weight"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid "Create and manage the delivery methods you need for your sales activities. Each delivery method can be assigned to a price list which computes the price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -255,7 +270,7 @@ msgid "If the active field is set to False, it will allow you to hide the delive
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid available !"
 msgstr ""
@@ -266,7 +281,8 @@ msgid ">="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
 #, python-format
 msgid "Order not in draft state !"
 msgstr ""
@@ -308,13 +324,8 @@ msgid "Condition"
 msgstr ""
 
 #. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid "Create and manage the delivery method(s) you want your sales to be processed with. Each delivery method can be assigned to a pricelist which computes the price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
 msgstr ""
 
 #. module: delivery
@@ -358,19 +369,14 @@ msgstr ""
 msgid "Sales & Purchases"
 msgstr ""
 
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-msgid "The delivery pricelist allows you to compute the cost and sales price of the delivery based on the weight of the products and other criteria. You can define several pricelists for one delivery method, for each region such as countries or a zone in a specific country defined by a zip code range."
-msgstr ""
-
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid "<="
 msgstr ""
 
 #. module: delivery
-#: field:delivery.grid.line,standard_price:0
-msgid "Cost Price"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
 msgstr ""
 
 #. module: delivery
@@ -403,7 +409,7 @@ msgid "Price"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
 #, python-format
 msgid "No grid matching for this carrier !"
 msgstr ""
@@ -425,7 +431,7 @@ msgid "="
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
 msgstr ""
@@ -456,7 +462,8 @@ msgid "ID"
 msgstr ""
 
 #. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 8b18efa0aab..80d0151f20c 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-04 08:15+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-01-01 13:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:04+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #~ msgid "Invalid XML for View Architecture!"
@@ -180,7 +179,7 @@ msgstr "Partenaire"
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Commande de ventes"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -417,7 +416,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 c0cae6aca28..0e5a3ea5495 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:13+0000\n"
+"PO-Revision-Date: 2010-12-28 09:18+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/report/shipping.rml b/addons/delivery/report/shipping.rml
index 42fcd71a693..563c3bda826 100644
--- a/addons/delivery/report/shipping.rml
+++ b/addons/delivery/report/shipping.rml
@@ -125,7 +125,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">[[ (not(o.sale_id) and o.type== 'out') and 'Error, no sale order attached to this picking !' or removeParentNode('para') ]]</para>
+    
     <blockTable colWidths="287.0,254.0" repeatRows="1" style="Tableau1">
       <tr>
         <td>
@@ -226,4 +226,4 @@
     </section>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
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_data.xml b/addons/document/document_data.xml
index a4f546cbf83..d32256f63a9 100644
--- a/addons/document/document_data.xml
+++ b/addons/document/document_data.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<data noupdate="0">
-
-    <record model="document.directory.content.type" id="pdf">
-        <field name="code">.pdf</field>
-        <field name="name">PDF Report</field>
-        <field name="mimetype">application/pdf</field>
-    </record>
+<data noupdate="1">
     
     <record model="document.storage" id="storage_default">
         <field name="name">Database storage</field>
@@ -28,6 +22,14 @@
         <field name="ressource_id">0</field>
  
     </record>
+</data>
+
+<data noupdate="0">
+    <record model="document.directory.content.type" id="pdf">
+        <field name="code">.pdf</field>
+        <field name="name">PDF Report</field>
+        <field name="mimetype">application/pdf</field>
+    </record>
 
     <record model="document.directory" id="dir_partner_category">
         <field name="name">Partners by Category</field>
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index cff66049d3b..6f82dde0a4f 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -108,7 +108,7 @@
                             <field name="extension"/>
                             <field name="include_name"/>
                             <separator string="PDF Report" colspan="4"/>
-                            <field name="report_id" domain="[ ('type','=','ressource'),('model_id','=',parent.ressource_type_id)]"/>
+                            <field name="report_id" domain="[('model_id','=',parent.ressource_type_id)]"/>
                         </form>
                         <tree string="Contents">
                             <field name="sequence" string="Seq."/>
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index 0fdc92c3c35..66fe7828edd 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:28+0000\n"
+"PO-Revision-Date: 2010-12-29 10:24+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -221,7 +221,7 @@ msgstr "Änderungsdatum"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Konfiguration Knowledge"
 
 #. module: document
 #: view:ir.attachment:0
@@ -274,7 +274,7 @@ msgstr "Speicher"
 #. module: document
 #: view:document.configuration:0
 msgid "Configure Resource Directory"
-msgstr ""
+msgstr "Konfiguration Datenverzeichnis"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -609,6 +609,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
+"Parallel zur Eltern-Kind Beziehung wird durch diese ID ein spezieller "
+"Datensatz erstellt."
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -708,7 +710,7 @@ msgstr "Integrierte Dokumentenverwaltung"
 #. module: document
 #: view:document.configuration:0
 msgid "Choose the following Resouces to auto directory configuration."
-msgstr ""
+msgstr "Wählen Sie die folgenden Ressourcen für eine automatische Anbindung."
 
 #. module: document
 #: view:ir.attachment:0
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index 05347f35bf3..3b81f3c65f1 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:03+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:03+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid "Field to be used as name on resource directories. If empty, the \"name\"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:0
+#: code:addons/document/document_directory.py:276
 #, python-format
 msgid "Directory name contains special characters!"
 msgstr ""
@@ -132,7 +132,8 @@ msgid "Path"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_directory.py:0
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
 #, python-format
 msgid "Directory name must be unique!"
 msgstr ""
@@ -172,7 +173,8 @@ msgid "Project"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:0
+#: code:addons/document/document_storage.py:573
+#: code:addons/document/document_storage.py:601
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -225,8 +227,11 @@ msgid "Document directory"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:0
-#: code:addons/document/document_directory.py:0
+#: code:addons/document/document.py:154
+#: code:addons/document/document.py:222
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#: code:addons/document/document_directory.py:276
 #, python-format
 msgid "ValidateError"
 msgstr ""
@@ -356,7 +361,7 @@ msgid "Modified"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document_storage.py:0
+#: code:addons/document/document_storage.py:639
 #, python-format
 msgid "Error at doc write!"
 msgstr ""
@@ -933,7 +938,8 @@ msgid "Content Name"
 msgstr ""
 
 #. module: document
-#: code:addons/document/document.py:0
+#: code:addons/document/document.py:154
+#: code:addons/document/document.py:222
 #, python-format
 msgid "File name must be unique!"
 msgstr ""
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index ca55a8219c1..ee669052fde 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -16,7 +16,7 @@
 
     <record id="ir_rule_readpublicdirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
-        <field name="domain_force">['|','|',('group_ids','in',[g.id for g in user.groups_id]), ('user_id', '=', user.id), '&amp;', ('user_id', '=', False), ('group_ids','=',False),  '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|','|',('group_ids','in',[g.id for g in user.groups_id]), ('user_id', '=', user.id), '&amp;', ('user_id', '=', False), ('group_ids','=',False),  '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         <field name="name">Read public directories</field>
         <field eval="0" name="global"/>
         <field eval="[(6,0,[ref('base.group_user')])]" name="groups"/>
@@ -28,7 +28,7 @@
     
     <record id="ir_rule_documentmodifyowndirectories0" model="ir.rule">
         <field name="model_id" ref="document.model_document_directory"/>
-        <field name="domain_force">[ '|', ('user_id', '=', user.id), '&amp;', ('group_ids','in',[g.id for g in user.groups_id]), ('user_id','=',False), '|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">[ '|', ('user_id', '=', user.id), '&amp;', ('group_ids','in',[g.id for g in user.groups_id]), ('user_id','=',False), '|','|', ('company_id','=',False), ('company_id','child_of',[user.company_id.id]),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         <field name="name">Document modify own directories</field>
         <field eval="0" name="global"/>
         <field eval="[(6,0,[ref('base.group_document_user')])]" name="groups"/>
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index d7aba7cbde7..0422edba24e 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -25,3 +25,4 @@
 "access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
 "access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
 "access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
+"access_report_document_user_knowledgeuser","report.document.user knowledgeuser","document.model_report_document_user","base.group_document_user",1,0,0,0
diff --git a/addons/document_ftp/i18n/de.po b/addons/document_ftp/i18n/de.po
index b6e56a4adbd..425ada716ee 100644
--- a/addons/document_ftp/i18n/de.po
+++ b/addons/document_ftp/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:50+0000\n"
+"PO-Revision-Date: 2010-12-29 10:17+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -32,6 +32,12 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"Zeigt die Netzwerk IP Adresse über die der OpenERP Server für Endbenutzer "
+"erreicht werden kann. Diese Adresse hängt ab von der Architektur des "
+"Netzwerks, und wird lediglich einen Einfluss auf die Anzeige der Adresse "
+"beim Benutzer haben. Das Format der Adresse ist HOST:PORT, wobei der "
+"Standard Host (localhost) lediglich gültig ist für einen direkten Zugriff "
+"vom Server selbst."
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
@@ -51,7 +57,7 @@ msgstr "Bild"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -104,7 +110,7 @@ msgstr "Abbrechen"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Configure FTP Server"
-msgstr ""
+msgstr "Konfigurieren FTP Server"
 
 #. module: document_ftp
 #: model:ir.module.module,shortdesc:document_ftp.module_meta_information
@@ -124,7 +130,7 @@ msgstr "Suche per FTP Dokument"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "Konfiguration Knowledge"
 
 #. module: document_ftp
 #: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
diff --git a/addons/document_ftp/i18n/document_ftp.pot b/addons/document_ftp/i18n/document_ftp.pot
index db9204eb64d..6b3c74ea33c 100644
--- a/addons/document_ftp/i18n/document_ftp.pot
+++ b/addons/document_ftp/i18n/document_ftp.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:04+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:04+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
index 7d83a16501d..aa91a0c635d 100644
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 14:37+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-29 10:19+0000\n"
+"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -57,7 +56,7 @@ msgstr "Image"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
index 87c0fba318c..9658ce2992c 100644
--- a/addons/document_ftp/i18n/it.po
+++ b/addons/document_ftp/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-24 08:14+0000\n"
+"PO-Revision-Date: 2010-12-29 10:35+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
@@ -31,6 +31,11 @@ msgid ""
 "format is HOST:PORT and the default host (localhost) is only suitable for "
 "access from the server machine itself.."
 msgstr ""
+"Indica l'indirizzo di rete su cui i vostri server OpenERP possono essere "
+"disponibili all'utente finale. Questo dipende dalla topologia di rete e "
+"dalla configurazione, e interessa solamente i link visualizzati dagli "
+"utenti. Il formato è HOST:PORTA e il default host (localhost) è adatto "
+"solamente per l'accesso dal server su se stesso.."
 
 #. module: document_ftp
 #: field:document.ftp.configuration,progress:0
@@ -50,7 +55,7 @@ msgstr "Immagine"
 #. module: document_ftp
 #: field:document.ftp.configuration,host:0
 msgid "Address"
-msgstr ""
+msgstr "Indirizzo"
 
 #. module: document_ftp
 #: field:document.ftp.browse,url:0
@@ -105,7 +110,7 @@ msgstr "_Annulla"
 #. module: document_ftp
 #: view:document.ftp.configuration:0
 msgid "Configure FTP Server"
-msgstr ""
+msgstr "Configura FTP server"
 
 #. module: document_ftp
 #: model:ir.module.module,shortdesc:document_ftp.module_meta_information
diff --git a/addons/document_ftp/test_easyftp.py b/addons/document_ftp/test_easyftp.py
index 1f7324b821e..04a480fce36 100644
--- a/addons/document_ftp/test_easyftp.py
+++ b/addons/document_ftp/test_easyftp.py
@@ -37,7 +37,7 @@ def get_plain_ftp(timeout=10.0):
 def get_ftp_login(cr, uid, ormobj):
     ftp = get_plain_ftp()
     user = ormobj.pool.get('res.users').read(cr, uid, uid)
-    ftp.login(user.get('login',''), user.get('password',''))
+    ftp.login(user.get('login',''), user.get('login',''))
     ftp.cwd("/" + cr.dbname)
     return ftp
 
@@ -62,4 +62,4 @@ def get_ftp_fulldata(ftp, fname, limit=8192):
     ftp.retrbinary('RETR %s' % fname, partial(ffp,data))
     return ''.join(data)
 
-#eof
\ No newline at end of file
+#eof
diff --git a/addons/document_ics/i18n/de.po b/addons/document_ics/i18n/de.po
index a9f0e72e492..8d8f50f821a 100644
--- a/addons/document_ics/i18n/de.po
+++ b/addons/document_ics/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 15:26+0000\n"
+"PO-Revision-Date: 2010-12-29 12:24+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-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -93,6 +93,8 @@ msgstr "Terminkalender"
 msgid ""
 "OpenERP can create and pre-configure a series of integrated calendar for you."
 msgstr ""
+"OpenERP kann für Sie die Erstellung und Basiskonfiguration von integrierten "
+"Kalenderfunktionen übernehmen."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
@@ -200,6 +202,8 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Ermöglicht Ihnen eine Synchronisierung Ihrer OpenERP Kalender mit mobilen "
+"Geräten oder Outlook, Thunderbird, etc. ..."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
@@ -301,7 +305,7 @@ msgstr "Kategorien"
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
diff --git a/addons/document_ics/i18n/document_ics.pot b/addons/document_ics/i18n/document_ics.pot
index a454116e955..529ec9df13f 100644
--- a/addons/document_ics/i18n/document_ics.pot
+++ b/addons/document_ics/i18n/document_ics.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:04+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:04+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:30+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/document_ics/i18n/it.po b/addons/document_ics/i18n/it.po
index 4e72b2c5f3e..2ef9f5d6661 100644
--- a/addons/document_ics/i18n/it.po
+++ b/addons/document_ics/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-22 07:34+0000\n"
+"PO-Revision-Date: 2010-12-29 12:27+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:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -22,6 +22,8 @@ msgid ""
 "Manages the supplier and customers claims,including your corrective or "
 "preventive actions."
 msgstr ""
+"Gestisce i reclami cliente e fornitore, incluso le azioni preventive o "
+"correttive"
 
 #. module: document_ics
 #: field:document.directory.content,object_id:0
@@ -72,6 +74,8 @@ msgid ""
 "The field of the                         object used in the filename. Has to "
 "be a unique identifier."
 msgstr ""
+"Il campo dell'oggetto utilizzato nel nome file. Deve essere un "
+"identificatore univoco."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -88,6 +92,8 @@ msgstr "Calendario Riunioni"
 msgid ""
 "OpenERP can create and pre-configure a series of integrated calendar for you."
 msgstr ""
+"OpenERP può creare e pre-configurare una serie di calendari integrati per "
+"voi."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
@@ -115,6 +121,9 @@ msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
 msgstr ""
+"Permette di tenere traccia e gestire le iniziative, che sono le richieste "
+"prevendita o i contatti, il vero primo contatto con una richiesta del "
+"cliente."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -147,6 +156,8 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Aiuta ad organizzare il processo di assunzione lavoratori: valutazione, "
+"incontro, integrazione email..."
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -179,6 +190,8 @@ msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
 msgstr ""
+"Aiuta a codificare il risultato di una chiamata telefonica o a pianificare "
+"una lista di chiamate da effettuare."
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,document_ics:0
@@ -186,6 +199,8 @@ msgid ""
 " Will allow you to synchronise your Open ERP calendars with your phone, "
 "outlook, Sunbird, ical, ..."
 msgstr ""
+" Vi permette di sincronizzare il calendario di OpenERP con il vostro "
+"telefono, outlook, Sunbird, iCal, ..."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
@@ -241,6 +256,8 @@ msgstr "Dominio"
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
+"Usato dalle compagnie per tenere traccia dei bug e le richieste di supporto "
+"su software"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -333,6 +350,8 @@ msgid ""
 "If set, a separate                         instance will be created for each "
 "record of Object"
 msgstr ""
+"Se impostato, una istanza separata verrà creata per ognuno dei record "
+"dell'oggetto"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 7db6ce49d98..ec27b85fe45 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -277,9 +277,7 @@ class openerp_dav_handler(dav_interface):
         ua = self.parent.headers.get('User-Agent', False)
         ctx = {}
         if ua:
-            print ua
             if 'iPhone' in ua:
-                print "iphone"
                 ctx['DAV-client'] = 'iPhone'
             elif 'Konqueror' in ua:
                 ctx['DAV-client'] = 'GroupDAV'
@@ -376,7 +374,7 @@ class openerp_dav_handler(dav_interface):
                     cr.close()
         return self.db_name_list
 
-    def get_children(self,uri, filters=None):
+    def get_childs(self,uri, filters=None):
         """ return the child objects as self.baseuris for the given URI """
         self.parent.log_message('get children: %s' % uri)
         cr, uid, pool, dbname, uri2 = self.get_cr(uri, allow_last=True)
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
index 5fbc5df4b12..4f5edc00461 100644
--- a/addons/document_webdav/i18n/de.po
+++ b/addons/document_webdav/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 15:15+0000\n"
+"PO-Revision-Date: 2010-12-29 12:24+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav
@@ -71,6 +71,26 @@ msgid ""
 "          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
 "          ; these options on\n"
 msgstr ""
+" Durch dieses Modul wird der WebDAV Server für gemeinsame Dokumente "
+"aktiviert.\n"
+"        Verwenden Sie einfach einen beliebigen Browser, um Remote auf "
+"Dokumentenanhänge zuzugreifen.\n"
+"\n"
+"        Nach der Installation kann der WebDAV Server durch eine [webdav] "
+"Sektion in der Server Konfiguration gesteuert werden.\n"
+"        Folgendermassen kann dann eine Konfiguration aussehen:\n"
+"        [webdav]\n"
+"        ; enable = True ; Bereitstellung von WebDAV über den http(s) "
+"servers\n"
+"        ; vdir = webdav ; Verzeichnis für WebDAV auf dem Server\n"
+"          ; dieser Standard Eintrag bedeutet dass WebDAV über\n"
+"          ; \"http://localhost:8069/webdav/\" erreicht werden kann\n"
+"        ; verbose = True ; Aktivieren von \"verbose messages of webdav\"\n"
+"        ; debug = True ; Aktivieren von \"debugging messages of webdav\"\n"
+"          ; Hinweis: since the messages are routed to the python logging, "
+"with\n"
+"          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+"          ; these options on\n"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -100,6 +120,9 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Bitte installieren Sie PyWebDAV von hier:  "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_dir_props
diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot
index 17127395a27..50edefbd85c 100644
--- a/addons/document_webdav/i18n/document_webdav.pot
+++ b/addons/document_webdav/i18n/document_webdav.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:05+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:05+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:30+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,14 +15,28 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr ""
+
 #. module: document_webdav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
 msgstr ""
 
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr ""
+
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
 msgstr ""
 
@@ -31,8 +45,14 @@ msgstr ""
 msgid "DAV properties"
 msgstr ""
 
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr ""
+
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
 msgid "Group By..."
 msgstr ""
 
@@ -42,11 +62,22 @@ msgid "These properties will be added to WebDAV requests"
 msgstr ""
 
 #. module: document_webdav
-#: code:addons/document_webdav/webdav.py:0
+#: model:ir.ui.menu,name:document_webdav.menu_file_props
+msgid "DAV properties for documents"
+msgstr ""
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
 #, python-format
 msgid "PyWebDAV Import Error!"
 msgstr ""
 
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr ""
+
 #. 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"
@@ -88,7 +119,7 @@ msgid "The directory name must be unique !"
 msgstr ""
 
 #. module: document_webdav
-#: code:addons/document_webdav/webdav.py:0
+#: code:addons/document_webdav/webdav.py:37
 #, 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 ""
@@ -101,11 +132,13 @@ msgstr ""
 #. module: document_webdav
 #: view:document.directory:0
 #: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
 msgid "Properties"
 msgstr ""
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
 msgid "Name"
 msgstr ""
 
@@ -116,6 +149,7 @@ msgstr ""
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
 msgid "Value"
 msgstr ""
 
@@ -125,11 +159,29 @@ msgstr ""
 msgid "Directory"
 msgstr ""
 
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr ""
+
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Dir"
 msgstr ""
 
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr ""
+
 #. module: document_webdav
 #: model:ir.module.module,shortdesc:document_webdav.module_meta_information
 msgid "WebDAV server for Document Management"
@@ -140,13 +192,9 @@ msgstr ""
 msgid "Directory must have a parent or a storage"
 msgstr ""
 
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Search Document storage"
-msgstr ""
-
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
 msgstr ""
 
diff --git a/addons/document_webdav/i18n/it.po b/addons/document_webdav/i18n/it.po
index d0b69abe463..547a1c9d133 100644
--- a/addons/document_webdav/i18n/it.po
+++ b/addons/document_webdav/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-24 09:31+0000\n"
+"PO-Revision-Date: 2010-12-29 09:29+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav
@@ -47,7 +47,7 @@ msgstr "Queste proprietà verranno aggiunte alle richieste WebDAV"
 #: code:addons/document_webdav/webdav.py:0
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "PyWebDAV: errore importazione!"
 
 #. module: document_webdav
 #: model:ir.module.module,description:document_webdav.module_meta_information
@@ -70,6 +70,24 @@ msgid ""
 "          ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
 "          ; these options on\n"
 msgstr ""
+" Con questo modulo, il server WebDAV per i documenti è attivato.\n"
+"        E' possibile usare qualsiasi browser compatibile per vedere da "
+"remoto gli allegati di OpenERP.\n"
+"\n"
+"        Dopo l'installazione, il server WebDAV può essere controllato da una "
+"sezione [webdav] nella configurazione del server.\n"
+"        Parametri configurazione server:\n"
+"        [webdav]\n"
+"        ; enable = True ; Server webdav sui server http(s) \n"
+"        ; vdir = webdav ; la directory alla quale il server si appoggia\n"
+"        ; questo valore di default significa che il server è\n"
+"        ; su \"http://localhost:8069/webdav/\n"
+"        ; verbose = True ; Abilita la messaggistica dettagliata di  webdav\n"
+"        ; debug = True ; Attiva la modalità di debug di webdav\n"
+"        ; così i messaggi verranno girati al log di python, con \n"
+"        ; levello: \"debug\" e \"debug_rpc\" rispettivamente, è possibile "
+"lasciare\n"
+"        ; questa opzione attiva\n"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -99,6 +117,9 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Per favore installare PyWebDAV dall'indirizzo: "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_dir_props
@@ -145,12 +166,12 @@ msgstr "server WebDAV per Gestione Documentale"
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "La Cartella deve avere un padre o uno storage"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Search Document storage"
-msgstr ""
+msgstr "Ricerca deposito documenti"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
diff --git a/addons/document_webdav/i18n/pl.po b/addons/document_webdav/i18n/pl.po
index 29a50798fd1..c9ced487dab 100644
--- a/addons/document_webdav/i18n/pl.po
+++ b/addons/document_webdav/i18n/pl.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-27 14:21+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:13+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav
diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index acde96dafd4..7483ade5d83 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -63,34 +63,19 @@ class email_template_mailbox(osv.osv):
         return True
     
     def send_this_mail(self, cr, uid, ids=None, context=None):
+        #previous method to send email (link with email account can be found at the revision 4172 and below
         result = True
         attachment_pool = self.pool.get('ir.attachment')
         for id in (ids or []):
             try:
                 account_obj = self.pool.get('email_template.account')
                 values = self.read(cr, uid, id, [], context) 
-                #payload = {}
                 attach_to_send = None
+                
                 if values['attachments_ids']:
-                    #for attid in values['attachments_ids']:
-                        #attachment = attachment_pool.browse(cr, uid, attid, context)#,['datas_fname','datas'])
-                        #payload[attachment.datas_fname] = attachment.datas
                     attach_to_send = self.pool.get('ir.attachment').read(cr, uid, values['attachments_ids'], ['datas_fname','datas', 'name'])
                     attach_to_send = map(lambda x: (x['datas_fname'] or x['name'], base64.decodestring(x['datas'])), attach_to_send)
-                #work around to uniformize send email while waiting for a merge of fetchmail, email_template, mailgate
-                #using tools.send_email instead
-                #No need to use email account
-                #result = account_obj.send_mail(cr, uid,
-                #              [values['account_id'][0]],
-                #              {'To':values.get('email_to') or u'',
-                #               'CC':values.get('email_cc') or u'',
-                #               'BCC':values.get('email_bcc') or u'',
-                #               'Reply-To':values.get('reply_to') or u''},
-                #              values['subject'] or u'',
-                #              {'text':values.get('body_text') or u'', 'html':values.get('body_html') or u''},
-                #              payload=payload,
-                #              message_id=values['message_id'], 
-                #              context=context)
+                
                 if values.get('body_html'):
                     body = values.get('body_html')
                     subtype = "html"
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index 259061743db..a978f0253f9 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 17:14+0000\n"
+"PO-Revision-Date: 2010-12-29 10:01+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -388,6 +388,9 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"Die EMail vom Konto %s ist fehlgeschlagen. Mögliche Ursache: Server "
+"Sendefehler\n"
+" Beschreibung:%s"
 
 #. module: email_template
 #: view:email.template:0
@@ -487,7 +490,7 @@ msgstr "Test Ausgehende Verbindung"
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
 msgid "Mailbox"
-msgstr ""
+msgstr "Postfach"
 
 #. module: email_template
 #: help:email.template,reply_to:0
@@ -886,7 +889,7 @@ msgstr "Sende / Empfange"
 #. module: email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
 msgid "Personal Mails"
-msgstr ""
+msgstr "Persönliche EMails"
 
 #. module: email_template
 #: view:email_template.account:0
@@ -1019,6 +1022,8 @@ msgid ""
 "Server Send Error\n"
 "Description: %s"
 msgstr ""
+"Server Sendefehler\n"
+"Beschreibung:%s"
 
 #. module: email_template
 #: help:email.template,file_name:0
@@ -1144,7 +1149,7 @@ msgstr "Gesendet"
 #. module: email_template
 #: sql_constraint:email_template.account:0
 msgid "Another setting already exists with this email ID !"
-msgstr ""
+msgstr "Ein anderes Konto existiert bereits für diese Adresse !"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
@@ -1226,6 +1231,10 @@ msgid ""
 "emails.\n"
 "    "
 msgstr ""
+"\n"
+"    Das Modul EMail Template ist eine Extraktion der Erweiterung Power EMail "
+"zur Nutzung für den Mailversand.\n"
+"    "
 
 #. module: email_template
 #: view:email_template.send.wizard:0
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index 49ffd971df4..42fd5432029 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:06+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:06+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:31+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:31+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,23 +26,19 @@ msgid "Email Account Configuration"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
 #, python-format
 msgid "Emails for multiple items saved in outbox."
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "No personal email accounts are configured for you. \n"
 "Either ask admin to enforce an account for this template or get yourself a personal email account."
 msgstr ""
 
-#. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid "An email template is an email document that will be sent as part of a marketing campaign. You can personalize it based on specific customer profile fields so that their names or other partner related information can be automatically inserted in it."
-msgstr ""
-
 #. module: email_template
 #: view:email_template.mailbox:0
 msgid "Personal Emails"
@@ -84,7 +80,7 @@ msgid "Body"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Deletion of Record failed"
 msgstr ""
@@ -163,7 +159,7 @@ msgid "Email Account"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #, python-format
 msgid "Email sending failed for one or more objects."
 msgstr ""
@@ -265,7 +261,7 @@ msgid "From Email"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -305,7 +301,7 @@ msgid "Subject"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
 #, python-format
 msgid "Reason: %s"
 msgstr ""
@@ -322,7 +318,7 @@ msgid "Template"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
@@ -376,13 +372,13 @@ msgid "Resource"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
 #, python-format
 msgid "Out going connection test failed"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
 #, python-format
 msgid "Mail from Account %s successfully Sent."
 msgstr ""
@@ -404,7 +400,7 @@ msgid "The text version of the mail"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
 #, python-format
 msgid " (Email Attachment)"
 msgstr ""
@@ -445,7 +441,7 @@ msgid "Attach my signature to mail"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
 #: view:email.template:0
 #, python-format
 msgid "Report"
@@ -573,7 +569,7 @@ msgid "Mail Details"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
 #, python-format
 msgid "SMTP SERVER or PORT not specified"
 msgstr ""
@@ -697,7 +693,7 @@ msgid "Outgoing"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
 #, python-format
 msgid "Datetime Extraction failed.Date:%s                       	Error:%s"
 msgstr ""
@@ -757,7 +753,7 @@ msgid "Save in Drafts"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:MIME Error\n"
 "Description: %s"
@@ -774,10 +770,16 @@ msgid "Language"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
 #: model:ir.ui.menu,name:email_template.menu_email_template
 #: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_tools
 #, python-format
 msgid "Email Template"
@@ -805,7 +807,7 @@ msgid "Only users from these groups will be allowed to send mails from this Temp
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
 #, python-format
 msgid "Send Mail (%s)"
 msgstr ""
@@ -852,7 +854,7 @@ msgid "Text, otherwise HTML"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
 #, python-format
 msgid "Copy of template "
 msgstr ""
@@ -873,7 +875,7 @@ msgid "Close"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
 #, python-format
 msgid "Error sending mail: %s"
 msgstr ""
@@ -889,7 +891,7 @@ msgid "Body (HTML-Web Client Only)"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
 #, python-format
 msgid "%s (Email Attachment)"
 msgstr ""
@@ -899,6 +901,11 @@ msgstr ""
 msgid "Sending"
 msgstr ""
 
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid "An email template is an email document that will be sent as part of a marketing campaign. You can personalize it according to specific customer profile fields, so that a partner name or other partner related information may be inserted automatically."
+msgstr ""
+
 #. module: email_template
 #: field:email.template,allowed_groups:0
 msgid "Allowed User Groups"
@@ -915,7 +922,13 @@ msgid "User Information"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
 #, python-format
 msgid "Server Send Error\n"
 "Description: %s"
@@ -927,8 +940,8 @@ msgid "Name of the generated report file. Placeholders can be used in the filena
 msgstr ""
 
 #. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
 msgstr ""
 
 #. module: email_template
@@ -938,25 +951,25 @@ msgid "Trash"
 msgstr ""
 
 #. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
 #, python-format
 msgid "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
 "Error: %s"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
 #, python-format
 msgid "Missing mail account"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
 #, python-format
 msgid "SMTP Test Connection Was Successful"
 msgstr ""
@@ -1002,11 +1015,6 @@ msgstr ""
 msgid "Null Value"
 msgstr ""
 
-#. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
-msgstr ""
-
 #. module: email_template
 #: field:email.template,template_language:0
 msgid "Templating Language"
@@ -1048,7 +1056,6 @@ msgstr ""
 
 #. module: email_template
 #: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
 #: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
 msgid "Emails"
 msgstr ""
@@ -1122,7 +1129,7 @@ msgid "Model"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
 #, python-format
 msgid "Core connection for the given ID does not exist"
 msgstr ""
@@ -1133,7 +1140,7 @@ msgid "Corporate"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
 #, python-format
 msgid "Mail from Account %s failed on login. Probable Reason:Could not login to server\n"
 "Error: %s"
@@ -1160,8 +1167,8 @@ msgid "Mail Format"
 msgstr ""
 
 #. module: email_template
-#: view:email.template:0
-msgid "Actions"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
 msgstr ""
 
 #. module: email_template
@@ -1175,13 +1182,15 @@ msgid "Enter port number, eg: 25 or 587"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
 #, python-format
 msgid "email-template"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
 #, python-format
 msgid "Mail from Account %s failed. Probable Reason:Account not approved"
 msgstr ""
@@ -1197,8 +1206,8 @@ msgid "Has Attachments"
 msgstr ""
 
 #. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
 #, python-format
 msgid "No Description"
 msgstr ""
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index 24fcd873c6a..f0d91002a7b 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 22:13+0000\n"
+"PO-Revision-Date: 2010-12-29 07:23+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
@@ -389,6 +389,8 @@ msgid ""
 "Mail from Account %s failed. Probable Reason: Server Send Error\n"
 " Description: %s"
 msgstr ""
+"Email dall'account: %s fallita. Probabile motivo: Errore invio server\n"
+" Descrizione: %s"
 
 #. module: email_template
 #: view:email.template:0
@@ -752,7 +754,7 @@ msgstr "Bozza"
 #. module: email_template
 #: field:email.template,model_int_name:0
 msgid "Model Internal Name"
-msgstr ""
+msgstr "Nome interno modello"
 
 #. module: email_template
 #: field:email.template,message_id:0
@@ -1254,7 +1256,7 @@ msgstr "email_template.account"
 #: field:email_template.preview,rel_model:0
 #: field:email_template.send.wizard,rel_model:0
 msgid "Model"
-msgstr ""
+msgstr "Modello"
 
 #. module: email_template
 #: code:addons/email_template/email_template_account.py:0
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index 6389ba9d96d..989bfa343fe 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 14:12+0000\n"
+"PO-Revision-Date: 2010-12-29 13:10+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
@@ -648,6 +648,23 @@ msgid ""
 "event or per event category in:\n"
 "                Events / Reporting\n"
 msgstr ""
+"Organisation und Verwaltung von Veranstaltungen.\n"
+"\n"
+"    Durch dieses Modul können Sie unter anderem ...\n"
+"         * Veranstaltungen terminieren und Anmeldungen verwalten\n"
+"         * automatisch EMails für die Annahme und Bestätigung von "
+"Anmeldungen versenden \n"
+"         * ...\n"
+"     Eine Pinnwand für Organisationen mit folgenden Inhalten:\n"
+"        * Anmeldungen je Veranstaltung (Grafik)\n"
+"    Beachten Sie bitte folgendes:\n"
+"        - Sie können neue Veranstaltungstypen unter folgendem Menü "
+"definieren ...\n"
+"                               "
+"Veranstaltungen/Konfiguration/Veranstaltungstypen\n"
+"        - Vordefinierte Auswertungen über die Anzahl angemeldeter Benutzer "
+"nach Veranstaltung und Kategorie erhalten Sie hier:\n"
+"                               Veranstaltungen/Auswertungen\n"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
@@ -701,7 +718,7 @@ msgstr ""
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: event
 #: view:event.make.invoice:0
@@ -1098,7 +1115,7 @@ msgstr "Anmelden"
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  Anmeldung zu Veranstaltung "
 
 #. module: event
 #: help:event.event,date_begin:0
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index e47f16b9bc3..5064e1a1f47 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:32+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:32+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -104,7 +104,7 @@ msgid "Confirmation Email"
 msgstr ""
 
 #. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
 msgstr ""
@@ -123,7 +123,7 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: event
-#: code:addons/event/wizard/partner_event_registration.py:0
+#: code:addons/event/wizard/partner_event_registration.py:93
 #: view:event.registration:0
 #: model:ir.actions.act_window,name:event.action_partner_event_registration
 #: model:ir.model,name:event.model_event_registration
@@ -191,7 +191,7 @@ msgid "Ticket for Opera"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:122
 #: view:event.event:0
 #, python-format
 msgid "Confirm Event"
@@ -204,11 +204,6 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#. module: event
-#: view:event.registration:0
-msgid "Send New Email"
-msgstr ""
-
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
@@ -261,7 +256,7 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:83
 #, python-format
 msgid "Customer Invoices"
 msgstr ""
@@ -347,14 +342,17 @@ msgid "Number of Registrations or Tickets"
 msgstr ""
 
 #. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:50
+#: code:addons/event/wizard/event_make_invoice.py:54
+#: code:addons/event/wizard/event_make_invoice.py:58
+#: code:addons/event/wizard/event_make_invoice.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
 
 #. module: event
-#: model:ir.actions.act_window,help:event.action_event_view
-msgid "Event is the low-level object used by meeting and others documents that have to be synchronized with mobile or calendar applications through caldav. Most of the users should work on the Calendar menu, and not on the list of events."
+#: view:event.registration:0
+msgid "Send New Email"
 msgstr ""
 
 #. module: event
@@ -395,7 +393,7 @@ msgid "To be Invoiced"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:394
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -413,7 +411,7 @@ msgid "Cancel Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:395
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
 msgstr ""
@@ -465,7 +463,7 @@ msgid "Confirm Anyway"
 msgstr ""
 
 #. module: event
-#: code:addons/event/wizard/event_confirm_registration.py:0
+#: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
 msgstr ""
@@ -625,7 +623,7 @@ msgid "Reference 2"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:357
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
@@ -785,7 +783,7 @@ msgid "Set To Draft"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:472
 #: view:event.event:0
 #: view:event.registration:0
 #: view:res.partner:0
@@ -833,7 +831,7 @@ msgid "Attachments"
 msgstr ""
 
 #. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
 msgstr ""
@@ -854,7 +852,7 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:442
 #: selection:event.event,state:0
 #: view:event.make.invoice:0
 #: selection:event.registration,state:0
@@ -881,7 +879,7 @@ msgid "Year"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:517
 #, python-format
 msgid "Cancel"
 msgstr ""
@@ -899,7 +897,7 @@ msgid "Event by Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:432
 #, python-format
 msgid "Open"
 msgstr ""
@@ -910,7 +908,8 @@ msgid "Responsible User"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:538
+#: code:addons/event/event.py:545
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
 msgstr ""
@@ -1056,7 +1055,7 @@ msgid "Unconfirmed"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:542
 #, python-format
 msgid "Auto Registration: [%s] %s"
 msgstr ""
@@ -1093,13 +1092,13 @@ msgid "Country"
 msgstr ""
 
 #. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
 msgstr ""
 
 #. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:500
 #: view:event.event:0
 #: view:event.registration:0
 #: view:res.partner:0
@@ -1162,7 +1161,7 @@ msgid "Event For Registration"
 msgstr ""
 
 #. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
 msgstr ""
@@ -1196,3 +1195,8 @@ msgstr ""
 msgid "Speaker Confirmed"
 msgstr ""
 
+#. module: event
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid "Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events."
+msgstr ""
+
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index 7da0d02f89a..095413bd73a 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/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:44+0000\n"
-"PO-Revision-Date: 2010-12-20 12:11+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 10:32+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:07+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
 #: view:event.event:0
 msgid "Invoice Information"
-msgstr ""
+msgstr "Informations de facturation"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximun Number of Registrations"
-msgstr ""
+msgstr "Montre le nombre maximum d'inscriptions"
 
 #. module: event
 #: view:partner.event.registration:0
@@ -72,17 +72,17 @@ msgstr "Générer les factures"
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr ""
+msgstr "Date d'inscription"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who are giving speech on event."
-msgstr ""
+msgstr "L'orateur qui prendra la parole lors de l'évènement"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Fermer"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -124,7 +124,7 @@ msgstr "Société"
 #. module: event
 #: field:event.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Date de facturation"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:0
@@ -154,7 +154,7 @@ msgstr "Créer la facture"
 #. module: event
 #: field:event.registration,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Sous-total"
 
 #. module: event
 #: view:report.event.registration:0
@@ -206,7 +206,7 @@ msgstr "Confirmez l'évènement"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulée"
 
 #. module: event
 #: view:event.registration:0
@@ -351,7 +351,7 @@ msgstr ""
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr ""
+msgstr "Nombre d'inscriptions ou de tickets"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:0
@@ -370,7 +370,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "Lieu"
 
 #. module: event
 #: view:event.registration:0
@@ -426,7 +426,7 @@ msgstr "Annuler l'inscription"
 #: code:addons/event/event.py:0
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Le partenaire enregistré n'a pas d'adresse de facturation"
 
 #. module: event
 #: field:event.registration,nb_register:0
@@ -543,7 +543,7 @@ msgstr ""
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Grouper les factures"
 
 #. module: event
 #: view:event.event:0
@@ -640,7 +640,7 @@ msgstr "Message"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Erreur, vous ne pouvez pas créer d'événement récursif !"
 
 #. module: event
 #: field:event.registration,ref2:0
@@ -663,12 +663,12 @@ msgstr "Mes évènements"
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr ""
+msgstr "Orateurs"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Créer les factures"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -686,17 +686,17 @@ msgstr ""
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Voulez-vous réellement créer la(es) facture(s) ?"
 
 #. module: event
 #: view:event.event:0
 msgid "Beginning Date"
-msgstr ""
+msgstr "Date de"
 
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Fermé"
 
 #. module: event
 #: view:event.event:0
@@ -721,18 +721,18 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr ""
+msgstr "Août"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "inconnue"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
@@ -745,12 +745,12 @@ msgstr ""
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Date d'écriture"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr ""
+msgstr "Mes Inscriptions"
 
 #. module: event
 #: view:event.confirm:0
@@ -758,21 +758,23 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Attention : cet évènement n'a pas atteint sa limite maximum d'inscriptions. "
+"Êtes-vous sûr de vouloir le confirmer ?"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actif"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres étendus..."
 
 #. module: event
 #: help:event.event,reply_to:0
@@ -782,7 +784,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
 #. module: event
 #: help:event.event,register_current:0
@@ -803,12 +805,12 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvier"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Ces personnes recevront un courriel."
 
 #. module: event
 #: view:event.event:0
@@ -829,12 +831,12 @@ msgstr "Confirmer l'inscription"
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: event
 #: model:ir.ui.menu,name:event.board_associations
 msgid "Dashboard"
-msgstr ""
+msgstr "Tableau de bord"
 
 #. module: event
 #: view:event.event:0
@@ -850,7 +852,7 @@ msgstr "Historique"
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Adresse de l'évèment"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type
@@ -861,7 +863,7 @@ msgstr "Types d'évènements"
 #. module: event
 #: view:event.registration:0
 msgid "Attachments"
-msgstr ""
+msgstr "Pièces jointes"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:0
@@ -877,12 +879,13 @@ msgstr "Courriel de confirmation automatique"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 365 Days"
-msgstr ""
+msgstr "Derniers 365 jours"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
 msgstr ""
+"Erreur ! La date de fermeture ne peut pas être inférieure à la date de début."
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -938,7 +941,7 @@ msgstr "Ouvert"
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Responsable"
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -953,20 +956,20 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr ""
+msgstr "Prix de l'inscription"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Current"
-msgstr ""
+msgstr "Actuel"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -978,12 +981,12 @@ msgstr "Prix unitaire"
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "Orateur"
 
 #. module: event
 #: view:event.registration:0
 msgid "Details"
-msgstr ""
+msgstr "Détails"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -996,18 +999,18 @@ msgstr "Conférence sur le marché des ERP"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Équipe commerciale"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
 msgid "Start date"
-msgstr ""
+msgstr "Date de début"
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:partner.event.registration,end_date:0
 msgid "Closing date"
-msgstr ""
+msgstr "Date de fermeture"
 
 #. module: event
 #: field:event.event,product_id:0
@@ -1022,7 +1025,7 @@ msgstr "Produit"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
@@ -1037,7 +1040,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: event
 #: view:res.partner:0
@@ -1057,13 +1060,13 @@ msgstr "Billet de conférence"
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr ""
+msgstr "Prochains événements"
 
 #. module: event
 #: view:partner.event.registration:0
@@ -1084,7 +1087,7 @@ msgstr ""
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Non confirmé"
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -1095,17 +1098,17 @@ msgstr ""
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Date de fin"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "Février"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Tableau de bord Association"
 
 #. module: event
 #: view:event.event:0
@@ -1125,7 +1128,7 @@ msgstr ""
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Pays"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:0
@@ -1145,13 +1148,13 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "Avril"
 
 #. module: event
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Résumé"
 
 #. module: event
 #: view:event.event:0
@@ -1173,7 +1176,7 @@ msgstr "Inscriptions"
 #. module: event
 #: field:event.registration,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Date de début"
 
 #. module: event
 #: field:event.event,register_max:0
@@ -1184,7 +1187,7 @@ msgstr "Inscriptions maximum"
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "Date de début de l'évènement"
 
 #. module: event
 #: view:event.event:0
@@ -1200,7 +1203,7 @@ msgstr ""
 #: code:addons/event/wizard/event_make_invoice.py:0
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "La facture ne peut pas être créée si l'inscription a pour état %s"
 
 #. module: event
 #: view:event.confirm:0
@@ -1219,7 +1222,7 @@ msgstr "Courriel d'inscription automatique"
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: event
 #: help:event.event,register_min:0
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
index 20e6bdc5f20..b3e20be6961 100644
--- a/addons/event/i18n/it.po
+++ b/addons/event/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-22 07:35+0000\n"
+"PO-Revision-Date: 2010-12-31 10: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-24 05:07+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
@@ -24,7 +24,7 @@ msgstr "Informazioni fattura"
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximun Number of Registrations"
-msgstr ""
+msgstr "Fornisce il massimo numero di registrazioni"
 
 #. module: event
 #: view:partner.event.registration:0
@@ -51,7 +51,7 @@ msgstr "Registrazioni Minime"
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr ""
+msgstr "Conferma per la registrazione evento"
 
 #. module: event
 #: field:event.registration.badge,title:0
@@ -322,7 +322,7 @@ msgstr "Conferma registrazione"
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr ""
+msgstr "Versione listino per l'evento corrente."
 
 #. module: event
 #: help:event.event,product_id:0
@@ -346,7 +346,7 @@ msgstr "Altri speaker"
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "Evento genera fattura"
 
 #. module: event
 #: help:event.registration,nb_register:0
@@ -521,7 +521,7 @@ msgstr "Contatto"
 #. module: event
 #: view:report.event.registration:0
 msgid "Last 30 Days"
-msgstr ""
+msgstr "Ultimi 30 giorni"
 
 #. module: event
 #: view:event.event:0
@@ -541,7 +541,7 @@ msgstr ""
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Raggruppa le fatture"
 
 #. module: event
 #: view:event.event:0
@@ -592,7 +592,7 @@ msgstr "Dicembre"
 #. module: event
 #: field:event.registration,event_product:0
 msgid "Invoice Name"
-msgstr ""
+msgstr "Nome fattura"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
@@ -643,7 +643,7 @@ msgstr "Errore! Non è possibile creare un evento ricorsivo."
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Riferimento 2"
 
 #. module: event
 #: code:addons/event/event.py:0
@@ -682,7 +682,7 @@ msgstr ""
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Errore! Non è possibile creare dei membri associati ricorsivi."
 
 #. module: event
 #: view:event.make.invoice:0
@@ -966,13 +966,13 @@ msgstr "Responsabile"
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr ""
+msgstr "Costo registrazione"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Current"
-msgstr ""
+msgstr "Attuale"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -1002,7 +1002,7 @@ msgstr "Conferenza su Affari con ERP"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Team di vendita"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
@@ -1079,7 +1079,7 @@ msgstr ""
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  Registrazione evento "
 
 #. module: event
 #: help:event.event,date_begin:0
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/i18n/de.po b/addons/event_project/i18n/de.po
index cc4edc141aa..94a5170bbeb 100644
--- a/addons/event_project/i18n/de.po
+++ b/addons/event_project/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 14:20+0000\n"
+"PO-Revision-Date: 2010-12-29 13:09+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
@@ -64,7 +64,7 @@ msgstr "Projekt Retro Planung"
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Fehler ! Ende der Veranstaltung kann nicht vor Beginn sein."
 
 #. module: event_project
 #: field:event.event,project_id:0
@@ -80,7 +80,7 @@ msgstr "Aufgaben"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Alle Aufgaben"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
@@ -97,7 +97,7 @@ msgstr "Projektvorlage"
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Veranstaltungen definieren."
 
 #. module: event_project
 #: field:event.event,task_ids:0
diff --git a/addons/event_project/i18n/event_project.pot b/addons/event_project/i18n/event_project.pot
index d376f374092..9e34b201d8a 100644
--- a/addons/event_project/i18n/event_project.pot
+++ b/addons/event_project/i18n/event_project.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:32+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:32+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/event_project/i18n/fr.po b/addons/event_project/i18n/fr.po
index e7d273588ca..14d0f7b9bdd 100644
--- a/addons/event_project/i18n/fr.po
+++ b/addons/event_project/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-16 17:31+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-01-01 13:09+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:45+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
@@ -81,7 +80,7 @@ msgstr "Tâches"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Toutes les tâches"
 
 #. module: event_project
 #: model:ir.module.module,shortdesc:event_project.module_meta_information
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/i18n/de.po b/addons/fetchmail/i18n/de.po
index 28aaf84053d..8ccc442731d 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 15:28+0000\n"
+"PO-Revision-Date: 2010-12-29 12:18+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -23,6 +23,8 @@ msgid ""
 "Warning! Record for selected Model can not be created\n"
 "Please choose valid Model"
 msgstr ""
+"Warnung ! Datensatz für das ausgewählte Modul kann nicht erstellt werden\n"
+"Bitte wählen Sie ein gültiges Modul aus"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -87,6 +89,8 @@ msgid ""
 "OpenObject Model. Generates a record of this model.\n"
 "Select Object with message_new attrbutes."
 msgstr ""
+"OpenObject Modul. Erzeugt einen Datensatz aus diesem Modul.\n"
+"Wähle Objekt mit message_new Attribut."
 
 #. module: fetchmail
 #: field:email.server,attach:0
@@ -96,7 +100,7 @@ msgstr "Hinzufügen Anhang ?"
 #. module: fetchmail
 #: view:email.server:0
 msgid "# of emails"
-msgstr ""
+msgstr "# EMails"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
@@ -219,7 +223,7 @@ msgstr "POP/IMAP Server"
 #. module: fetchmail
 #: constraint:email.server:0
 msgid "Warning! Can't have duplicate server configuration!"
-msgstr ""
+msgstr "Warnung ! Doppelte Server Konfiguration ist nicht möglich !"
 
 #. module: fetchmail
 #: field:email.server,type:0
@@ -294,7 +298,7 @@ msgstr "Priorität 0 bis 10, wähle entsprechende Reihenfolge"
 #. module: fetchmail
 #: field:email.server,action_id:0
 msgid "Email Server Action"
-msgstr ""
+msgstr "EMail Serveraktion"
 
 #. module: fetchmail
 #: field:email.server,priority:0
diff --git a/addons/fetchmail/i18n/fetchmail.pot b/addons/fetchmail/i18n/fetchmail.pot
index 3d1d28b9b41..2f3e03e0995 100644
--- a/addons/fetchmail/i18n/fetchmail.pot
+++ b/addons/fetchmail/i18n/fetchmail.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:33+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index adcd4fab2dd..a7685387e52 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-19 22:23+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2011-01-01 08:23+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:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -23,6 +22,9 @@ msgid ""
 "Warning! Record for selected Model can not be created\n"
 "Please choose valid Model"
 msgstr ""
+"Avertissement! l'enregistrement pour le modèle sélectionné ne peut être "
+"créer\n"
+"Veuillez choisir un modèle valide"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -32,12 +34,12 @@ msgstr "Confirmé"
 #. module: fetchmail
 #: view:email.server:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grouper par ..."
 
 #. module: fetchmail
 #: view:email.server:0
@@ -48,7 +50,7 @@ msgstr "État"
 #. module: fetchmail
 #: view:email.server:0
 msgid "POP"
-msgstr ""
+msgstr "POP"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -63,7 +65,7 @@ msgstr "Nom de l'utilisateur"
 #. module: fetchmail
 #: view:email.server:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -87,6 +89,8 @@ msgid ""
 "OpenObject Model. Generates a record of this model.\n"
 "Select Object with message_new attrbutes."
 msgstr ""
+"Model OpenObject. Générer un enregistrement pour ce modèle.\n"
+"Sélectionner un objet avec l'attribut message_new"
 
 #. module: fetchmail
 #: field:email.server,attach:0
@@ -96,12 +100,12 @@ msgstr "Ajouter des pièces jointes ?"
 #. module: fetchmail
 #: view:email.server:0
 msgid "# of emails"
-msgstr ""
+msgstr "# de courriels"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Email History"
-msgstr ""
+msgstr "Historique des courriels"
 
 #. module: fetchmail
 #: field:email.server,user_id:0
@@ -126,12 +130,12 @@ msgstr "Mot de passe"
 #. module: fetchmail
 #: view:mailgate.message:0
 msgid "Emails"
-msgstr ""
+msgstr "Courriels"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Search Email Servers"
-msgstr ""
+msgstr "Rechercher des serveurs de mail"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -156,7 +160,7 @@ msgstr "Message pour la passerelle de courriel"
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 msgid "POP Servers"
-msgstr ""
+msgstr "Serveurs POP"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -167,12 +171,12 @@ msgstr "Mettre à l'état \"Brouillon\""
 #: field:email.server,message_ids:0
 #: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
 msgid "Messages"
-msgstr ""
+msgstr "Messages"
 
 #. module: fetchmail
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
 msgid "Fetchmail Services"
-msgstr ""
+msgstr "Services Fetchmail"
 
 #. module: fetchmail
 #: field:email.server,server:0
@@ -182,12 +186,12 @@ msgstr "Serveur"
 #. module: fetchmail
 #: field:email.server,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actif"
 
 #. module: fetchmail
 #: view:email.server:0
 msgid "Process Parameter"
-msgstr ""
+msgstr "Paramètre du processus"
 
 #. module: fetchmail
 #: field:email.server,is_ssl:0
@@ -208,7 +212,7 @@ msgstr "Modèle"
 #. module: fetchmail
 #: view:email.server:0
 msgid "IMAP"
-msgstr ""
+msgstr "IMAP"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -220,6 +224,7 @@ msgstr "Serveur POP/IMAP"
 #: constraint:email.server:0
 msgid "Warning! Can't have duplicate server configuration!"
 msgstr ""
+"Avertissement! vous ne pouvez pas dupliquer une configuration de serveur!"
 
 #. module: fetchmail
 #: field:email.server,type:0
@@ -240,7 +245,7 @@ msgstr "Information du serveur"
 #. module: fetchmail
 #: help:email.server,attach:0
 msgid "Fetches mail with attachments if true."
-msgstr ""
+msgstr "Récupérer les mails avec attachements si vrai"
 
 #. module: fetchmail
 #: selection:email.server,type:0
@@ -275,7 +280,7 @@ msgstr ""
 #. module: fetchmail
 #: view:email.server:0
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #. module: fetchmail
 #: help:email.server,action_id:0
@@ -283,6 +288,8 @@ msgid ""
 "An Email Server Action. It will be run whenever an e-mail is fetched from "
 "server."
 msgstr ""
+"Un courriel du Server Action. Il sera lancé lorsqu'un email sera récupérer "
+"sur le serveur."
 
 #. module: fetchmail
 #: help:email.server,priority:0
@@ -292,7 +299,7 @@ msgstr "Priorité entre 0 et 10, qui définit l'ordre de traitement"
 #. module: fetchmail
 #: field:email.server,action_id:0
 msgid "Email Server Action"
-msgstr ""
+msgstr "Courriel du Server Action"
 
 #. module: fetchmail
 #: field:email.server,priority:0
diff --git a/addons/fetchmail/i18n/it.po b/addons/fetchmail/i18n/it.po
index beb13205821..3649c4818b3 100644
--- a/addons/fetchmail/i18n/it.po
+++ b/addons/fetchmail/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-27 14:42+0000\n"
+"PO-Revision-Date: 2010-12-31 10:23+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: fetchmail
@@ -23,6 +23,8 @@ msgid ""
 "Warning! Record for selected Model can not be created\n"
 "Please choose valid Model"
 msgstr ""
+"Attenzione! Il record per il modello selezionato non può essere creato\n"
+"Per favore scegliere un modello valido"
 
 #. module: fetchmail
 #: selection:email.server,state:0
@@ -96,12 +98,12 @@ msgstr "Aggiungere Attachment?"
 #. module: fetchmail
 #: view:email.server:0
 msgid "# of emails"
-msgstr ""
+msgstr "# di email"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.act_server_history
 msgid "Email History"
-msgstr ""
+msgstr "Storico email"
 
 #. module: fetchmail
 #: field:email.server,user_id:0
@@ -156,7 +158,7 @@ msgstr ""
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 msgid "POP Servers"
-msgstr ""
+msgstr "Server POP"
 
 #. module: fetchmail
 #: view:email.server:0
@@ -275,7 +277,7 @@ msgstr ""
 #. module: fetchmail
 #: view:email.server:0
 msgid "SSL"
-msgstr ""
+msgstr "SSL"
 
 #. module: fetchmail
 #: help:email.server,action_id:0
diff --git a/addons/google_map/i18n/google_map.pot b/addons/google_map/i18n/google_map.pot
index d9435a2edcc..096f56056d5 100644
--- a/addons/google_map/i18n/google_map.pot
+++ b/addons/google_map/i18n/google_map.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:08+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:08+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:33+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 103b0534349..e2b9a7089f3 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -150,6 +150,7 @@ class hr_employee(osv.osv):
         'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
         'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),
+        'mobile_phone': fields.char('Mobile', size=32, readonly=False),
         'work_email': fields.char('Work E-mail', size=240),
         'work_location': fields.char('Office Location', size=32),
         'notes': fields.text('Notes'),
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 43bd88312f1..91b78ddeed5 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -79,5 +79,12 @@
             <field name="category_ids" eval="[(6, 0, [ref('category_trainee')])]"/>
         </record>
 
+        <record id="ir_ui_view_sc_employees_demo" model="ir.ui.view_sc">
+            <field name="name">Employees</field>
+            <field name="resource">ir.ui.menu</field>
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 41c3d478cce..08fa5e0d7d8 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -51,10 +51,6 @@
                 <search string="Departments">
                     <field name="name"/>
                     <field name="manager_id" />
-                    <newline />
-                    <group expand="0" string="Group By...">
-                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'manager_id'}"/>
-                    </group>
                 </search>
              </field>
          </record>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 076c207f850..c2b738351aa 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -3,13 +3,12 @@
     <data>
 
         <menuitem id="menu_hr_root" icon="terp-hr" name="Human Resources" sequence="15"
-            groups="base.group_hr_manager,base.group_hr_user"
             web_icon="images/hr.png"
             web_icon_hover="images/hr-hover.png"/>
-        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0" groups="base.group_hr_manager"/>
+        <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
         <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" groups="base.group_hr_manager" name="Employees" sequence="1" />
+        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
 
         <!--
         ==========
@@ -38,14 +37,14 @@
                     </group>
                     <notebook colspan="6">
                         <page string="Personal Information">
-                            <group col="2" colspan="2">
+                            <group col="2" colspan="2" groups="base.group_hr_user">
                                 <separator colspan="2" string="Social IDs"/>
                                 <field name="ssnid"/>
                                 <field name="sinid" groups="base.group_extended"/>
                                 <field name="identification_id" groups="base.group_extended"/>
                                 <field name="passport_id"/>
                             </group>
-                            <group col="2" colspan="2">
+                            <group col="2" colspan="2" groups="base.group_hr_user">
                                 <separator string="Status" colspan="2"/>
                                 <field name="gender"/>
                                 <field name="marital" widget="selection"/>
@@ -58,6 +57,7 @@
                                 <field name="partner_id" invisible="1" />
                                 <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" domain="[('partner_id', '=', partner_id)]"/>
                                 <field name="work_phone"/>
+                                <field name="mobile_phone"/>
                                 <field name="work_email" widget="email" />
                                 <field name="work_location"/>
                             </group>
@@ -67,10 +67,10 @@
                                 <field name="coach_id" />
                             </group>
                         </page>
-                        <page string="Categories">
+                        <page string="Categories" groups="base.group_hr_user">
                             <field name="category_ids" nolabel="1"/>
                         </page>
-                        <page string="Notes">
+                        <page string="Notes" groups="base.group_hr_user">
                             <field colspan="4" nolabel="1" name="notes"/>
                         </page>
                     </notebook>
@@ -87,8 +87,8 @@
                 <tree string="Employees">
                     <field name="name"/>
                     <field name="work_phone"/>
+                    <field name="work_email"/>
                     <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="work_email" invisible="1"/>
                     <field name="department_id"/>
                     <field name="job_id"/>
                     <field name="parent_id"/>
@@ -155,7 +155,7 @@
             <field name="help">Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee.</field>
         </record>
 
-        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
         <!--
         =======================
@@ -403,7 +403,7 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_job_filter"/>
             <field name="context">{"search_default_Current":1,"search_default_department_id": department_id}</field>
-            <field name="help">JJob Positions is used to define jobs and their requirements. You can attach a survey to a job position. This survey will be used in the recruitment process to evaluate the applicants for this job position.</field>
+            <field name="help">Job Positions are used to define jobs and their requirements. You can keep track of the number of employees you have per job position and how many you expect in the future. You can also attach a survey to a job position that will be used in the recruitment process to evaluate the applicants for this job position.</field>
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index df230d9ed68..77c7536876b 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 10:38+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -159,7 +160,7 @@ msgstr "Meine Abteilungen"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "Verheiratet"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -330,6 +331,8 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Sie können die Anwendungen für das Personalwesen durch weitere \"HR\" "
+"Funktionen erweitern."
 
 #. module: hr
 #: view:hr.employee:0
@@ -520,7 +523,7 @@ msgstr ""
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -570,6 +573,14 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    Anwendung für die Personalverwaltung. Folgende Ressourcen können durch "
+"die Anwendung verwaltet werden:\n"
+"    * Mitarbeiter und Personalhierachie: Sie können Mitarbeiter und deren "
+"Vorgesetzte definieren.\n"
+"    * Abteilungen\n"
+"    * Arbeitsstellen\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -648,7 +659,7 @@ msgstr "Persönliche Info"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Ausweis Nr."
 
 #. module: hr
 #: view:res.users:0
@@ -709,7 +720,7 @@ msgstr "Mitarbeitervergütung"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Alleinstehend"
 
 #. module: hr
 #: field:hr.job,name:0
@@ -816,7 +827,7 @@ msgstr "Mentor"
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre Personalanwendungen"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
@@ -834,7 +845,7 @@ msgstr "Manager"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Verwitwet"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 020ee2cacd8..394ca791e7d 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/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:44+0000\n"
-"PO-Revision-Date: 2010-12-21 04:26+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2011-01-01 11:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -570,6 +570,13 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    Module de gestion des resources humaines. Vous pouvez gérer:\n"
+"    * Les employés et les hiérarchies : vous pouvez lier un employé avec un "
+"utilisateur et mettre en place les hiérarchies\n"
+"    * Les départements liés aux RH\n"
+"    * Les fonctions des RH\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -648,7 +655,7 @@ msgstr "Information personnelle"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "N° de passeport"
 
 #. module: hr
 #: view:res.users:0
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index d4eecc0128f..08686c17554 100644
--- a/addons/hr/i18n/fr_BE.po
+++ b/addons/hr/i18n/fr_BE.po
@@ -1,19 +1,21 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* hr
+# French (Belgium) 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-07-30 14:14:29+0000\n"
-"PO-Revision-Date: 2010-07-30 14:14:29+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \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-29 14:12+0000\n"
+"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+"Language-Team: French (Belgium) <fr_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -26,6 +28,11 @@ msgstr "Utilisateur OpenERP"
 msgid "Requirements"
 msgstr ""
 
+#. module: hr
+#: constraint:hr.department:0
+msgid "Error! You can not create recursive departments."
+msgstr ""
+
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
@@ -34,48 +41,58 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "Numéro de Sécurité Sociale"
+msgstr ""
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
 #: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Ressources humaines"
+msgstr ""
 
 #. module: hr
+#: view:hr.department:0
 #: view:hr.employee:0
+#: view:hr.job:0
 msgid "Group By..."
-msgstr "Grouper par"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr "Courriel professionnel"
-
-#. module: hr
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de Modèle non valide pour la définition de l'action."
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,department_id:0
+#: view:hr.job:0
 #: field:hr.job,department_id:0
 #: view:res.users:0
 msgid "Department"
-msgstr "Département"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,ssnid:0
-msgid "SSN No"
-msgstr "Numéro de sécurité sociale"
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
 msgstr ""
 
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr ""
+
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
@@ -83,40 +100,73 @@ msgstr ""
 
 #. module: hr
 #: field:hr.department,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr "Société"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr ""
+
+#. module: hr
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr "État civil du travailleur"
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr "Associer un utilisateur à un travailleur"
-
-#. module: hr
-#: field:hr.department,parent_id:0
-msgid "Parent Department"
-msgstr "Département parent"
-
-#. module: hr
-#: view:ir.actions.todo:0
-msgid "Launch"
 msgstr ""
 
 #. module: hr
-#: view:hr.department:0
-#: view:hr.employee:0
-#: field:hr.employee,notes:0
-msgid "Notes"
-msgstr "Remarques"
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr ""
 
 #. module: hr
-#: model:ir.model,name:hr.model_hr_installer
-msgid "hr.installer"
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "My Departments Employee"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
+msgid "Married"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
 msgstr ""
 
 #. module: hr
@@ -124,50 +174,44 @@ msgstr ""
 msgid "Position"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.action_hr_installer
-msgid "Human Resources Modules Installation"
-msgstr "Installation du module des ressources humaines"
-
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Hiérarchie des travailleurs"
+msgstr ""
 
 #. module: hr
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
 msgstr ""
 
 #. module: hr
-#: selection:hr.job,state:0
-msgid "Old"
-msgstr ""
-
-#. module: hr
-#: help:hr.installer,hr_timesheet_sheet:0
-msgid "Tracks and helps employees encode and validate timesheets and attendance."
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
 msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "No of Employees"
-msgstr "Nombre de travailleurs"
-
-#. module: hr
-#: view:hr.job:0
-msgid "Recruitment"
+msgid "No of Employee"
 msgstr ""
 
-#. module: hr
-#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
-msgid "married"
-msgstr "Marié(e)"
-
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr "Féminin"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
@@ -182,22 +226,27 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Structure des travailleurs"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr "Numéros sociaux"
+msgstr ""
+
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr "Téléphone professionnel"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr "Catégories filles"
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
@@ -209,7 +258,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr "Localisation du Bureau"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
@@ -217,43 +266,36 @@ msgstr "Localisation du Bureau"
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr "Travailleur"
+msgstr ""
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr "Autre information"
+msgstr ""
 
 #. module: hr
-#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
-msgid "widow(er)"
-msgstr "Veuf/Veuve"
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
+msgstr ""
 
 #. module: hr
-#: view:hr.employee:0
-msgid "Unactive"
-msgstr "Inactif"
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,child_ids:0
-#: view:res.users:0
-#: field:res.users,child_ids:0
-msgid "Subordinates"
-msgstr "Subordonnés"
+#: model:ir.ui.menu,name:hr.menu_hr_reporting
+msgid "Reporting"
+msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr "ir.actions.act_window"
-
-#. module: hr
-#: help:hr.installer,hr_attendance:0
-msgid "Simplifies the management of employee attendances."
 msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
-#: model:ir.ui.menu,name:hr.menu_hr_project
 msgid "Human Resources Dashboard"
 msgstr ""
 
@@ -268,43 +310,63 @@ msgstr ""
 #: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr "Membres"
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr "Configuration"
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid ""
+"You can enhance the base HR Application by installing few HR-related "
+"functionalities."
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Categories"
+msgstr ""
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr "Travailleurs prévus"
+msgstr ""
 
 #. module: hr
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr ""
+
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
+msgid "Divorced"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Catégorie mère"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr ""
 
 #. module: hr
 #: view:hr.department:0
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
-#: model:ir.actions.act_window,name:hr.open_module_tree_department_tree
-#: model:ir.ui.menu,name:hr.menu_department_def
-#: model:ir.ui.menu,name:hr.menu_department_tree
 #: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
 #: field:res.users,context_department_id:0
 msgid "Departments"
-msgstr "Départements"
+msgstr ""
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Contrat de travail du travailleur"
+msgstr ""
 
 #. module: hr
 #: view:board.board:0
@@ -314,24 +376,24 @@ msgstr ""
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr "Masculin"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr "Catégories de travailleurs"
-
-#. module: hr
-#: field:hr.installer,hr_attendance:0
-msgid "Attendances (Sign In/Out)"
 msgstr ""
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Catégorie du travailleur"
+msgstr ""
 
 #. module: hr
 #: field:hr.installer,config_logo:0
@@ -341,23 +403,23 @@ msgstr ""
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr "Contrat de travail du travailleur"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
-msgid "Lets you create and manage the periodic evaluation and performance review of employees."
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
 msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "hr.department"
+msgstr ""
 
 #. module: hr
-#: help:hr.installer,hr_holidays:0
-msgid "Tracks employee leaves allocations, requests and planning.\n"
-"\n"
-"Can also plug into OpenERP's agendas and calendars applications in order to display accepted leaves requests on OpenERP's calendars."
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
 msgstr ""
 
 #. module: hr
@@ -366,46 +428,79 @@ msgid "Recruitment Process"
 msgstr ""
 
 #. module: hr
-#: field:hr.employee,category_id:0
+#: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr "Catégorie"
+msgstr ""
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_employeeuser0
-msgid "The field Relate'd user in the Employee form allows to link the OpenERP user (and his rights and role) to the employee."
+#: model:ir.actions.act_window,help:hr.open_view_employee_list_my
+msgid ""
+"Here you can manage your work force by creating employees and assigning them "
+"specific properties in the system. Maintain all employee related information "
+"and keep track of anything that needs to be recorded for them. The personal "
+"information tab will help you maintain their identity data. The Categories "
+"tab gives you the opportunity to assign them related employee categories "
+"depending on their position and activities within the company. A category "
+"can be a seniority level within the company or a department. The Timesheets "
+"tab allows to assign them a specific timesheet and analytic journal where "
+"they will be able to enter time through the system. In the note tab, you can "
+"enter text data that should be recorded for a specific employee."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
 msgstr ""
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr "Note"
+msgstr ""
+
+#. module: hr
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr "Informations sur le contact"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr "Adresse professionnelle"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr "État"
+msgstr ""
 
 #. module: hr
-#: field:hr.installer,progress:0
-msgid "Configuration Progress"
-msgstr "État d'avancement de configuration"
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid ""
+"Your Company's Departments Structure is used to manage all documents related "
+"to employees by departments: expenses and timesheet validation, leaves "
+"management, recruitements, etc."
+msgstr ""
+
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr "Structure des catégories"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,partner_id:0
@@ -415,29 +510,35 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr "Gestion des congés / absences"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,birthday:0
-msgid "Birthday"
-msgstr "Date d'anniversaire"
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr ""
 
 #. module: hr
-#: model:ir.ui.menu,name:hr.menu_hr_main
-#: model:ir.ui.menu,name:hr.menu_hr_management
-msgid "Human Resources Management"
-msgstr "Gestion des ressources humaines"
+#: view:hr.employee:0
+msgid "Active"
+msgstr ""
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
 
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr "Sociétés"
+msgstr ""
 
 #. module: hr
 #: model:ir.module.module,description:hr.module_meta_information
-msgid "\n"
+msgid ""
+"\n"
 "    Module for human resource management. You can manage:\n"
-"    * Employees and hierarchies : You can define your employee with User and display hierarchies\n"
+"    * Employees and hierarchies : You can define your employee with User and "
+"display hierarchies\n"
 "    * HR Departments\n"
 "    * HR Jobs\n"
 "    "
@@ -445,14 +546,20 @@ msgstr ""
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
-msgid "In the Employee form, there are different kind of information like Contact information."
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
 msgstr ""
 
 #. module: hr
-#: view:res.users:0
-#: field:res.users,parent_id:0
-msgid "Managers"
-msgstr "Responsables"
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr ""
+
+#. module: hr
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
@@ -460,6 +567,12 @@ msgid "Status Description"
 msgstr ""
 
 #. module: hr
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
 msgstr ""
@@ -471,7 +584,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr.action_hr_marital_status
 #: model:ir.ui.menu,name:hr.hr_menu_marital_status
 msgid "Marital Status"
-msgstr "État civil"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
@@ -491,88 +604,118 @@ msgstr ""
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr "res.users"
+msgstr ""
 
 #. module: hr
-#: view:hr.job:0
-#: selection:hr.job,state:0
-msgid "Open"
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
 msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr "Informations personnelles"
+msgstr ""
 
 #. module: hr
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr ""
 
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr "Activité courante"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
 
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr "Courant"
+msgstr ""
 
 #. module: hr
-#: field:hr.installer,hr_contract:0
-msgid "Employee's Contracts"
-msgstr "Contrats du travailleur"
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr "Catégories des travailleurs"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr "Adresse personnelle"
+msgstr ""
 
 #. module: hr
+#: field:hr.installer,hr_attendance:0
+msgid "Attendances"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr "Description"
+msgstr ""
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
-msgstr "Etend les profils du travailleur pour aider dans la gestion de leurs contrats"
+msgstr ""
 
 #. module: hr
-#: help:hr.installer,hr_expense:0
-msgid "Tracks and manages employee expenses, and can automatically re-invoice clients if the expenses are project-related."
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
 msgstr ""
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr "Célibataire"
+msgstr ""
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
 msgstr ""
 
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr ""
+
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr "département"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr "Nationalité"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,otherid:0
-msgid "Other ID"
-msgstr "Autre identifiant"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -580,14 +723,15 @@ msgid "Resource"
 msgstr ""
 
 #. module: hr
-#: field:hr.department,complete_name:0
-msgid "Name"
-msgstr "Nom"
+#: view:hr.installer:0
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,gender:0
 msgid "Gender"
-msgstr "Genre"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
@@ -598,32 +742,32 @@ msgstr "Genre"
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
-msgstr "Travailleurs"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,bank_account:0
+#: field:hr.employee,bank_account_id:0
 msgid "Bank Account"
-msgstr "Compte bancaire"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr "Nom du département"
+msgstr ""
 
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr "Numéro de sécurité sociale"
+msgstr ""
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr "Création d'un utilisateur OpenERP"
+msgstr ""
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Sous-départements"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -638,8 +782,8 @@ msgid "Coach"
 msgstr ""
 
 #. module: hr
-#: view:res.users:0
-msgid "Departements Informations"
+#: view:hr.installer:0
+msgid "Configure Your Human Resources Application"
 msgstr ""
 
 #. module: hr
@@ -648,14 +792,32 @@ msgid "Expenses"
 msgstr ""
 
 #. module: hr
+#: view:hr.department:0
 #: field:hr.department,manager_id:0
 #: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr "Responsable"
+msgstr ""
 
 #. module: hr
-#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
-msgid "Divorced / separated"
-msgstr "Divorcé(e) / Séparé(e)"
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
+msgid "Widower"
+msgstr ""
 
+#. module: hr
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid ""
+"JJob Positions is used to define jobs and their requirements. You can attach "
+"a survey to a job position. This survey will be used in the recruitment "
+"process to evaluate the applicants for this job position."
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr ""
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index e2034d645b0..9cf7876c04c 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-10-30 09:35+0000\n"
+"PO-Revision-Date: 2011-01-01 09:04+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
+"Language-Team: <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
@@ -26,17 +26,17 @@ msgstr "OpenERP korisnik"
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Preduvjeti"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "Greška! Ne možete kreirati rekurzivne odjele!"
+msgstr "Pogreška! Ne možete kreirati rekurzivne odjele!"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Poveži djelatnika sa podacima"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -50,19 +50,19 @@ msgstr "SIN No"
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Ljudski Resursi"
+msgstr "Ljudski resursi"
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "Poslovna el. pošta"
 
 #. module: hr
 #: view:hr.employee:0
@@ -76,27 +76,27 @@ msgstr "Odjel"
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr ""
+msgstr "Pojednostavljuje upravljanje podacima prisustva djelatnika"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Označi kao Staro"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "Poslovi"
 
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr ""
+msgstr "U regrutiranju"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "naslov"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -109,22 +109,22 @@ msgstr "Tvrtka"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Očekivano u regrutiranju"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "Praznici"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
-msgstr ""
+msgstr "Prati odsustva djelatnika, zahtjeve raspoređivanja i planiranje"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr ""
+msgstr "Bračni status djelatnika"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -132,52 +132,54 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Partner koji je povezan sa trenutnim djelatnikom. Knjigovodstvena "
+"transakcija koja će biti zapisana na ovom partneru pripada djelatniku."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr ""
+msgstr "Poveži korisnika sa djelatnikom"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr ""
+msgstr "Ugovori djelatnika"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr ""
+msgstr "Opći sustav obračuna plaća"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "Djelatnik mojih odjela"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "U braku"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
-msgstr ""
+msgstr "Pogreška ! Ne možete odabrati odjel u kojemu je djelatnik menadžer."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr ""
+msgstr "Podaci putovnice djelatnika"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Pozicija"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr "Hijerarhija Djelatnika"
+msgstr "Hijerarhija djelatnika"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -185,22 +187,24 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"Polje pripadajućeg korisnika na formi djelatnika dozvoljava povezivanje "
+"OpenERP korisnika (i njegovih prava) sa djelatnikom"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "U regrutiranju"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "Identifikacijski broj"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr ""
+msgstr "Broj zaposlenika"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -212,31 +216,32 @@ msgstr "Žensko"
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Prati i pomaže djelatnicima u provjeri i potvrdi rasporeda i prisustva"
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Periodičke provjere"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Raspored"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Struktura Djelatnika"
+msgstr "Struktura djelatnika"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr "Osobni ID brojevi"
+msgstr "JMBG-ovi"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "Broj djelatnika sa tim poslom."
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -253,7 +258,7 @@ msgstr "Slijedne Kategorije"
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Opis posla"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -271,7 +276,7 @@ msgstr "Djelatnik"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Ostali podaci"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -282,7 +287,7 @@ msgstr "Ime"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "Datum rođenja"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -292,19 +297,19 @@ msgstr "Izvještavanje"
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr ""
+msgstr "ir.actions.act_window"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "Nadzorna ploča odjela ljudskih resursa"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "Posao"
 
 #. module: hr
 #: view:hr.department:0
@@ -323,21 +328,23 @@ msgid ""
 "You can enhance the base HR Application by installing few HR-related "
 "functionalities."
 msgstr ""
+"Moguće je povećati mogućnosti aplikacije ljudskih resursa instalacijom "
+"nekoliko funkcionalnosti povezanih sa odjelom ljudskih resursa."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "Očekivano djelatnika"
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "JMBG"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
@@ -347,12 +354,12 @@ msgstr "Razveden-a"
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr "Ishodna Kategorija"
+msgstr "Nadređena kategorija"
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "Pogreška ! Ne možete kreirati rekurzivne kategorije."
 
 #. module: hr
 #: view:hr.department:0
@@ -366,12 +373,12 @@ msgstr "Odjeli"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Kontakt Djelatnika"
+msgstr "Kontakt djelatnika"
 
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja ploča"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -381,7 +388,7 @@ msgstr "Muško"
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Tijek konfiguracije"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
@@ -393,17 +400,17 @@ msgstr "Kategorije djelatnika"
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Kategorija Djelatnika"
+msgstr "Kategorija djelatnika"
 
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "Ugovor djelatnika"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -411,21 +418,23 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
+"Omogućava kreiranje i upravljanje periodičkom procjenom i provjerom "
+"učinkovitosti djelatnika."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr "Odjel Ljudskih Resursa"
+msgstr "hr.department"
 
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "Povezano je s upraviteljem odjela"
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Postupak regrutiranja"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
@@ -447,11 +456,21 @@ msgid ""
 "they will be able to enter time through the system. In the note tab, you can "
 "enter text data that should be recorded for a specific employee."
 msgstr ""
+"Ovdje možete upravljati radnom snagom putem kreiranja djelatnika i "
+"pridružujući im posebna svojstva u sustavu. Održavajte ispravnim sve podatke "
+"vezane uz djelatnike i vodite računa o svemu što mora biti snimljeno za "
+"njih. Kartica privatnih informacija će pomoći u održavanju podataka o "
+"njihovom identitetu. Kartica kategorija pruža mogućnost pridruživanja "
+"odgovarajućih kategorija zaposlenika prema poziciji i aktivnostima u tvrtci. "
+"Kategorija može biti duljina radnog staža u odjelu ili tvrtki. Kartica "
+"rasporeda omogućava da se djelatnicima pridruži određeni raspored i "
+"analitički dnevnik gdje će moći unijeti vrijeme putem sustava. U kartici  "
+"bilješki moguće je unijeti tekstualne podatke za pojedinog djelatnika."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Konto za plaću djelatnika"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -461,7 +480,7 @@ msgstr "Bilješka"
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Odabrana tvrtka nije među dozvoljenim tvrtkama za ovog korisnika"
 
 #. module: hr
 #: view:hr.employee:0
@@ -476,7 +495,7 @@ msgstr "Poslovna adresa"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Nadzorna ploča upravitelja HR"
 
 #. module: hr
 #: view:hr.employee:0
@@ -490,32 +509,35 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitements, etc."
 msgstr ""
+"Struktura odjela vaše tvrtke se koristi za upravljanje svim dokumentima "
+"povezanim sa djelatnicima po odjelima: troškovi i provjere rasporeda, "
+"upravljanje odsustvima, regrutacijama, itd."
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Podesi"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr "Struktura Kategorija"
+msgstr "Struktura kategorija"
 
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznato"
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "Upravljanje praznicima / odsustvima"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "SSN No"
+msgstr "JMBG"
 
 #. module: hr
 #: view:hr.employee:0
@@ -525,7 +547,7 @@ msgstr "Aktivan"
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Greška! Ne možete kreirati rekurzivnu Hijerarhiju Djelatnika"
+msgstr "Pogreška ! Ne možete kreirati rekurzivnu hijerarhiju djelatnika."
 
 #. module: hr
 #: view:hr.department:0
@@ -543,6 +565,13 @@ msgid ""
 "    * HR Jobs\n"
 "    "
 msgstr ""
+"\n"
+"    Modul za upravljanje ljudskim resursima. Možete upravljati:\n"
+"* Djelatnicima i hijerarhijama : Možete definirati djelatnika sa korisnikom "
+"i prikazati hijerarhije\n"
+"* Odjeli HR\n"
+"* Poslovi HR\n"
+"    "
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -550,32 +579,34 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"Na formi djelatnika postoje različite vrste informacija poput podataka "
+"kontakta."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "Ukupan broj djelatnika potreban za taj posao."
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Staro"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Opis statusa"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Ne možete imati dva korisnika sa istim korisničkim imenom !"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -589,27 +620,27 @@ msgstr "Bračni status"
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
-msgstr ""
+msgstr "Pomaže u upravljanju i usmjeravanju procesa regrutiranja."
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Forma i struktura djelatnika"
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "Slika"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Knjigovodstvo obračuna plaća"
 
 #. module: hr
 #: view:hr.employee:0
@@ -619,12 +650,12 @@ msgstr "Osobni podaci"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Broj putovnice"
 
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Trenutna aktivnost"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -632,16 +663,18 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Prati i upravlja troškove djelatnika , moguće je automatski ponovno "
+"fakturirati klijente ako su troškovi povezani sa projektom."
 
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutno"
 
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr "Ishodni Odjel"
+msgstr "Nadređeni odjel"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -662,33 +695,34 @@ msgstr "Nazočnosti"
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
 msgstr ""
+"Proširuje profil djelatnika radi lakšeg upravljanja njihovim ugovorima."
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "Obračun plaće"
 
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Samac"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "Naziv posla"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "Na poziciji"
 
 #. module: hr
 #: view:hr.department:0
@@ -710,23 +744,23 @@ msgstr "Bilješke"
 #. module: hr
 #: model:ir.model,name:hr.model_hr_installer
 msgid "hr.installer"
-msgstr ""
+msgstr "hr.installer"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "Ploča upravitelja HR"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Sredstva"
 
 #. module: hr
 #: view:hr.installer:0
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr ""
+msgstr "Postavke aplikacije ljudskih resursa"
 
 #. module: hr
 #: field:hr.employee,gender:0
@@ -747,49 +781,49 @@ msgstr "Djelatnici"
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Bankovni konto"
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr "Ime Odjela"
+msgstr "Naziv odjela"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "JMBG"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Kreiranje OpenERP korisnika"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr "Slijedni Odjeli"
+msgstr "Podređeni odjeli"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "Poslovne pozicije"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Trener"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure Your Human Resources Application"
-msgstr ""
+msgstr "Promjena postavki aplikacije ljudskih resursa"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "Troškovi"
 
 #. module: hr
 #: view:hr.department:0
@@ -802,12 +836,12 @@ msgstr "Voditelj"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Udovac-ica"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "Opći sustav obračuna plaća integriran sa knjigovodstvom"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -816,229 +850,26 @@ msgid ""
 "a survey to a job position. This survey will be used in the recruitment "
 "process to evaluate the applicants for this job position."
 msgstr ""
+"Poslovne pozicije se koriste za definiranje poslova i njihovih zahtjeva. "
+"Moguće je priložiti anketu poslovnoj poziciji. Ova anketa će se koristiti u "
+"procesu regrutacije za procjenu aplikanata za tu poslovnu poziciju."
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr "Podređeni Djelatnici"
-
-#~ msgid "Attendance"
-#~ msgstr "Nazočnost"
+msgstr "Podređeni djelatnici"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
 #~ "Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
 
-#~ msgid "Sign in / Sign out"
-#~ msgstr "Prijava / Odjava"
-
-#~ msgid ""
-#~ "(*) A positive delay means that the employee worked less than recorded."
-#~ msgstr ""
-#~ "(*) Pozitivno kašnjenje znači da je Djelatnik radio manje no što je "
-#~ "zabilježeno."
-
-#~ msgid "Employee attendances"
-#~ msgstr "Nazočnost Djelatnika"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neispravan XML za Arhitekturu Prikaza!"
 
-#~ msgid "You are now ready to sign in or out of the attendance follow up"
-#~ msgstr "Sada se možete prijaviti ili odjaviti iz praćenja Nazočnosti"
-
-#~ msgid "Sign out"
-#~ msgstr "Odjava"
-
-#~ msgid "Delay"
-#~ msgstr "Kašnjenje"
-
-#~ msgid "Employee's name"
-#~ msgstr "Ime Djelatnika"
-
-#~ msgid "Print Timesheet"
-#~ msgstr "Tiskaj Kontrolnu Karticu"
-
-#~ msgid "Print Attendance Error Report"
-#~ msgstr "Tiskaj izvještaj greške Nazočnosti"
-
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nepravilno ime modela u definiciji radnje."
 
-#~ msgid "Print Timesheet by week"
-#~ msgstr "Tiskaj Kontrolnu karticu po tjednu"
-
-#~ msgid "Select a time span"
-#~ msgstr "Odaberi razdoblje"
-
-#~ msgid "Date Recorded"
-#~ msgstr "datum bilježenja"
-
-#~ msgid "Sign In"
-#~ msgstr "Prijava"
-
-#~ msgid "Total period:"
-#~ msgstr "Ukupno vremensko trajanje:"
-
-#~ msgid "Action reason"
-#~ msgstr "Razlog radnje"
-
-#~ msgid "March"
-#~ msgstr "Ožujak"
-
-#~ msgid "August"
-#~ msgstr "Kolovoz"
-
-#~ msgid "May"
-#~ msgstr "Svibanj"
-
-#~ msgid "Your last sign in"
-#~ msgstr "Vaša zadnja prijava"
-
-#~ msgid "June"
-#~ msgstr "Lipanj"
-
-#~ msgid "Print Timesheet by month"
-#~ msgstr "Tiskaj Kontrolnu karticu po mjesecu"
-
-#~ msgid "Sign Out"
-#~ msgstr "Odjava"
-
-#~ msgid "Attendances Of Employees"
-#~ msgstr "Nazočnosti Djelatnika"
-
-#~ msgid "Reason"
-#~ msgstr "Razlog"
-
-#~ msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-#~ msgstr "Greška: Prijava (Odn. Odjava) mora slijediti Odjavu (Odn. Prijavu)"
-
-#~ msgid "Date Signed"
-#~ msgstr "Datum zabilježbe"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "July"
-#~ msgstr "Srpanj"
-
-#~ msgid ""
-#~ "You did not signed out the last time. Please enter the date and time you "
-#~ "signed out."
-#~ msgstr ""
-#~ "Zadnji puta se niste odjavili. Molim Vas, unesite datum i vrijeme kad ste se "
-#~ "trebali odjaviti."
-
-#~ msgid "Attendance reasons"
-#~ msgstr "Razlozi nazočnosti"
-
-#~ msgid "Starting Date"
-#~ msgstr "Početni datum"
-
-#~ msgid "Present"
-#~ msgstr "Prisutan"
-
-#~ msgid "Absent"
-#~ msgstr "Odsutan"
-
-#~ msgid "February"
-#~ msgstr "Veljača"
-
-#~ msgid "October"
-#~ msgstr "Listopad"
-
-#~ msgid "Your last sign out"
-#~ msgstr "Vaša zadnja Odjava"
-
-#~ msgid "Min Delay"
-#~ msgstr "Min kašnjenje"
-
-#~ msgid "Action's type"
-#~ msgstr "Tip radnje"
-
-#~ msgid "Define attendance reason"
-#~ msgstr "Definirajte razlog nazočnosti"
-
-#~ msgid "Sign in"
-#~ msgstr "Prijava"
-
-#~ msgid "Analysis Information"
-#~ msgstr "Podaci Analize"
-
-#~ msgid "Current state"
-#~ msgstr "Tekuće stanje"
-
-#~ msgid "January"
-#~ msgstr "Siječanj"
-
-#~ msgid "April"
-#~ msgstr "Travanjž"
-
-#~ msgid "Attendance Errors"
-#~ msgstr "Greške nazočnosti"
-
-#~ msgid "Action"
-#~ msgstr "Radnja"
-
-#~ msgid "Print Attendance Report"
-#~ msgstr "Tiskaj izvještaj Nazočnosti"
-
-#~ msgid "Attendance Reasons"
-#~ msgstr "Razlozi nazočnosti"
-
-#~ msgid "November"
-#~ msgstr "Studeni"
-
-#~ msgid "Bellow this delay, the error is considered to be voluntary"
-#~ msgstr "Ispod tog kašnjenja, greška se smatra proizvoljnom."
-
-#~ msgid "Max. Delay (Min)"
-#~ msgstr "Max. Kašnjenje (min)"
-
-#~ msgid "Select a starting and a end date"
-#~ msgstr "Odaberite datum početka i završetka"
-
-#~ msgid "Ending Date"
-#~ msgstr "Datum završetka"
-
-#~ msgid ""
-#~ "You did not signed in the last time. Please enter the date and time you "
-#~ "signed in."
-#~ msgstr ""
-#~ "Zadnji puta se niste prijavili. Molim Vas, unesite datum i vrijeme kad ste "
-#~ "se trebali prijaviti."
-
-#~ msgid "September"
-#~ msgstr "Rujan"
-
-#~ msgid "December"
-#~ msgstr "Prosinac"
-
-#~ msgid "Employee attendance"
-#~ msgstr "Nazočnost Djelatnika"
-
-#~ msgid "Select a month"
-#~ msgstr "Odaberite mjesec"
-
-#~ msgid "Month"
-#~ msgstr "Mjesec"
-
-#~ msgid "This module aims to manage employee's attendances."
-#~ msgstr "Ovaj modul treba upravljati nazočnostima Djelatnika"
-
-#~ msgid "Attendance Error Report"
-#~ msgstr "Izvještaj greške Nazočnosti"
-
-#~ msgid "Year"
-#~ msgstr "Godina"
-
-#~ msgid "Cancel"
-#~ msgstr "Odustani"
-
-#~ msgid "Operation"
-#~ msgstr "Djelovanje"
-
 #~ msgid "Working Time Categories"
 #~ msgstr "Kategorije radnog vremena"
 
@@ -1149,3 +980,6 @@ msgstr "Podređeni Djelatnici"
 
 #~ msgid "New Employee"
 #~ msgstr "Novi Djelatnik"
+
+#~ msgid "Passport"
+#~ msgstr "Putovnica"
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index a7198d83e7b..b2268c60d67 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:08+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:08+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:34+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:34+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -51,15 +51,14 @@ msgid "Human Resources"
 msgstr ""
 
 #. module: hr
-#: view:hr.department:0
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
 msgstr ""
 
 #. module: hr
-#: field:hr.employee,work_email:0
-msgid "Work E-mail"
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid "Job Positions are used to define jobs and their requirements. You can keep track of the number of employees you have per job position and how many you expect in the future. You can also attach a survey to a job position that will be used in the recruitment process to evaluate the applicants for this job position."
 msgstr ""
 
 #. module: hr
@@ -164,6 +163,11 @@ msgstr ""
 msgid "Employee Passport Information"
 msgstr ""
 
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid "Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc."
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
@@ -265,6 +269,11 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,complete_name:0
 #: field:hr.employee.category,complete_name:0
@@ -461,11 +470,6 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,help:hr.open_module_tree_department
-msgid "Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc."
-msgstr ""
-
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
@@ -624,6 +628,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
 msgstr ""
 
@@ -659,6 +664,11 @@ msgstr ""
 msgid "In Position"
 msgstr ""
 
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Mobile"
+msgstr ""
+
 #. module: hr
 #: view:hr.department:0
 msgid "department"
@@ -761,7 +771,6 @@ msgid "Expenses"
 msgstr ""
 
 #. module: hr
-#: view:hr.department:0
 #: field:hr.department,manager_id:0
 #: view:hr.employee:0
 #: field:hr.employee,parent_id:0
@@ -778,11 +787,6 @@ msgstr ""
 msgid "Generic Payroll system Integrated with Accountings."
 msgstr ""
 
-#. module: hr
-#: model:ir.actions.act_window,help:hr.action_hr_job
-msgid "JJob Positions is used to define jobs and their requirements. You can attach a survey to a job position. This survey will be used in the recruitment process to evaluate the applicants for this job position."
-msgstr ""
-
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 0e93689262d..50440ad9dd8 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-29 07:51+0000\n"
+"PO-Revision-Date: 2010-12-29 11:18+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -157,7 +157,7 @@ msgstr "Dipendente dei miei dipartimenti"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
 msgid "Married"
-msgstr ""
+msgstr "Sposato/a"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -482,6 +482,7 @@ msgstr "Nota"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"L'azienda scelta non è tra le aziende a cui questo utente ha l'accesso"
 
 #. module: hr
 #: view:hr.employee:0
@@ -517,7 +518,7 @@ msgstr ""
 #. module: hr
 #: view:hr.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -595,7 +596,7 @@ msgstr "Descrizione Stato"
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Non è possibile avere due utenti con lo stesso login!"
 
 #. module: hr
 #: view:hr.job:0
@@ -645,7 +646,7 @@ msgstr "Informazioni Personali"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Num. passaporto"
 
 #. module: hr
 #: view:res.users:0
@@ -706,7 +707,7 @@ msgstr "Libro paga"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
 msgid "Single"
-msgstr ""
+msgstr "Celibe/nubile"
 
 #. module: hr
 #: field:hr.job,name:0
@@ -831,7 +832,7 @@ msgstr "Responsabile"
 #. module: hr
 #: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
 msgid "Widower"
-msgstr ""
+msgstr "Vedovo"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index ab8eb568264..c21d0598de0 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_employee_category_user","hr.employee.category.user","model_hr_employee_category","base.group_hr_user",1,1,1,1
+"access_hr_employee_category_emp","hr.employee.category.emp","model_hr_employee_category","base.group_user",1,0,0,0
 "access_hr_employee_user","hr.employee user","model_hr_employee","base.group_hr_user",1,1,1,1
 "access_hr_employee_system_user","hr.employee system user","model_hr_employee","base.group_user",1,0,0,0
 "access_hr_employee_resource_user","resource.resource.user","resource.model_resource_resource","base.group_hr_user",1,1,1,1
@@ -7,3 +8,4 @@
 "access_hr_job_user","hr.job user","model_hr_job","base.group_hr_user",1,1,1,1
 "access_hr_res_partner_address","res.partner.address","base.model_res_partner_address","base.group_hr_manager",1,1,1,1
 "access_hr_employee_marital_status_manager","hr.employee.marital.status.manager","model_hr_employee_marital_status","base.group_hr_manager",1,1,1,1
+"access_ir_property_hr_user","ir_property hr_user","base.model_ir_property","base.group_hr_user",1,1,1,0
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 584340d6c1d..07ef528a7c9 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -137,7 +137,7 @@ class hr_employee(osv.osv):
 
             res = {'action': type, 'employee_id': emp['id']}
             if dt:
-                res['name'] = dt
+                res['name'] = dt   
         id = obj_attendance.create(cr, uid, res, context=context)
 
         if type != 'action':
@@ -146,4 +146,4 @@ class hr_employee(osv.osv):
 
 hr_employee()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 66e99b5eb55..12374ed5552 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -129,8 +129,8 @@
             <field name="arch" type="xml">
                 <field name="coach_id" position="after">
                     <group colspan="2">
-                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}"/>
-                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}"/>
+                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                     </group>
                     <field name="state"/>
                     <newline/>
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index de541fa368b..c66c60ebf50 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 09:51+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:44+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -112,6 +113,8 @@ msgstr "Definiere Begründungen für An-/Abmeldung"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
@@ -196,6 +199,13 @@ msgid ""
 "    actions(Sign in/Sign out) performed by them.\n"
 "       "
 msgstr ""
+"\n"
+"    Diese Anwendung kann die Anwesenheit von Mitarbeitern verwalten und "
+"erfassen.\n"
+"    Ermittelt werden die Arbeitszeiten von Mitarbeitern auf der Basis der "
+"von Ihnen\n"
+"    erfassten Anmeldungen und Abmeldungen.\n"
+"       "
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
@@ -350,6 +360,7 @@ msgstr "November"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 3e27bb67b22..c4e185afa2f 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:09+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:09+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:35+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:35+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgid "Print Attendance Report Error"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
 #, python-format
 msgid "The sign-out date must be in the past"
 msgstr ""
@@ -66,6 +66,11 @@ msgstr ""
 msgid "Date Signed"
 msgstr ""
 
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid "The Time Tracking functionality aims to manage employee attendances from Sign in/Sign out actions. You can also link this feature to an attendance device using OpenERP's web service features."
+msgstr ""
+
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
@@ -126,7 +131,10 @@ msgid "Attendance Reasons"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -143,19 +151,19 @@ msgid "Employee attendance"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
+#: code:addons/hr_attendance/hr_attendance.py:136
 #, python-format
 msgid "Warning"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
 #, python-format
 msgid "The Sign-in date must be in the past"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
 #, python-format
 msgid "A sign-in must be right after a sign-out !"
 msgstr ""
@@ -230,7 +238,7 @@ msgid "Operation"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available"
 msgstr ""
@@ -271,7 +279,9 @@ msgid "Sign In Sign Out"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:125
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:141
 #: view:hr.sign.in.out:0
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
@@ -279,11 +289,6 @@ msgstr ""
 msgid "Sign in / Sign out"
 msgstr ""
 
-#. module: hr_attendance
-#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
-msgid "Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attendance machine using OpenERP's webservices features."
-msgstr ""
-
 #. module: hr_attendance
 #: view:hr.sign.in.out.ask:0
 msgid "hr.sign.out.ask"
@@ -295,7 +300,7 @@ msgid "August"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
 #, python-format
 msgid "A sign-out must be right after a sign-in !"
 msgstr ""
@@ -378,13 +383,17 @@ msgstr ""
 msgid "If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."
 msgstr ""
 
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+msgid "Employee ID"
+msgstr ""
+
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_week
 msgid "Print Week Attendance Report"
 msgstr ""
 
 #. module: hr_attendance
-#: field:hr.sign.in.out,emp_id:0
 #: field:hr.sign.in.out.ask,emp_id:0
 msgid "Empoyee ID"
 msgstr ""
@@ -431,7 +440,7 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
+#: code:addons/hr_attendance/hr_attendance.py:136
 #, python-format
 msgid "You tried to %s with a date anterior to another event !\n"
 "Try to contact the administrator to correct attendances."
@@ -452,7 +461,6 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
-#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
 msgstr ""
 
@@ -518,7 +526,7 @@ msgid "Bellow this delay, the error is considered to be voluntary"
 msgstr ""
 
 #. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records found for your selection!"
 msgstr ""
diff --git a/addons/hr_attendance/report/bymonth.xsl b/addons/hr_attendance/report/bymonth.xsl
index 3975e4d1d11..23e7fb14b3d 100644
--- a/addons/hr_attendance/report/bymonth.xsl
+++ b/addons/hr_attendance/report/bymonth.xsl
@@ -29,7 +29,7 @@
 
     <xsl:template name="story">
 		<spacer length="1cm" />
-		<para style="terp_header_Centre" t="1">Attendance By Month</para>
+		<para style="terp_header_Centre" t="1">Attendances By Month</para>
 		<spacer length="1cm" />
         <blockTable>
 			<xsl:attribute name="style">week</xsl:attribute>
diff --git a/addons/hr_attendance/security/ir.model.access.csv b/addons/hr_attendance/security/ir.model.access.csv
index 919aea0d57f..51d5e87145c 100644
--- a/addons/hr_attendance/security/ir.model.access.csv
+++ b/addons/hr_attendance/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_action_reason_user","hr.action.reason.user","model_hr_action_reason","base.group_hr_user",1,1,1,1
+"access_hr_action_reason_employee","hr.action.reason.employee","model_hr_action_reason","base.group_user",1,1,1,1
 "access_hr_attendance_user","hr.attendance.user","model_hr_attendance","base.group_hr_user",1,1,1,1
-"access_hr_attendance_system_user","hr.attendance.system.user","model_hr_attendance","base.group_user",1,0,0,0
+"access_hr_attendance_system_user","hr.attendance.system.user","model_hr_attendance","base.group_user",1,1,1,1
diff --git a/addons/hr_attendance/test/hr_attendance_report.yml b/addons/hr_attendance/test/hr_attendance_report.yml
index d26f6ddb9bc..523b64ee70d 100644
--- a/addons/hr_attendance/test/hr_attendance_report.yml
+++ b/addons/hr_attendance/test/hr_attendance_report.yml
@@ -1,19 +1,20 @@
 -
- In order to test the PDF reports defined on HR Attendance, we will print a report of HR Attendance By Month
+ Print the HR Attendance Report By Month through the wizard
 -
   !python {model: hr.employee}: |
-    import netsvc, tools, os, time
-    data_dict = {'model': 'hr.employee', 'form': {'month': time.gmtime()[1], 'year': time.gmtime()[0]}}
-    (data, format) = netsvc.LocalService('report.hr.attendance.bymonth').create(cr, uid, [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')], data_dict, {'active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-by_month_report.'+format), 'wb+').write(data)
-
+    import time
+    ctx={}
+    ctx.update({'model': 'hr.employee','active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
+    data_dict = {}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_hr_attendance_month',wiz_data=data_dict, context=ctx, our_module='hr_attendance')
+-
+  Print HR Attendance Error Report through the wizard
 -
-  In order to test the PDF reports defined on HR Attendance, we will print a report of HR Attendance Error
-- 
   !python {model: hr.employee}: |
-    import netsvc, tools, os, time
-    data_dict = {'model': 'hr.employee', 'form': {'init_date': time.strftime('%Y-01-01'), 'end_date':time.strftime('%Y-%m-%d'), 'emp_ids': [ref('hr.employee1')], 'max_delay': 120}}
-    (data, format) = netsvc.LocalService('report.hr.attendance.error').create(cr, uid, [ref('hr.employee1')], data_dict, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'hr_attendance-error_report.'+format), 'wb+').write(data)
+    import time
+    ctx={}
+    ctx.update({'model': 'hr.employee','active_ids': [ref('hr.employee1')]})
+    data_dict = {'init_date': time.strftime('%Y-01-01')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_hr_attendance_error',wiz_data=data_dict, context=ctx, our_module='hr_attendance')
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..7a51c2b9e1e 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -68,7 +68,7 @@ class hr_sign_in_out(osv.osv_memory):
     _columns = {
         'name': fields.char('Employees name', size=32, required=True, readonly=True),
         'state': fields.char('Current state', size=32, required=True, readonly=True),
-        'emp_id': fields.char('Empoyee ID', size=32, required=True, readonly=True),
+        'emp_id': fields.char('Employee ID', size=32, required=True, readonly=True),
                 }
 
     def _get_empid(self, cr, uid, context=None):
@@ -157,10 +157,10 @@ class hr_sign_in_out(osv.osv_memory):
             self.pool.get('hr.attendance').create(cr, uid, {'name': data['last_time'], 'action': 'sign_out',
                 'employee_id': emp_id}, context=context)
         try:
-            success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
+            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']
@@ -169,11 +169,11 @@ class hr_sign_in_out(osv.osv_memory):
                 raise osv.except_osv(_('UserError'), _('The Sign-in date must be in the past'))
             self.pool.get('hr.attendance').create(cr, uid, {'name':data['last_time'], 'action':'sign_in',  'employee_id':emp_id}, context=context)
         try:
-            success = self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
+            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()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index a67be5d0ad2..cae7885a754 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -57,7 +57,7 @@
             <field name="search_view_id" ref="hr_contract_wage_type_view_search"/>
         </record>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_hr_manager"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
         <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56" sequence="7"/>
 
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
@@ -102,7 +102,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <page string="Personal Information" position="after">
-                    <page string="Miscellaneous">
+                    <page string="Miscellaneous" groups="base.group_hr_user">
                         <group colspan="2" col="2">
                         <separator string="Personal Info" colspan="2"/>
                         <field name="bank_account_id"/>
@@ -120,24 +120,10 @@
                         <field name="medic_exam" />
                         </group>
                     </page>
-                    <page string="Contracts">
-                        <field colspan="4" name="contract_ids" nolabel="1"/>
-                    </page>
                 </page>
             </field>
         </record>
 
-        <record id="hr_employee_view_form3" model="ir.ui.view">
-            <field name="name">hr.employee.view.form3</field>
-            <field name="model">hr.employee</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-                <field name="parent_id" position="after">
-                    <field name="contract_id"/>
-                </field>
-            </field>
-        </record>
 
         <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
@@ -281,7 +267,7 @@
         </record>
 
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6"/>
-        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
 
         <!-- Contracts Button on Employee Form -->
         <act_window 
@@ -289,7 +275,8 @@
         id="act_hr_employee_2_hr_contract" 
         name="Contracts" 
         res_model="hr.contract" 
-        src_model="hr.employee"/>
+        src_model="hr.employee"
+        groups="base.group_hr_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index fe4dfdef57d..294abce4488 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 17:30+0000\n"
+"PO-Revision-Date: 2010-12-29 09:53+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -193,6 +193,14 @@ msgid ""
 "    You can assign several contracts per employee.\n"
 "    "
 msgstr ""
+"\n"
+"    Sie können alle vertragsrelevanten Informationen für den Mitarbeiter "
+"erfassen:\n"
+"    * Familienstand,\n"
+"    * Sozialversicherungsnummer,\n"
+"    * Geburtsort und -datum, ...\n"
+"    Sie können durchaus mehrere Verträge für einen Mitarbeiter hinterlegen.\n"
+"    "
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -233,6 +241,7 @@ msgstr "Suche Vergütungsarten"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -266,6 +275,8 @@ msgstr "Bemerkungen"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_contract
 #: field:hr.contract,wage_type_id:0
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index 227b539702a..4e950a815a8 100644
--- a/addons/hr_contract/i18n/hr_contract.pot
+++ b/addons/hr_contract/i18n/hr_contract.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:10+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:10+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:35+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:35+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -36,8 +36,8 @@ msgid "Trial Start Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Passport"
 msgstr ""
 
 #. module: hr_contract
@@ -66,8 +66,8 @@ msgid "Current"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
 msgstr ""
 
 #. module: hr_contract
@@ -81,8 +81,8 @@ msgid "Wage Types"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Calculations"
+#: field:hr.contract,department_id:0
+msgid "Department"
 msgstr ""
 
 #. module: hr_contract
@@ -97,12 +97,6 @@ msgstr ""
 msgid "Employee"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Net"
@@ -119,29 +113,12 @@ msgid "Hours in the period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Function"
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.employee,place_of_birth:0
-msgid "Place of Birth"
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.employee:0
 #: field:hr.employee,contract_ids:0
 #: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract
@@ -150,8 +127,8 @@ msgid "Contracts"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.employee,manager:0
-msgid "Is a Manager"
+#: view:hr.employee:0
+msgid "Personal Info"
 msgstr ""
 
 #. module: hr_contract
@@ -159,12 +136,6 @@ msgstr ""
 msgid "Job"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.employee:0
-msgid "Passport"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Search Contract"
@@ -194,19 +165,16 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,advantages:0
-#: view:hr.employee:0
 msgid "Advantages"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.contract:0
-#: view:hr.employee:0
 msgid "Valid for"
 msgstr ""
 
 #. module: hr_contract
 #: view:hr.contract:0
-#: view:hr.employee:0
 msgid "Work Permit"
 msgstr ""
 
@@ -222,8 +190,12 @@ msgid "Contract Types"
 msgstr ""
 
 #. module: hr_contract
+#: field:hr.contract,wage_type_id:0
 #: view:hr.contract.wage.type:0
-msgid "Search Wage Type"
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
+msgid "Wage Type"
 msgstr ""
 
 #. module: hr_contract
@@ -254,7 +226,6 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,notes:0
-#: view:hr.employee:0
 msgid "Notes"
 msgstr ""
 
@@ -263,15 +234,6 @@ msgstr ""
 msgid "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
 
-#. module: hr_contract
-#: field:hr.contract,wage_type_id:0
-#: view:hr.contract.wage.type:0
-#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
-#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
-#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.employee,contract_id:0
@@ -295,8 +257,9 @@ msgid "Search Wage Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Salary Computation"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
 msgstr ""
 
 #. module: hr_contract
@@ -317,14 +280,8 @@ msgid "Job Title"
 msgstr ""
 
 #. module: hr_contract
-#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
-#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
-msgid "Wage period"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.employee,vehicle_distance:0
-msgid "Home-Work Distance"
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
 msgstr ""
 
 #. module: hr_contract
@@ -333,8 +290,13 @@ msgid "Start Date"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Company contribution"
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Search Wage Type"
 msgstr ""
 
 #. module: hr_contract
@@ -348,8 +310,9 @@ msgid "Trial End Date"
 msgstr ""
 
 #. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
 msgstr ""
 
 #. module: hr_contract
@@ -363,23 +326,14 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
 msgstr ""
 
 #. module: hr_contract
-#: view:hr.employee:0
-msgid "Employee specific allowances and deductions"
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Contract Details"
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Salary Structure"
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
+msgid "Wage period"
 msgstr ""
 
 #. module: hr_contract
@@ -388,14 +342,8 @@ msgstr ""
 msgid "This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee"
 msgstr ""
 
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Personal Info"
-msgstr ""
-
 #. module: hr_contract
 #: view:hr.contract:0
-#: view:hr.employee:0
 msgid "Duration"
 msgstr ""
 
diff --git a/addons/hr_contract/security/ir.model.access.csv b/addons/hr_contract/security/ir.model.access.csv
index 36456284856..7c87e3c36b3 100644
--- a/addons/hr_contract/security/ir.model.access.csv
+++ b/addons/hr_contract/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_contract_wage_type_period_user","hr.contract.wage.type.period.user","model_hr_contract_wage_type_period","base.group_hr_user",1,1,1,1
 "access_hr_contract_wage_type_user","hr.contract.wage.type.user","model_hr_contract_wage_type","base.group_hr_user",1,1,1,1
-"access_hr_contract_user","hr.contract.user","model_hr_contract","base.group_hr_user",1,1,1,1
 "access_hr_resource_manager","hr.employee.resource.manager","resource.model_resource_resource","base.group_hr_manager",1,1,1,1
 "access_hr_resource_calendar_user","hr.employee.resource.calendar.user","resource.model_resource_calendar","base.group_hr_user",1,1,1,1
 "access_hr_contract_type_manager","hr.contract.type.manager","model_hr_contract_type","base.group_hr_manager",1,1,1,1
+"access_hr_contract_manager","hr.contract.manager","model_hr_contract","base.group_hr_manager",1,1,1,1
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 160105a69ad..68e658f87b9 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -281,7 +281,7 @@ class hr_evaluation_interview(osv.osv):
     _columns = {
         'request_id': fields.many2one('survey.request','Request_id', ondelete='cascade', required=True),
         'user_to_review_id': fields.many2one('hr.employee', 'Employee to Interview'),
-        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluation Type'),
+        'evaluation_id': fields.many2one('hr_evaluation.evaluation', 'Evaluation Form'),
     }
     _defaults = {
         'is_evaluation': True,
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 83b25c177ff..99f34f7cc7b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -64,7 +64,7 @@
         </record>
 
         <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
-        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4" groups="base.group_hr_manager"/>
+        <menuitem name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
         <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree"
             action="open_view_hr_evaluation_plan_tree"/>
 
@@ -142,7 +142,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <page string="Notes" position="before">
-                    <page string="Evaluation">
+                    <page string="Evaluation" groups="base.group_hr_user">
                         <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
                         <field name="evaluation_date"/>
                     </page>
@@ -170,7 +170,26 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Appraisal">
-                            <field name="survey_request_ids" context="{'phase_id': phase_id}" nolabel="1" colspan="4" widget="one2many"/>
+                            <field name="survey_request_ids" context="{'phase_id': phase_id}" nolabel="1" colspan="4" widget="one2many">
+                                <form string="Interview Evaluation">
+                                    <group col="4" colspan="4">
+                                        <field name="survey_id"/>
+                                        <group col="2" colspan="2">
+                                            <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                            <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
+                                        </group>
+                                        <field name="date_deadline"/>
+                                        <field name="response" readonly="1"/>
+                                        <field name="user_to_review_id"/>
+                                        <field name="user_id" string="Interviewer"/>
+                                    </group>
+                                    <newline/>
+                                    <separator string="State" colspan="4"/>
+                                    <group colspan="4" col="6">
+                                         <field name="state"/>
+                                    </group>
+                                </form>
+                            </field>
                         </page>
                         <page string="Internal Notes">
                             <field name="note_action" colspan="4" nolabel="1"
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 19e9bcaa7ab..d7299498740 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:20+0000\n"
+"PO-Revision-Date: 2010-12-29 13:16+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
@@ -122,6 +122,8 @@ msgid ""
 "This number of months will be used to schedule the first evaluation date of "
 "the employee when selecting an evaluation plan. "
 msgstr ""
+"Die Anzahl in Monaten, nach der die erste Beurteilung des Mitarbeiters nach "
+"der Zuweisung eines Beurteilungsverfahrens erfolgen soll. "
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -138,6 +140,8 @@ msgstr "Beurteilungsanfrage"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -181,7 +185,7 @@ msgstr "Juli"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Evaluations (months)"
-msgstr ""
+msgstr "Beurteilungsfrequenz (in Monaten)"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:0
@@ -199,7 +203,7 @@ msgstr "Enddatum"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Evaluation in (months)"
-msgstr ""
+msgstr "Erste Beurteilung nach (Monaten)"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
@@ -276,7 +280,7 @@ msgstr " Monat "
 msgid ""
 "The number of month that depicts the delay between each evaluation of this "
 "plan (after the first one)."
-msgstr ""
+msgstr "Anzahl Monate zwischen den regelmäßigen Beurteilungen"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
@@ -305,6 +309,19 @@ msgid ""
 "          in the form of.Implements a dashboard for My Current Evaluations\n"
 "         "
 msgstr ""
+"\n"
+"          Anwendung für die Mitarbeiterbeurteilung.\n"
+"           Eine Mitarbeiterbeurteilung kann dabei sowohl für Vorgsetzte "
+"durch die Mitarbeiter,\n"
+"           als auch für Mitarbeiter durch deren Abteilungs- oder "
+"Gruppenleiter erfolgen. Das Vorgehen\n"
+"           einer Beurteilung erfolgt dabei planmäßig durch eine bestimmte "
+"Abfolge verschiedener\n"
+"           Befragungen von Mitarbeitern und Vorgesetzten bis zu einer "
+"abschliessenden Beurteilung.\n"
+"           Alle anstehenden Beurteilungsverfahren sind über die Personal "
+"Pinnwand ersichtlich.\n"
+"         "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -627,6 +644,7 @@ msgstr "Erweiterter Filter..."
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -741,7 +759,7 @@ msgstr "Sende alle Antworten an Mitarbeiter"
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Evaluation Date"
-msgstr ""
+msgstr "Nächste Beurteilung"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -927,6 +945,8 @@ msgid ""
 "The date of the next evaluation is computed by the evaluation plan's dates "
 "(first evaluation + periodicity)."
 msgstr ""
+"Das Datum für die nächste Beurteilung wird automatisch auf Basis des "
+"zugeordneten Beurteilungsverfahrens errechnet (Erste Bewertung + Frequenz)"
 
 #~ msgid "Information"
 #~ msgstr "Information"
diff --git a/addons/hr_evaluation/i18n/fr_BE.po b/addons/hr_evaluation/i18n/fr_BE.po
deleted file mode 100644
index e7026289ce5..00000000000
--- a/addons/hr_evaluation/i18n/fr_BE.po
+++ /dev/null
@@ -1,275 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* hr_evaluation
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 12:18:06+0000\n"
-"PO-Revision-Date: 2009-11-25 12:18:06+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: hr_evaluation
-#: view:hr_evaluation.type:0
-#: field:hr_evaluation.type,info:0
-msgid "Information"
-msgstr ""
-
-#. module: hr_evaluation
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-msgid "Schedule next evaluation"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-#: field:hr_evaluation.evaluation,info_bad:0
-msgid "Bad Points"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_my_list
-msgid "My Next Evaluation"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.type,value_ids:0
-msgid "Values"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-#: field:hr_evaluation.evaluation,info_good:0
-msgid "Good Points"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.evaluation,state:0
-msgid "State"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.evaluation,score:0
-#: field:hr_evaluation.quote,score:0
-#: field:hr_evaluation.type,score:0
-#: field:hr_evaluation.type.value,score:0
-msgid "Score"
-msgstr ""
-
-#. module: hr_evaluation
-#: selection:hr_evaluation.evaluation,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-msgid "Informal Data"
-msgstr ""
-
-#. module: hr_evaluation
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.evaluation,employee_id:0
-msgid "Employee"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-#: field:hr_evaluation.evaluation,info_improve:0
-msgid "To Improve"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.quote,evaluation_id:0
-msgid "Evaluation"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.type.value,type_id:0
-msgid "Evaluation Type"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-msgid "Status"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.type:0
-msgid "Apply to categories"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.module.module,description:hr_evaluation.module_meta_information
-msgid "Ability to create employees evaluation."
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.quote,name:0
-msgid "Quote"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.type,category_ids:0
-msgid "Appliable Role"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.evaluation,user_id:0
-msgid "Evaluation User"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.type:0
-msgid "Choices Results"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.evaluation,date:0
-msgid "Date"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_form
-msgid "Evaluations"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_eval_config
-msgid "Configuration"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_list
-msgid "Next Evaluations"
-msgstr ""
-
-#. module: hr_evaluation
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_evaluation_type_form
-msgid "Evaluation Criterions"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_my_old_evaluation_list
-msgid "My Preceeding Evaluations"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_resp_hr
-msgid "HR Responsible"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.quote,value_id:0
-#: field:hr_evaluation.type.value,name:0
-msgid "Value"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.evaluation,name:0
-msgid "Summary"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.type,active:0
-msgid "Active"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.type:0
-msgid "Notes"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-#: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
-msgid "Employee Evaluation"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type
-msgid "Employee Evaluation Type"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-msgid "Quotations"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.actions.act_window,name:hr_evaluation.open_view_employee_evaluation_next_list
-msgid "Next Employee Evaluation"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.quote,type_id:0
-msgid "Type"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.type:0
-#: field:hr_evaluation.type,name:0
-msgid "Evaluation Criterion"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.ui.menu,name:hr_evaluation.menu_open_view_employee_evaluation_next_my_list
-msgid "My Next Evaluations"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.quote:0
-msgid "Evalution Quote"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.module.module,shortdesc:hr_evaluation.module_meta_information
-msgid "Human Resources Evaluation"
-msgstr ""
-
-#. module: hr_evaluation
-#: field:hr_evaluation.evaluation,quote_ids:0
-msgid "Quotes"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-#: selection:hr_evaluation.evaluation,state:0
-msgid "Done"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.model,name:hr_evaluation.model_hr_evaluation_quote
-msgid "Employee Evaluation Quote"
-msgstr ""
-
-#. module: hr_evaluation
-#: view:hr_evaluation.evaluation:0
-#: field:hr_evaluation.evaluation,info_employee:0
-msgid "Employee Response"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.model,name:hr_evaluation.model_hr_evaluation_type_value
-msgid "Evaluation Type Value"
-msgstr ""
-
diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot
index fc38400aec6..ead89f6bd42 100644
--- a/addons/hr_evaluation/i18n/hr_evaluation.pot
+++ b/addons/hr_evaluation/i18n/hr_evaluation.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:11+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:11+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:36+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:36+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Plan In Progress"
+msgstr ""
+
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
@@ -39,11 +45,6 @@ msgstr ""
 msgid "Progress"
 msgstr ""
 
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,evaluation_id:0
-msgid "Evaluation Type"
-msgstr ""
-
 #. module: hr_evaluation
 #: view:board.board:0
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
@@ -56,7 +57,7 @@ msgid "Legend"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "You cannot start evaluation without Evaluation."
 msgstr ""
@@ -78,7 +79,8 @@ msgid "Appreciation"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#: code:addons/hr_evaluation/hr_evaluation.py:311
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -106,6 +108,11 @@ msgstr ""
 msgid "Day"
 msgstr ""
 
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,evaluation_id:0
+msgid "Evaluation Form"
+msgstr ""
+
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
@@ -176,7 +183,7 @@ msgid "Periodicity of Evaluations (months)"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:242
 #, python-format
 msgid "You cannot change state, because some appraisal in waiting answer or draft state"
 msgstr ""
@@ -192,12 +199,7 @@ msgid "First Evaluation in (months)"
 msgstr ""
 
 #. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
-msgid "Each employee can be assigned to an evaluation plan. These plans define the frequency and the way you manage your periodic personnal evaluation. You will be able to define steps and attach interview forms to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self evaluation and final evaluation by the manager."
-msgstr ""
-
-#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:81
 #, python-format
 msgid "\n"
 "Date: %(date)s\n"
@@ -265,7 +267,7 @@ msgid "(date)s: Current Date"
 msgstr ""
 
 #. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:80
 #, python-format
 msgid "Regarding "
 msgstr ""
@@ -320,9 +322,8 @@ msgid "Send all answers to the manager"
 msgstr ""
 
 #. module: hr_evaluation
-#: selection:hr.evaluation.report,state:0
-#: selection:hr_evaluation.evaluation,state:0
-msgid "Plan In Progress"
+#: view:hr.evaluation.report:0
+msgid "    Month-1    "
 msgstr ""
 
 #. module: hr_evaluation
@@ -337,6 +338,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
 msgid "Print Interview"
 msgstr ""
 
@@ -365,8 +367,8 @@ msgid "Evaluations"
 msgstr ""
 
 #. module: hr_evaluation
-#: view:hr.evaluation.report:0
-msgid "    Month-1    "
+#: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
+msgid "Each employee may be assigned an evaluation plan. Such a plan defines the frequency and the way you manage your periodic personnel evaluation. You will be able to define steps and attach interviews to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager."
 msgstr ""
 
 #. module: hr_evaluation
@@ -444,6 +446,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
 msgid "Interview Question"
 msgstr ""
 
@@ -462,11 +465,6 @@ msgstr ""
 msgid "Check this box if you want to wait that all preceding phases are finished before launching this phase."
 msgstr ""
 
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid "Interview Requests are generated automatically by OpenERP according to employees evaluation plan. Each user receives automatic emails and requests to perform evaluation of their collegues periodically."
-msgstr ""
-
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Evaluation Data"
@@ -520,6 +518,11 @@ msgstr ""
 msgid "Start Evaluation"
 msgstr ""
 
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "To Do"
+msgstr ""
+
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
 msgid "June"
@@ -586,6 +589,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
 msgid "Interview Evaluation"
 msgstr ""
 
@@ -644,6 +648,7 @@ msgstr ""
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
 msgid "Interviewer"
 msgstr ""
 
@@ -702,8 +707,8 @@ msgid "In Progress"
 msgstr ""
 
 #. module: hr_evaluation
-#: view:hr.evaluation.interview:0
-msgid "To Do"
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid "Interview Requests are generated automatically by OpenERP according to an employee's evaluation plan. Each user receives automatic emails and requests to evaluate their colleagues periodically."
 msgstr ""
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/security/hr_evaluation_security.xml b/addons/hr_evaluation/security/hr_evaluation_security.xml
index 49b0e19177b..1520b61b55a 100644
--- a/addons/hr_evaluation/security/hr_evaluation_security.xml
+++ b/addons/hr_evaluation/security/hr_evaluation_security.xml
@@ -19,8 +19,5 @@
     <record id="survey.menu_answer_surveys" model="ir.ui.menu">
         <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
     </record>
-    <record id="survey.menu_run_survey_form" model="ir.ui.menu">
-        <field eval="[(4,ref('base.group_hr_manager'))]" name="groups_id"/>
-    </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index d5eaf33a6ae..9852f359243 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_evaluation_evaluation_user","hr_evaluation.evaluation.user","model_hr_evaluation_evaluation","base.group_hr_user",1,1,1,1
+"access_hr_evaluation_evaluation_employee","hr_evaluation.evaluation.employee","model_hr_evaluation_evaluation","base.group_user",1,0,0,0
 "access_hr_evaluation_plan_user","hr_evaluation.plan.user","model_hr_evaluation_plan","base.group_hr_user",1,1,1,1
 "access_hr_evaluation_plan_phase_user","hr_evaluation.plan.phase.user","model_hr_evaluation_plan_phase","base.group_hr_user",1,1,1,1
 "access_hr_evaluation_interview_user","hr.evaluation.interview.user","model_hr_evaluation_interview","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index 4b64a1bdf19..0493f628ebd 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
+        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
         <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index bc9c1cc36e4..e7fd63eadb4 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -142,7 +142,7 @@ class hr_expense_expense(osv.osv):
                 else:
                     acc = property_obj.get(cr, uid, 'property_account_expense_categ', 'product.category')
                     if not acc:
-                        raise osv.except_osv(_('Error !'), _('Please configure Default Expanse account for Product purchase, `property_account_expense_categ`'))
+                        raise osv.except_osv(_('Error !'), _('Please configure Default Expense account for Product purchase, `property_account_expense_categ`'))
 
                 lines.append((0, False, {
                     'name': l.name,
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 17e0dd09bf9..726ae34b587 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -35,8 +35,8 @@
                     <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"/>
-                    <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                    <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
+                    <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                 </tree>
             </field>
         </record>
@@ -54,8 +54,8 @@
                     <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"/>
-                    <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
+                    <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
+                    <button name="refuse" states="confirm,draft,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                 </tree>
             </field>
         </record>
@@ -101,11 +101,11 @@
                             </field>
                             <field name="state"/>
                             <group col="6" colspan="2">
-                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_manager"/>
-                                <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_manager" />
-                                <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
-                                <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-go-forward" groups="base.group_hr_manager"/>
-                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_manager"/>
+                                <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
+                                <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
+                                <button name="confirm" states="draft" string="Confirm" type="workflow" icon="gtk-apply"/>
+                                <button name="invoice" states="accepted" string="Invoice" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
+                                <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
                             </group>
                         </page>
                         <page string="Other Info" groups="base.group_extended">
diff --git a/addons/hr_expense/hr_expense_workflow.xml b/addons/hr_expense/hr_expense_workflow.xml
index 192533e67de..7946bef3b6b 100644
--- a/addons/hr_expense/hr_expense_workflow.xml
+++ b/addons/hr_expense/hr_expense_workflow.xml
@@ -65,48 +65,56 @@
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_accepted"/>
             <field name="signal">validate</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
         <record id="t4" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_refused"/>
             <field name="signal">refuse</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
         <record id="t6" model="workflow.transition">
             <field name="act_from" ref="act_accepted"/>
             <field name="act_to" ref="act_refused"/>
             <field name="signal">refuse</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
         <record id="t7" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_accepted"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">invoice</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
         <record id="t9" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_paid"/>
             <field name="signal">subflow.paid</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
         <record id="t10" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_refused"/>
             <field name="signal">subflow.cancel</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
 		<record id="t11" model="workflow.transition">
             <field name="act_from" ref="act_refused"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">draft</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
 
     </data>
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index 69ede4821f4..90c697ebea2 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:24+0000\n"
+"PO-Revision-Date: 2010-12-29 09:52+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:38+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
@@ -139,6 +139,24 @@ msgid ""
 "    re-invoice your customer's expenses if your work by project.\n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung verwaltet die Spesenabrechnungen von Mitarbeitern.\n"
+"\n"
+"     Der gesamte Vorgang wird über folgenden Workflow umgesetzt:\n"
+"     * Erstellung einer Spesenabrechnung im Entwurf\n"
+"     * Bestätigung der Spesenabrechnung durch den Mitarbeiter\n"
+"     * Prüfung und Freigabe durch den Vorgesetzten\n"
+"     * Prüfung und Buchung durch einen Mitarbeiter der Buchhaltung\n"
+"     * Auszahlung der Spesenerstattung an den Mitarbeiter\n"
+"\n"
+"     Diese Anwendung ist kompatibel mit der Funktionalität zur  "
+"Mitarbeiterzeitabrechnung\n"
+"     und nutzt somit ebenfalls die Möglichkeit analytischer Konten für eine "
+"Weiterberechnung\n"
+"     an Kunden, z.B. bei projektbezogener Abrechnung von Zeiten und "
+"Aufwendungen.\n"
+"     eine automatische Weiterberechnung an Kunden\n"
+"    "
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -351,7 +369,7 @@ msgstr "Erstattung"
 #: code:addons/hr_expense/hr_expense.py:0
 #, python-format
 msgid "The employee must have a Home address"
-msgstr ""
+msgstr "Der Mitarbeiter muss eine private Anschrift haben."
 
 #. module: hr_expense
 #: view:hr.expense.report:0
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index 29e8ce87c4f..f14710274c5 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 16:24+0000\n"
+"PO-Revision-Date: 2010-12-28 07:22+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_expense
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 3c2980cabdc..576efd84a33 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:11+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:11+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:37+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -221,12 +221,6 @@ msgstr ""
 msgid "Gives the sequence order when displaying a list of expense lines."
 msgstr ""
 
-#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:0
-#, python-format
-msgid "Please configure Default Expanse account for Product purchase, `property_account_expense_categ`"
-msgstr ""
-
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0
 #: view:hr.expense.report:0
@@ -246,6 +240,12 @@ msgstr ""
 msgid "State"
 msgstr ""
 
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:145
+#, python-format
+msgid "Please configure Default Expense account for Product purchase, `property_account_expense_categ`"
+msgstr ""
+
 #. module: hr_expense
 #: report:hr.expense:0
 #: view:hr.expense.expense:0
@@ -261,7 +261,6 @@ msgid "Qty"
 msgstr ""
 
 #. module: hr_expense
-#: report:hr.expense:0
 #: view:hr.expense.report:0
 #: field:hr.expense.report,price_total:0
 msgid "Total Price"
@@ -273,7 +272,8 @@ msgid "Some costs may be reinvoices to the customer"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:0
+#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:158
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -332,7 +332,7 @@ msgid "Reimbursement"
 msgstr ""
 
 #. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:0
+#: code:addons/hr_expense/hr_expense.py:158
 #, python-format
 msgid "The employee must have a Home address"
 msgstr ""
@@ -668,6 +668,11 @@ msgstr ""
 msgid "Quantities"
 msgstr ""
 
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Price"
+msgstr ""
+
 #. module: hr_expense
 #: field:hr.expense.report,no_of_account:0
 msgid "# of Accounts"
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index b12971564b1..eeb9854c059 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -68,10 +68,8 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -113,7 +111,7 @@
   <story>
   <pto>
   <pto_header>
-    <blockTable colWidths="49.0,204.0,45.0,80.0,53.0,91.0" style="Table_hr_expense_line_header">
+    <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_hr_expense_line_header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -122,7 +120,7 @@
           <para style="terp_tblheader_Details">Name</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
+          <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -131,7 +129,7 @@
           <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total Price</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
@@ -176,7 +174,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="49.0,204.0,45.0,80.0,53.0,91.0" style="Table_hr_expense_line_header">
+    <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_hr_expense_line_header">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -185,7 +183,7 @@
           <para style="terp_tblheader_Details">Name</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Ref.</para>
+          <para style="terp_tblheader_Details">Ref.</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Unit Price</para>
@@ -194,7 +192,7 @@
           <para style="terp_tblheader_Details_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Total Price</para>
+          <para style="terp_tblheader_Details_Right">Price</para>
         </td>
       </tr>
     </blockTable>
@@ -203,7 +201,7 @@
     </para>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.line_ids,'line') ]]</para>
-      <blockTable colWidths="49.0,204.0,46.0,79.0,53.0,92.0" style="Table_expense_line">
+      <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_expense_line">
         <tr>
           <td>
             <para style="terp_default_9">[[ formatLang(line.date_value,date=True) ]]</para>
@@ -256,7 +254,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="57.0,171.0,171.0,32.0,92.0" style="Table_Final_total">
+    <blockTable colWidths="365.0,70.0,100.0" style="Table_Final_total">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -264,17 +262,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Total:</para>
+          <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
diff --git a/addons/hr_expense/report/hr_expense_report.py b/addons/hr_expense/report/hr_expense_report.py
index b50e37b654e..df630931875 100644
--- a/addons/hr_expense/report/hr_expense_report.py
+++ b/addons/hr_expense/report/hr_expense_report.py
@@ -21,6 +21,7 @@
 
 import tools
 from osv import fields,osv
+from decimal_precision import decimal_precision as dp
 
 
 class hr_expense_report(osv.osv):
@@ -47,11 +48,11 @@ class hr_expense_report(osv.osv):
         'company_id':fields.many2one('res.company', 'Company', readonly=True),
         'user_id':fields.many2one('res.users', 'Validation User', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
-        'price_total':fields.float('Total Price', readonly=True),
+        'price_total':fields.float('Total Price', readonly=True, digits_compute=dp.get_precision('Account')),
         'delay_valid':fields.float('Delay to Valid', readonly=True),
         'delay_confirm':fields.float('Delay to Confirm', readonly=True),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account',readonly=True),
-        'price_average':fields.float('Average Price', readonly=True),
+        'price_average':fields.float('Average Price', readonly=True, digits_compute=dp.get_precision('Account')),
         'nbr':fields.integer('# of Lines', readonly=True),
         'no_of_products':fields.integer('# of Products', readonly=True),
         'no_of_account':fields.integer('# of Accounts', readonly=True),
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 2b5b9ffb28c..674b06304d2 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -1,6 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_expense_expense_user","hr.expense.expense.user","model_hr_expense_expense","base.group_hr_user",1,1,1,1
+"access_hr_expense_expense_employee","hr.expense.expense.employee","model_hr_expense_expense","base.group_user",1,1,1,1
 "access_hr_expense_line_user","hr.expense.line.user","model_hr_expense_line","base.group_hr_user",1,1,1,1
+"access_hr_expense_line_employee","hr.expense.line.employee","model_hr_expense_line","base.group_user",1,1,1,1
 "access_hr_expense_report_manager","hr.expense.report.manager","model_hr_expense_report","base.group_hr_manager",1,1,1,1
 "access_product_product_hr_expense_user","product.product.hr.expense.user","product.model_product_product","base.group_hr_user",1,1,1,1
 "access_product_template_hr_expense_user","product.template.hr.expense.user","product.model_product_template","base.group_hr_user",1,1,1,1
@@ -17,3 +19,5 @@
 "access_account_move_line_user","account.move.line.user","account.model_account_move_line","base.group_hr_user",1,1,1,1
 "access_account_analytic_line_user","account.ianalytic.line.user","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
 "access_account_journal_period_manager","account.journal.period.manager","account.model_account_journal_period","base.group_hr_manager",1,1,1,1
+"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
+"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index f90607f3cc7..71b4e2a98fb 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_user"/>
+        <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
         <menuitem
             action="hr.open_board_hr"
             icon="terp-graph"
@@ -10,52 +10,16 @@
             parent="base.menu_hr_dasboard"
             sequence="4"/>
 
-      <record model="ir.ui.view" id="view_holiday_allocation_leave_tree">
-            <field name="name">hr.holidays.allocation.leave.tree</field>
-            <field name="model">hr.holidays</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Leaves" >
-                    <field name="name"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                    <field name="holiday_status_id"/>
-                </tree>
-            </field>
-        </record>
-        <record id="action_view_holiday_status_board" model="ir.actions.act_window">
-            <field name="name">My Leaves</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr.holidays</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',('confirm', 'validate')),('user_id','=',uid)]</field>
-            <field name="view_id" ref="view_holiday_allocation_leave_tree"/>
-        </record>
-
-        <record id="board_hr_holidays_form" model="ir.ui.view">
-            <field name="name">board.hr.holidays.form</field>
-            <field name="model">board.board</field>
-            <field name="inherit_id" ref="hr.board_hr_form"/>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <xpath expr="/form/hpaned/child1" position="inside">
-                    <action colspan="4" height="220" name="%(action_view_holiday_status_board)d" string="My Leaves"/>
-                </xpath>
-            </field>
-        </record>
-
             <!-- Need to merge in above view -->
 
-        <record id="action_hr_holidays_leaves_by_month" model="ir.actions.act_window">
-            <field name="name">Leaves by Month</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">available.holidays.report</field>
+        <record model="ir.actions.act_window" id="action_hr_holidays_leaves_by_month">
+            <field name="name">My Leaves</field>
+            <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-            <field name="context">{'group_by':['holiday_status_id'],'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="False"/>
+            <field name="context">{}</field>
+            <field name="domain">[]</field>
         </record>
         <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.leave.month.form</field>
@@ -64,7 +28,7 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/hpaned/child2" position="inside">
-                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves By Month" />
+                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves" />
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_holidays/board_hr_manager_holidays_view.xml b/addons/hr_holidays/board_hr_manager_holidays_view.xml
index eb3af2781f6..980a8dd5fbb 100644
--- a/addons/hr_holidays/board_hr_manager_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_manager_holidays_view.xml
@@ -3,53 +3,33 @@
     <data>
 
         <record id="action_view_holiday_status_manager_board" model="ir.actions.act_window">
-            <field name="name">All Employee Leaves</field>
+            <field name="name">Leaves To Validate</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',('confirm', 'validate'))]</field>
+            <field name="domain">[('state','in',('confirm', 'validate', 'validate1'))]</field>
             <field name="view_id" ref="hr_holidays.view_holiday_allocation_tree"/>
         </record>
-        
-		<record id="action_hr_holidays_remaining_leaves_empoloyee_all" model="ir.actions.act_window">
-	        <field name="name">Remaining Leaves by User</field>
-	        <field name="type">ir.actions.act_window</field>
-	        <field name="res_model">hr.holidays.remaining.leaves.user</field>
-	        <field name="view_type">form</field>
-	        <field name="view_mode">graph,tree</field>
-	        <field name="view_id" ref="hr_holidays.view_hr_holidays_remaining_leaves_user_graph"/>
-		</record>
 
         <record id="board_hr_holidays_manager_form" model="ir.ui.view">
             <field name="name">board.hr.holidays.manager.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="hr.board_hr_manager_form"/>              
+            <field name="inherit_id" ref="hr.board_hr_manager_form"/>              
             <field name="type">form</field>
             <field name="arch" type="xml">
-	      		<xpath expr="/form/hpaned/child1" position="inside"> 
-					<action colspan="4" height="220" name="%(action_view_holiday_status_manager_board)d" string="All Employee Leaves"/>
-				</xpath>
-            </field>
-        </record>
-        
-		<record id="board_hr_holidays_manager_remaining_form" model="ir.ui.view">
-            <field name="name">board.hr.holidays.manager.remaining.form</field>
-            <field name="model">board.board</field>
- 			<field name="type">form</field>            
-			<field name="inherit_id" ref="hr.board_hr_manager_form"/>           
-            <field name="arch" type="xml">
-	      		<xpath expr="/form/hpaned/child2" position="inside">            
-				 <action colspan="4" height="220" name="%(action_hr_holidays_remaining_leaves_empoloyee_all)d" string="Remaining Leave by Type and User" />
-				</xpath>  
+                  <xpath expr="/form/hpaned/child1" position="inside"> 
+                    <action colspan="4" height="220" name="%(action_view_holiday_status_manager_board)d" string="All Employee Leaves"/>
+                </xpath>
             </field>
         </record>
+
         <menuitem
             action="hr.open_board_hr_manager"
             icon="terp-graph"
             id="base.menu_hr_manager"
             parent="base.menu_hr_dasboard"
             groups = "base.group_hr_manager"
-            sequence="5"/>        
+            sequence="5"/> 
     </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 8fe5da805b4..9d6328af1eb 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -21,7 +21,6 @@
 #
 ##############################################################################
 
-import time
 import datetime
 from itertools import groupby
 from operator import itemgetter
@@ -35,37 +34,11 @@ class hr_holidays_status(osv.osv):
     _name = "hr.holidays.status"
     _description = "Leave Type"
 
-    def get_days_cat(self, cr, uid, ids, category_id, return_false, context=None):
-
-        cr.execute("""SELECT id, type, number_of_days, holiday_status_id FROM hr_holidays WHERE category_id = %s AND state='validate' AND holiday_status_id in %s""",
-            [category_id, tuple(ids)])
-        result = sorted(cr.dictfetchall(), key=lambda x: x['holiday_status_id'])
-
-        grouped_lines = dict((k, [v for v in itr]) for k, itr in groupby(result, itemgetter('holiday_status_id')))
-
-        res = {}
-        for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = {}
-            max_leaves = leaves_taken = 0
-            if not return_false:
-                if record.id in grouped_lines:
-                    leaves_taken = -sum([item['number_of_days'] for item in grouped_lines[record.id] if item['type'] == 'remove'])
-                    max_leaves = sum([item['number_of_days'] for item in grouped_lines[record.id] if item['type'] == 'add'])
-
-            res[record.id]['max_leaves'] = max_leaves
-            res[record.id]['leaves_taken'] = leaves_taken
-            res[record.id]['remaining_leaves'] = max_leaves - leaves_taken
-
-        return res
-
     def get_days(self, cr, uid, ids, employee_id, return_false, context=None):
-
         cr.execute("""SELECT id, type, number_of_days, holiday_status_id FROM hr_holidays WHERE employee_id = %s AND state='validate' AND holiday_status_id in %s""",
             [employee_id, tuple(ids)])
         result = sorted(cr.dictfetchall(), key=lambda x: x['holiday_status_id'])
-
         grouped_lines = dict((k, [v for v in itr]) for k, itr in groupby(result, itemgetter('holiday_status_id')))
-
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             res[record.id] = {}
@@ -74,18 +47,15 @@ class hr_holidays_status(osv.osv):
                 if record.id in grouped_lines:
                     leaves_taken = -sum([item['number_of_days'] for item in grouped_lines[record.id] if item['type'] == 'remove'])
                     max_leaves = sum([item['number_of_days'] for item in grouped_lines[record.id] if item['type'] == 'add'])
-
             res[record.id]['max_leaves'] = max_leaves
             res[record.id]['leaves_taken'] = leaves_taken
             res[record.id]['remaining_leaves'] = max_leaves - leaves_taken
-
         return res
 
     def _user_left_days(self, cr, uid, ids, name, args, context=None):
         return_false = False
         employee_id = False
         res = {}
-
         if context and context.has_key('employee_id'):
             if not context['employee_id']:
                 return_false = True
@@ -102,14 +72,13 @@ class hr_holidays_status(osv.osv):
             res = dict.fromkeys(ids, {'leaves_taken': 0, 'remaining_leaves': 0, 'max_leaves': 0})
         return res
 
-    # To do: we can add remaining_leaves_category field to display remaining leaves for particular type
     _columns = {
         'name': fields.char('Leave Type', size=64, required=True, translate=True),
-        'categ_id': fields.many2one('crm.case.categ', 'Meeting Category', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example.'),
+        'categ_id': fields.many2one('crm.case.categ', 'Meeting', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated.'),
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'),
         'limit': fields.boolean('Allow to Override Limit', help='If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
-        'max_leaves': fields.function(_user_left_days, method=True, string='Maximum Leaves Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
+        'max_leaves': fields.function(_user_left_days, method=True, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
         'leaves_taken': fields.function(_user_left_days, method=True, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
         'remaining_leaves': fields.function(_user_left_days, method=True, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
         'double_validation': fields.boolean('Apply Double Validation', help="If its True then its Allocation/Request have to be validated by second validator")
@@ -118,7 +87,6 @@ class hr_holidays_status(osv.osv):
         'color_name': 'red',
         'active': True,
     }
-
 hr_holidays_status()
 
 class hr_holidays(osv.osv):
@@ -132,12 +100,23 @@ class hr_holidays(osv.osv):
             return ids[0]
         return False
 
+    def _compute_number_of_days(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        for hol in self.browse(cr, uid, ids, context=context):
+            if hol.type=='remove':
+                result[hol.id] = -hol.number_of_days_temp
+            else:
+                result[hol.id] = hol.number_of_days_temp
+        return result
+
     _columns = {
         'name': fields.char('Description', required=True, size=64),
-        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'), ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')], 'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Approval\'.\
+        'state': fields.selection([('draft', 'Draft'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'), 
+            ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')],
+            'State', readonly=True, help='When the holiday request is created the state is \'Draft\'.\n It is confirmed by the user and request is sent to admin, the state is \'Waiting Approval\'.\
             If the admin accepts it, the state is \'Approved\'. If it is refused, the state is \'Refused\'.'),
+        'user_id':fields.related('employee_id', 'user_id', type='many2one', relation='res.users', string='User', store=True),
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)]}),
-        'user_id':fields.many2one('res.users', 'User', states={'draft':[('readonly',False)]}, select=True, readonly=True),
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
@@ -145,27 +124,29 @@ class hr_holidays(osv.osv):
         #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automaticly filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)]}),
-        'number_of_days': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)]}),
-        'case_id': fields.many2one('crm.meeting', 'Case'),
+        'number_of_days': fields.function(_compute_number_of_days, method=True, string='Number of Days', store=True),
+        'case_id': fields.many2one('crm.meeting', 'Meeting'),
         'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone"),
-        'allocation_type': fields.selection([('employee','Employee Request'),('company','Company Allocation')], 'Allocation Type', required=True, readonly=True, states={'draft':[('readonly',False)]}, help='This field is only for informative purposes, to depict if the leave request/allocation comes from an employee or from the company'),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
-        'category_id': fields.many2one('hr.employee.category', "Category", help='Category Of employee'),
+        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
         'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)')
     }
-
     _defaults = {
         'employee_id': _employee_get,
         'state': 'draft',
         'type': 'remove',
-        'allocation_type': 'employee',
         'user_id': lambda obj, cr, uid, context: uid,
         'holiday_type': 'employee'
     }
+    _sql_constraints = [
+        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "You have to select an employee or a category"),
+        ('date_check', "CHECK ( number_of_days_temp > 0 )", "The number of days must be greater than 0 !"),
+        ('date_check2', "CHECK ( (type='add') OR (date_from < date_to))", "The start date must be before the end date !")
+    ]
 
     def _create_resource_leave(self, cr, uid, vals, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
@@ -178,28 +159,6 @@ class hr_holidays(osv.osv):
         leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)], context=context)
         return obj_res_leave.unlink(cr, uid, leave_ids)
 
-    def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
-        if 'holiday_type' in vals:
-            if vals['holiday_type'] == 'employee':
-                vals.update({'category_id': False})
-            else:
-                vals.update({'employee_id': False})
-        if context.has_key('type'):
-            vals['type'] = context['type']
-        if context.has_key('allocation_type'):
-            vals['allocation_type'] = context['allocation_type']
-        return super(hr_holidays, self).create(cr, uid, vals, context=context)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        if 'holiday_type' in vals:
-            if vals['holiday_type'] == 'employee':
-                vals.update({'category_id': False})
-            else:
-                vals.update({'employee_id': False})
-        return super(hr_holidays, self).write(cr, uid, ids, vals, context=context)
-
     def onchange_type(self, cr, uid, ids, holiday_type):
         result = {}
         if holiday_type == 'employee':
@@ -207,9 +166,10 @@ class hr_holidays(osv.osv):
             if ids_employee:
                 result['value'] = {
                     'employee_id': ids_employee[0]
-                    }
+                }
         return result
 
+    # TODO: can be improved using resource calendar method
     def _get_number_of_days(self, date_from, date_to):
         """Returns a float equals to the timedelta between two dates given as string."""
 
@@ -220,35 +180,10 @@ class hr_holidays(osv.osv):
         diff_day = timedelta.days + float(timedelta.seconds) / 86400
         return diff_day
 
-    def _update_user_holidays(self, cr, uid, ids):
-        obj_crm_meeting = self.pool.get('crm.meeting')
-        for record in self.browse(cr, uid, ids):
-            if record.state=='validate':
-                if record.case_id:
-                    obj_crm_meeting.unlink(cr, uid, [record.case_id.id])
-                if record.linked_request_ids:
-                    list_ids = [ lr.id for lr in record.linked_request_ids]
-                    self.holidays_cancel(cr, uid, list_ids)
-                    self.unlink(cr, uid, list_ids)
-        return True
-
-    def _check_date(self, cr, uid, ids, context=None):
-        for rec in self.read(cr, uid, ids, ['number_of_days_temp', 'date_from','date_to', 'type']):
-            if rec['number_of_days_temp'] < 0:
-                return False
-            if rec['type'] == 'add':
-                continue
-            date_from = time.strptime(rec['date_from'], '%Y-%m-%d %H:%M:%S')
-            date_to = time.strptime(rec['date_to'], '%Y-%m-%d %H:%M:%S')
-            if date_from > date_to:
-                return False
-        return True
-
-    _constraints = [(_check_date, 'Start date should not be larger than end date!\nNumber of Days should be greater than 1!', ['number_of_days_temp'])]
-
     def unlink(self, cr, uid, ids, context=None):
-        self._update_user_holidays(cr, uid, ids)
-        self._remove_resouce_leave(cr, uid, ids, context=context)
+        for rec in self.browse(cr, uid, ids, context=context):
+            if rec.state<>'draft':
+                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft state !'))
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
     def onchange_date_from(self, cr, uid, ids, date_to, date_from):
@@ -264,209 +199,115 @@ class hr_holidays(osv.osv):
         }
         return result
 
-    def onchange_date_to(self, cr, uid, ids, date_from, date_to):
-        return self.onchange_date_from(cr, uid, ids, date_to, date_from)
-
     def onchange_sec_id(self, cr, uid, ids, status, context=None):
         warning = {}
         if status:
-            brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status], context=context)[0]
+            brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, status, context=context)
             if brows_obj.categ_id and brows_obj.categ_id.section_id and not brows_obj.categ_id.section_id.allow_unlink:
                 warning = {
                     'title': "Warning for ",
                     'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows."
-                        }
+                }
         return {'warning': warning}
 
     def set_to_draft(self, cr, uid, ids, *args):
-        wf_service = netsvc.LocalService("workflow")
         self.write(cr, uid, ids, {
             'state': 'draft',
             'manager_id': False,
-            'number_of_days': 0,
         })
+        wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_create(uid, 'hr.holidays', id, cr)
         return True
 
-    def holidays_validate2(self, cr, uid, ids, *args):
-        obj_emp = self.pool.get('hr.employee')
-        wf_service = netsvc.LocalService("workflow")
-        vals = {'state':'validate1'}
-        self.check_holidays(cr, uid, ids)
-        ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
-        if ids2:
-            vals['manager_id'] = ids2[0]
-        else:
-            raise osv.except_osv(_('Warning !'),_('No user related to the selected employee.'))
-        # Second Time Validate all the leave requests of the category
-        for leave_id in self._get_category_leave_ids(cr, uid, ids):
-            wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
-        return self.write(cr, uid, ids, vals)
-
     def holidays_validate(self, cr, uid, ids, *args):
-        obj_emp = self.pool.get('hr.employee')
-        wf_service = netsvc.LocalService("workflow")
-        data_holiday = self.browse(cr, uid, ids)
         self.check_holidays(cr, uid, ids)
-        vals = {'state':'validate'}
+        obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
-        if ids2:
-            if data_holiday[0].state == 'validate1':
-                vals['manager_id2'] = ids2[0]
-            else:
-                vals['manager_id'] = ids2[0]
-        else:
-            raise osv.except_osv(_('Warning !'), _('No user related to the selected employee.'))
-        self.write(cr, uid, ids, vals)
+        manager = ids2 and ids2[0] or False
+        return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
+
+    def holidays_validate2(self, cr, uid, ids, *args):
+        self.check_holidays(cr, uid, ids)
+        obj_emp = self.pool.get('hr.employee')
+        ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
+        manager = ids2 and ids2[0] or False
+        self.write(cr, uid, ids, {'state':'validate', 'manager_id2': manager})
+        data_holiday = self.browse(cr, uid, ids)
         for record in data_holiday:
             if record.holiday_type == 'employee' and record.type == 'remove':
-                vals = {
-                   'name': record.name,
-                   'date_from': record.date_from,
-                   'date_to': record.date_to,
-                   'calendar_id': record.employee_id.calendar_id.id,
-                   'company_id': record.employee_id.company_id.id,
-                   'resource_id': record.employee_id.resource_id.id,
-                   'holiday_id': record.id
-                     }
-                self._create_resource_leave(cr, uid, vals)
-            elif record.holiday_type == 'category':
-                # Create leave/allocation request for employees in the category
-                emp_ids = obj_emp.search(cr, uid, [('category_ids', '=', record.category_id.id)])
-                leave_ids = []
-                for emp in obj_emp.browse(cr, uid, emp_ids):
-                    vals = {
-                    'name': record.name,
-                    'type': record.type,
-                    'holiday_type': 'employee',
-                    'holiday_status_id': record.holiday_status_id.id,
-                    'date_from': record.date_from,
-                    'date_to': record.date_to,
-                    'notes': record.notes,
-                    'number_of_days_temp': record.number_of_days_temp,
-                    'parent_id': record.id,
-                    'employee_id': emp.id
-                    }
-                    leave_ids.append(self.create(cr, uid, vals, context=None))
-                    # Confirm and validate all the leave requests of the category
-                    for leave_id in leave_ids:
-                        wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
-                        wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
-        return True
-
-    def holidays_confirm(self, cr, uid, ids, *args):
-        obj_hr_holiday_status = self.pool.get('hr.holidays.status')
-        for record in self.browse(cr, uid, ids):
-            user_id = False
-            leave_asked = record.number_of_days_temp
-            if record.holiday_type == 'employee' and record.type == 'remove':
-                if record.employee_id and not record.holiday_status_id.limit:
-                    leaves_rest = obj_hr_holiday_status.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
-                    if leaves_rest < leave_asked:
-                        raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for employee %s while there are too few remaining leave days.') % (record.employee_id.name))
-                nb = -(record.number_of_days_temp)
-            elif record.holiday_type == 'category' and record.type == 'remove':
-                if record.category_id and not record.holiday_status_id.limit:
-                    leaves_rest = obj_hr_holiday_status.get_days_cat( cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
-                    if leaves_rest < leave_asked:
-                        raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for category %s while there are too few remaining leave days.') % (record.category_id.name))
-                nb = -(record.number_of_days_temp)
-            else:
-                nb = record.number_of_days_temp
-
-            if record.holiday_type == 'employee' and record.employee_id:
-                user_id = record.employee_id.user_id and record.employee_id.user_id.id or uid
-
-            self.write(cr, uid, [record.id], {'state':'confirm', 'number_of_days': nb, 'user_id': user_id})
-        return True
-
-    def holidays_refuse(self, cr, uid, ids, *args):
-        obj_emp = self.pool.get('hr.employee')
-        wf_service = netsvc.LocalService("workflow")
-        vals = {'state': 'refuse'}
-        ids2 = obj_emp.search(cr, uid, [('user_id','=', uid)])
-        if ids2:
-            vals['manager_id'] = ids2[0]
-        # Refuse all the leave requests of the category
-        for leave_id in self._get_category_leave_ids(cr, uid, ids):
-            wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'refuse', cr)
-        self.write(cr, uid, ids, vals)
-        return True
-
-    def holidays_cancel(self, cr, uid, ids, *args):
-        self._update_user_holidays(cr, uid, ids)
-        self.write(cr, uid, ids, {'state': 'cancel'})
-        self._remove_resouce_leave(cr, uid, ids)
-        return True
-
-    def holidays_draft(self, cr, uid, ids, *args):
-        wf_service = netsvc.LocalService("workflow")
-        for leave_id in self._get_category_leave_ids(cr, uid, ids):
-            wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'draft', cr)
-        return self.write(cr, uid, ids, {'state': 'draft'})
-
-    def check_holidays(self, cr, uid, ids):
-        holi_status_obj = self.pool.get('hr.holidays.status')
-        emp_obj = self.pool.get('hr.employee')
-        meeting_obj = self.pool.get('crm.meeting')
-        for record in self.browse(cr, uid, ids):
-            if not record.number_of_days:
-                raise osv.except_osv(_('Warning!'), _('Wrong leave definition.'))
-            if record.holiday_type=='employee' and record.employee_id:
-                leave_asked = record.number_of_days
-                if leave_asked < 0.00:
-                    if not record.holiday_status_id.limit:
-                        leaves_rest = holi_status_obj.get_days(cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
-                        if leaves_rest < -(leave_asked):
-                            raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
-            elif record.holiday_type == 'category' and record.category_id:
-                leave_asked = record.number_of_days
-                if leave_asked < 0.00:
-                    if not record.holiday_status_id.limit:
-                        leaves_rest = holi_status_obj.get_days_cat(cr, uid, [record.holiday_status_id.id], record.category_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
-                        if leaves_rest < -(leave_asked):
-                            raise osv.except_osv(_('Warning!'),_('You Cannot Validate leaves while available leaves are less than asked leaves.'))
-            else:# This condition will never meet!!
-                holiday_ids = []
-                vals = {
-                    'name': record.name,
-                    'holiday_status_id': record.holiday_status_id.id,
-                    'state': 'draft',
-                    'date_from': record.date_from,
-                    'date_to': record.date_to,
-                    'notes': record.notes,
-                    'number_of_days': record.number_of_days,
-                    'number_of_days_temp': record.number_of_days_temp,
-                    'type': record.type,
-                    'allocation_type': record.allocation_type,
-                    'parent_id': record.id,
-                }
-                employee_ids = emp_obj.search(cr, uid, [])
-                for employee in employee_ids:
-                    vals['employee_id'] = employee
-                    user_id = emp_obj.search(cr, uid, [('user_id','=',uid)])
-                    if user_id:
-                        vals['user_id'] = user_id[0]
-                    holiday_ids.append(self.create(cr, uid, vals, context=None))
-                self.holidays_confirm(cr, uid, holiday_ids)
-                self.holidays_validate(cr, uid, holiday_ids)
-
-            if record.holiday_status_id.categ_id and record.date_from and record.date_to and record.employee_id:
-                diff_day = self._get_number_of_days(record.date_from, record.date_to)
+                meeting_obj = self.pool.get('crm.meeting')
                 vals = {
                     'name': record.name,
                     'categ_id': record.holiday_status_id.categ_id.id,
-                    'duration': (diff_day) * 8,
+                    'duration': record.number_of_days_temp * 8,
                     'note': record.notes,
                     'user_id': record.user_id.id,
                     'date': record.date_from,
+                    'end_date': record.date_to,
+                    'date_deadline': record.date_to,
                 }
                 case_id = meeting_obj.create(cr, uid, vals)
                 self.write(cr, uid, ids, {'case_id': case_id})
+            elif record.holiday_type == 'category':
+                emp_ids = obj_emp.search(cr, uid, [('category_ids', 'child_of', [record.category_id.id])])
+                leave_ids = []
+                for emp in obj_emp.browse(cr, uid, emp_ids):
+                    vals = {
+                        'name': record.name,
+                        'type': record.type,
+                        'holiday_type': 'employee',
+                        'holiday_status_id': record.holiday_status_id.id,
+                        'date_from': record.date_from,
+                        'date_to': record.date_to,
+                        'notes': record.notes,
+                        'number_of_days_temp': record.number_of_days_temp,
+                        'parent_id': record.id,
+                        'employee_id': emp.id
+                    }
+                    leave_ids.append(self.create(cr, uid, vals, context=None))
+                wf_service = netsvc.LocalService("workflow")
+                for leave_id in leave_ids:
+                    wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
+                    wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
+                    wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
+        return True
+
+    def holidays_confirm(self, cr, uid, ids, *args):
+        self.check_holidays(cr, uid, ids)
+        return self.write(cr, uid, ids, {'state':'confirm'})
+
+    def holidays_refuse(self, cr, uid, ids, *args):
+        obj_emp = self.pool.get('hr.employee')
+        ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
+        manager = ids2 and ids2[0] or False
+        self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
+        self.holidays_cancel(cr, uid, ids)
+        return True
+
+    def holidays_cancel(self, cr, uid, ids, *args):
+        obj_crm_meeting = self.pool.get('crm.meeting')
+        for record in self.browse(cr, uid, ids):
+            # Delete the meeting
+            if record.case_id:
+                obj_crm_meeting.unlink(cr, uid, [record.case_id.id])
+
+            # If a category that created several holidays, cancel all related
+            wf_service = netsvc.LocalService("workflow")
+            for id in record.linked_request_ids or []:
+                wf_service.trg_validate(uid, 'hr.holidays', id, 'cancel', cr)
 
         return True
 
+    def check_holidays(self, cr, uid, ids):
+        holi_status_obj = self.pool.get('hr.holidays.status')
+        for record in self.browse(cr, uid, ids):
+            if record.holiday_type == 'employee' and record.type == 'remove':
+                if record.employee_id and not record.holiday_status_id.limit:
+                    leaves_rest = holi_status_obj.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
+                    if leaves_rest < record.number_of_days_temp:
+                        raise osv.except_osv(_('Warning!'),_('You cannot validate leaves for employee %s: too few remaining days (%s).') % (record.employee_id.name, leaves_rest))
+        return True
 hr_holidays()
 
 class resource_calendar_leaves(osv.osv):
@@ -478,4 +319,3 @@ class resource_calendar_leaves(osv.osv):
 
 resource_calendar_leaves()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 398a614d951..adbc670c64e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -56,7 +56,7 @@
             <field name="type">calendar</field>
             <field name="arch" type="xml">
                 <calendar string="Leave Request" color="name" date_start="date_from" date_stop="date_to">
-                	<field name="holiday_status_id"/>
+                    <field name="holiday_status_id"/>
                 </calendar>
             </field>
         </record>
@@ -70,8 +70,8 @@
                 <form string="Leave Request">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager"/>
-                        <group attrs="{'invisible':[('holiday_type','=','employee')]}">
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager" string="Leave Type"/>
+                    <group attrs="{'invisible':[('holiday_type','=','employee')]}">
                         <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
@@ -83,7 +83,7 @@
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}" />
                             <field name="department_id"/>
                             <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                            <field name="date_to" on_change="onchange_date_to(date_from, date_to)" required="1"/>
+                            <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                             <field name="number_of_days_temp"/>
                             <newline/>
                             <field name="manager_id"/>
@@ -93,12 +93,11 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2" col="6">
-                                <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
-                                <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
-                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                                <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
+                                <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                                <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                                <button string="Set to Draft" name="set_to_draft" states="refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                             </group>
                         </page>
                     </notebook>
@@ -115,7 +114,7 @@
             <form string="Allocation Request">
                 <group col="8" colspan="4">
                     <field name="name" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type" groups="base.group_extended"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type" groups="base.group_hr_manager"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>
@@ -136,12 +135,11 @@
                         <newline/>
                         <field name="state" colspan="2"/>
                         <group colspan="2" col="6">
-                            <button string="Cancel" name="cancel" states="validate,refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
-                            <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
-                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
+                            <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
+                            <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                            <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                            <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                            <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
                         </group>
                     </page>
                 </notebook>
@@ -154,7 +152,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel') " string="Leaves" >
+                <tree colors="red:state in ('refuse');blue:state in ('draft');black:state in ('confirm','validate','validate1')" string="Leaves" >
                     <field name="employee_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="holiday_status_id"/>
@@ -164,8 +162,8 @@
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
                     <field name="state"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -181,7 +179,7 @@
                     <field name="holiday_status_id" />
                     <field name="type"/>
                     <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
-                    <field name="date_to" on_change="onchange_date_to(date_from, date_to)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
+                    <field name="date_to" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
                     <field name="number_of_days_temp"/>
                     <notebook colspan="4">
                         <page string="General">
@@ -190,10 +188,9 @@
                             <newline/>
                             <field name="state" colspan="2"/>
                             <group colspan="2">
-                                <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel"/>
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                                 <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
-                                <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no"/>
+                                <button string="Refuse" name="refuse" states="confirm,validate,draft" type="workflow" icon="gtk-no"/>
                                 <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert"/>
                             </group>
                         </page>
@@ -203,12 +200,12 @@
         </record>
 
         <record model="ir.ui.view" id="view_holiday_simple">
-            <field name="name">hr.holidays.reprot_tree</field>
+            <field name="name">hr.holidays.report_tree</field>
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')" string="Leaves Summary">
+                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')" string="Leaves Summary">
                     <field name="employee_id"/>
                     <field name="department_id" invisible="1"/>
                     <field name="type"/>
@@ -220,11 +217,9 @@
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="state"/>
-                    <button string="Cancel" name="cancel" states="validate,refuse,validate1" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes" groups="base.group_hr_user,base.group_hr_manager"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                    <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_manager"/>
-                    <button string="Set to Draft" name="set_to_draft" states="cancel" type="object" icon="gtk-convert" groups="base.group_hr_manager"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
                 </tree>
             </field>
         </record>
@@ -235,7 +230,7 @@
             <field name="model">hr.holidays</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1');gray:state in ('cancel')">
+                <tree colors="red:state in ('refuse');blue:state in (' draft');black:state in ('confirm','validate','validate1')">
                     <field name="employee_id"/>
                     <field name="department_id" invisible="not context.get('set_visible',False)"/>
                     <field name="holiday_status_id"/>
@@ -247,8 +242,8 @@
                     <field name="user_id" invisible="1"/>
                     <!--field name="type"/-->
                     <field name="state"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_manager"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user,base.group_hr_manager"/>
                 </tree>
             </field>
         </record>
@@ -299,7 +294,7 @@
             <field name="name">Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="context">{"search_default_my_leaves": 1,'type':'add',"search_default_department_id": department_id}</field>
+            <field name="context">{"search_default_my_leaves": 1,'default_type':'add',"search_default_department_id": department_id}</field>
             <field name="domain">[('type','=','add')]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
@@ -328,6 +323,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" eval="view_holiday_simple"/>
             <field name="context">{'search_default_my_leaves': 1, 'search_default_group_type': 1}</field>
+            <field name="domain">[('holiday_type','=','employee')]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
@@ -347,10 +343,6 @@
                 <search string="Search Leave Type">
                     <field name="name"/>
                     <field name="categ_id" widget="selection"/>
-                    <newline/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Meeting Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
-                    </group>
                 </search>
             </field>
         </record>
@@ -366,22 +358,19 @@
                         <field name="color_name"/>
                         <field name="categ_id" widget="selection" groups="base.group_extended"/>
                     </group>
-					<notebook colspan="4">
-					  <page string="Details">
-						<group name="selection" col="4" colspan="4">
-							<group colspan="2">
-							<separator string="Validation" />
-								<newline/>
-							<field name="active" />
-								<newline/>
-							<field name="double_validation"/>
-								<newline/>
-							<field name="limit"/>
-							</group>
-							<group name="second" colspan="2"/>
-						</group>
-					  </page>
-					</notebook>
+                    <notebook colspan="4">
+                      <page string="Details">
+                          <group colspan="2" col="2" name="selection">
+                              <separator string="Validation" colspan="2"/>
+                              <field name="double_validation"/>
+                              <field name="limit"/>
+                          </group>
+                          <group name="second" colspan="2" col="2">
+                              <separator string="Misc" colspan="2"/>
+                              <field name="active" />
+                          </group>
+                      </page>
+                    </notebook>
                 </form>
             </field>
         </record>
@@ -393,21 +382,22 @@
             <field name="arch" type="xml">
                 <tree string="Leave Type">
                     <field name="name"/>
+                    <field name="max_leaves"/>
+                    <field name="leaves_taken"/>
                     <field name="remaining_leaves"/>
                     <field name="limit" />
-                     <field name="categ_id" invisible="1"/>
                 </tree>
             </field>
         </record>
 
-		<record id="view_hr_holidays_status_search" model="ir.ui.view">
+        <record id="view_hr_holidays_status_search" model="ir.ui.view">
             <field name="name">hr.holidays.status.search</field>
             <field name="model">hr.holidays.status</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Leave Type">
-                        <field name="name"/>
-                        <field name="categ_id" widget="selection"/>
+                    <field name="name"/>
+                    <field name="categ_id" widget="selection"/>
                 </search>
             </field>
         </record>
@@ -422,7 +412,8 @@
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_hr_manager"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays"/>
+        
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
@@ -447,7 +438,7 @@
             context="{'search_default_employee_id': [active_id]}"
             res_model="hr.holidays"
             src_model="hr.employee"
-            view_id ="edit_holiday_new"
+            view_id ="view_holiday"
             id="act_hr_employee_holiday_request"/>
 
     </data>
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
index 0057f5a3f9b..01aff603626 100644
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ b/addons/hr_holidays/hr_holidays_wizard.xml
@@ -11,7 +11,6 @@
             id="menu_hr_reporting_holidays"
             name="Holidays"
             parent="hr.menu_hr_reporting"
-            sequence="6"
-            groups="base.group_hr_manager" />
+            sequence="6"/>
  	</data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 9d5338a801f..888b3dd629d 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -43,17 +43,9 @@
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">refuse</field>
         <field name="kind">function</field>
-        <field name="action">holidays_refuse()</field>
-
-    </record>
-
-    <record model="workflow.activity" id="act_cancel">
-        <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">cancel</field>
         <field name="flow_stop">True</field>
         <field name="kind">stopall</field>
-        <field name="action">holidays_cancel()</field>
-        <field name="join_mode">XOR</field>
+        <field name="action">holidays_refuse()</field>
     </record>
 
     <!--
@@ -70,50 +62,44 @@
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_validate" />
         <field name="signal">validate</field>
-        <field name="condition">(holiday_status_id.double_validation == False)</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
     <record model="workflow.transition" id="t3">
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_refuse" />
         <field name="signal">refuse</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
     <record model="workflow.transition" id="t4">
         <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_cancel" />
-        <field name="signal">cancel</field>
-    </record>
-
-    <record model="workflow.transition" id="t5">
-        <field name="act_from" ref="act_refuse" />
-        <field name="act_to" ref="act_cancel" />
-        <field name="signal">cancel</field>
-    </record>
-
-    <record model="workflow.transition" id="t7">
-        <field name="act_from" ref="act_cancel" />
-        <field name="act_to" ref="act_draft" />
-        <field name="signal">set_to_draft</field>
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
     <record model="workflow.transition" id="t8">
-        <field name="act_from" ref="act_validate1" />
-        <field name="act_to" ref="act_validate" />
+        <field name="act_from" ref="act_validate" />
+        <field name="act_to" ref="act_validate1" />
+        <field name="group_id" ref="base.group_hr_user"/>
         <field name="signal">second_validate</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
     <record model="workflow.transition" id="t10">
         <field name="act_from" ref="act_validate1" />
         <field name="act_to" ref="act_refuse" />
         <field name="signal">refuse</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
     <record model="workflow.transition" id="t11">
-        <field name="act_from" ref="act_confirm" />
+        <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_validate1" />
-        <field name="condition">(holiday_status_id.double_validation == True)</field>
-        <field name="signal">validate</field>
+        <field name="condition">not holiday_status_id.double_validation</field>
+        <field name="signal" eval="False"/>
     </record>
 
 </data>
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index 1585f4c044f..8e8fe4bbeca 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:05+0000\n"
+"PO-Revision-Date: 2010-12-29 11:04+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -214,6 +214,9 @@ msgid ""
 "You cannot validate leaves for category %s while there are too few remaining "
 "leave days."
 msgstr ""
+"Sie können die Abwesenheitstage für die Kategorie %s nicht prüfen und "
+"freigeben, wenn nicht ausreichend verfügbare Abwesenheitstage hinterlegt "
+"wurden."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -448,6 +451,7 @@ msgstr "Weiss"
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Fehler ! Das Start Datum für die Abwesenheit muss vor dem Ende Datum liegen !"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -489,7 +493,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Monat -1    "
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -518,6 +522,8 @@ msgid ""
 "You cannot validate leaves for employee %s while there are too few remaining "
 "leave days."
 msgstr ""
+"Sie können die Abwesenheitstage für den Mitarbeiter %s nicht freigeben, da "
+"seine verfügbaren Tage nicht ausreichen."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index cabd8244022..ea54cd49d71 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:12+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:12+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:37+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,6 @@ msgstr ""
 
 #. module: hr_holidays
 #: view:hr.holidays:0
-#: field:hr.holidays,allocation_type:0
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
 msgstr ""
@@ -32,12 +31,6 @@ msgstr ""
 msgid "Waiting Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,taken_leaves:0
-msgid "Taken Leaves"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
@@ -49,9 +42,7 @@ msgid "Leaves Management"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
-#: view:hr.holidays.status:0
 msgid "Group By..."
 msgstr ""
 
@@ -61,27 +52,19 @@ msgid "Sick Leave"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,department_id:0
 #: view:hr.holidays:0
 #: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,state:0
 #: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
-msgid "Category Of employee"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,allocation_type:0
-msgid "Company Allocation"
+msgid "Category of Employee"
 msgstr ""
 
 #. module: hr_holidays
@@ -94,11 +77,6 @@ msgstr ""
 msgid "Remaining Days"
 msgstr ""
 
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "March"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
@@ -121,11 +99,6 @@ msgstr ""
 msgid "Holidays"
 msgstr ""
 
-#. module: hr_holidays
-#: field:available.holidays.report,category_id:0
-msgid "Category's Name"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Cyan"
@@ -136,6 +109,11 @@ msgstr ""
 msgid "Light Green"
 msgstr ""
 
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid "Leave requests can be recorded by employees and validated by their managers. Once a leave request is validated, it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc.) and manage allowances per type."
+msgstr ""
+
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Leaves"
@@ -153,7 +131,13 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
+#: code:addons/hr_holidays/hr_holidays.py:309
+#, python-format
+msgid "You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
 #: view:hr.holidays:0
 msgid "Leaves"
 msgstr ""
@@ -163,18 +147,12 @@ msgstr ""
 msgid "Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
-msgid "Remaining leaves"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,state:0
 #: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
@@ -190,18 +168,6 @@ msgstr ""
 msgid "Validation"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You cannot validate leaves for category %s while there are too few remaining leave days."
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
@@ -213,7 +179,7 @@ msgid "HR Holidays Summary Report By Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: field:available.holidays.report,holiday_status_id:0
+#: view:hr.holidays:0
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
 #: view:hr.holidays.status:0
@@ -226,18 +192,13 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Validation User"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
+#: code:addons/hr_holidays/hr_holidays.py:186
+#: code:addons/hr_holidays/hr_holidays.py:309
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,state:0
 #: selection:hr.holidays,state:0
 msgid "Draft"
 msgstr ""
@@ -254,7 +215,7 @@ msgid "When the holiday request is created the state is 'Draft'.\n"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least 1 Department. And try again"
 msgstr ""
@@ -271,19 +232,14 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#. module: hr_holidays
-#: help:hr.holidays,allocation_type:0
-msgid "This field is only for informative purposes, to depict if the leave request/allocation comes from an employee or from the company"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Confirm"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_available_holidays_report
-msgid "available.holidays.report"
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
 msgstr ""
 
 #. module: hr_holidays
@@ -313,15 +269,11 @@ msgid "Human Resources: Holidays tracking and workflow\n"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,remaining_leave:0
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,state:0
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "State"
@@ -333,7 +285,6 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 #: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
@@ -341,17 +292,6 @@ msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,state:0
-msgid "Waiting Validation"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-msgid "General"
-msgstr ""
-
-#. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Type"
 msgstr ""
@@ -388,25 +328,14 @@ msgstr ""
 msgid "Number of Days"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
-msgstr ""
-
-#. module: hr_holidays
-#: view:board.board:0
-msgid "Remaining Leave by Type and User"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
 msgstr ""
 
 #. module: hr_holidays
@@ -414,11 +343,6 @@ msgstr ""
 msgid "If its True then its Allocation/Request have to be validated by second validator"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "    Month-1    "
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
@@ -429,25 +353,14 @@ msgstr ""
 msgid "Employee(s)"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid " Month "
-msgstr ""
-
-#. module: hr_holidays
-#: view:board.board:0
-msgid "Leaves By Month"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You cannot validate leaves for employee %s while there are too few remaining leave days."
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
-msgid "If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example."
+msgid "If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
 msgstr ""
 
 #. module: hr_holidays
@@ -455,37 +368,11 @@ msgstr ""
 msgid "Parent"
 msgstr ""
 
-#. module: hr_holidays
-#: help:hr.holidays,manager_id2:0
-msgid "This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all
-msgid "Remaining Leaves by User"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Lavender"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,month:0
-msgid "Month"
-msgstr ""
-
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
@@ -504,7 +391,6 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
 #: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
@@ -514,23 +400,11 @@ msgstr ""
 msgid "This value is given by the sum of all holidays requests with a positive value."
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Available Holidays"
-msgstr ""
-
 #. module: hr_holidays
 #: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
 msgid "All Employee Leaves"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "No user related to the selected employee."
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Coral"
@@ -553,13 +427,9 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Leaves Allowed"
-msgstr ""
-
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid " Year "
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting"
 msgstr ""
 
 #. module: hr_holidays
@@ -567,16 +437,6 @@ msgstr ""
 msgid "Ivory"
 msgstr ""
 
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "June"
-msgstr ""
-
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
@@ -589,7 +449,6 @@ msgid "Leaves Already Taken"
 msgstr ""
 
 #. module: hr_holidays
-#: field:available.holidays.report,user_id:0
 #: field:hr.holidays,user_id:0
 #: field:hr.holidays.remaining.leaves.user,user_id:0
 msgid "User"
@@ -601,34 +460,18 @@ msgid "Active"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,date_from:0
-msgid "Start Date"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "Leaves To Validate"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: hr_holidays
-#: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Extended Filters..."
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,allocation_type:0
-msgid "Employee Request"
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
 msgstr ""
 
 #. module: hr_holidays
@@ -641,11 +484,6 @@ msgstr ""
 msgid "Casual Leave"
 msgstr ""
 
-#. module: hr_holidays
-#: field:available.holidays.report,date:0
-msgid "Date"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
@@ -653,7 +491,7 @@ msgid "Leaves Summary"
 msgstr ""
 
 #. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error"
 msgstr ""
@@ -663,12 +501,6 @@ msgstr ""
 msgid "Light Blue"
 msgstr ""
 
-#. module: hr_holidays
-#: constraint:hr.holidays:0
-msgid "Start date should not be larger than end date!\n"
-"Number of Days should be greater than 1!"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
@@ -680,9 +512,13 @@ msgid "If the active field is set to false, it will allow you to hide the leave
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,day:0
-msgid "Day"
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
 msgstr ""
 
 #. module: hr_holidays
@@ -692,18 +528,11 @@ msgid "Reasons"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
-msgid "Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type."
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "Cancel"
@@ -715,8 +544,6 @@ msgid "This color will be used in the leaves summary located in Reporting\\Leave
 msgstr ""
 
 #. module: hr_holidays
-#: view:available.holidays.report:0
-#: selection:available.holidays.report,state:0
 #: view:hr.holidays:0
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
@@ -751,14 +578,13 @@ msgid "Details"
 msgstr ""
 
 #. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays.summary.dept,depts:0
-msgid "Department(s)"
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
@@ -772,22 +598,17 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays.status:0
-#: field:hr.holidays.status,categ_id:0
-msgid "Meeting Category"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
 msgid "By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category"
 msgstr ""
 
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:186
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr ""
+
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
@@ -799,18 +620,13 @@ msgid "Select Holiday Type"
 msgstr ""
 
 #. module: hr_holidays
-#: field:available.holidays.report,employee_id:0
-msgid "Employee's Name"
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
-msgid "Leaves by Month"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,holiday_type:0
-msgid "By Employee Category"
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
 msgstr ""
 
 #. module: hr_holidays
@@ -823,21 +639,11 @@ msgstr ""
 msgid "Second Approval"
 msgstr ""
 
-#. module: hr_holidays
-#: field:hr.holidays,case_id:0
-msgid "Case"
-msgstr ""
-
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
 msgid "End Date"
 msgstr ""
 
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "February"
-msgstr ""
-
 #. module: hr_holidays
 #: help:hr.holidays.status,limit:0
 msgid "If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones."
@@ -854,8 +660,13 @@ msgid "Violet"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "April"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid "This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)"
 msgstr ""
 
 #. module: hr_holidays
@@ -879,8 +690,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,linked_request_ids:0
-msgid "Linked Requests"
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: hr_holidays
@@ -899,12 +710,6 @@ msgstr ""
 msgid "Light Pink"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "Wrong leave definition."
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Manager"
@@ -915,20 +720,8 @@ msgstr ""
 msgid "To Confirm"
 msgstr ""
 
-#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,year:0
-msgid "Year"
-msgstr ""
-
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Approve"
 msgstr ""
 
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You Cannot Validate leaves while available leaves are less than asked leaves."
-msgstr ""
-
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index cb060cd1be4..8dd54d9385f 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 08:42+0000\n"
+"PO-Revision-Date: 2010-12-31 10:31+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:39+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -193,7 +193,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Convalida"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
@@ -208,6 +208,8 @@ msgid ""
 "You cannot validate leaves for category %s while there are too few remaining "
 "leave days."
 msgstr ""
+"Non è possibile convalidare i permessi per la categoria %s mentre ci sono "
+"troppo pochi giorni di permesso rimanenti."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -407,6 +409,7 @@ msgstr "Beige"
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Errore! La data inizio permesso deve essere minori di quella della fine."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -429,7 +432,7 @@ msgstr "Permessi rimanenti per tipo e utente"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "Cerca tipo di permesso"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
@@ -446,7 +449,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mese-1    "
 
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
@@ -466,7 +469,7 @@ msgstr " Mese "
 #. module: hr_holidays
 #: view:board.board:0
 msgid "Leaves By Month"
-msgstr ""
+msgstr "Permessi per mese"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
@@ -475,6 +478,8 @@ msgid ""
 "You cannot validate leaves for employee %s while there are too few remaining "
 "leave days."
 msgstr ""
+"Non è possibile convalidare permessi per l'impiegato %s mentra ci sono "
+"troppo pochi giorni di permesso rimanenti."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
diff --git a/addons/hr_holidays/report/available_holidays.py b/addons/hr_holidays/report/available_holidays.py
index 8d91e0d02e4..26c654db9dd 100644
--- a/addons/hr_holidays/report/available_holidays.py
+++ b/addons/hr_holidays/report/available_holidays.py
@@ -19,71 +19,3 @@
 #
 ##############################################################################
 
-from osv import fields, osv
-import tools
-
-class available_holidays_report(osv.osv):
-    _name = "available.holidays.report"
-    _auto = False
-    _columns = {
-        'date': fields.date('Date', readonly=True),
-        'year': fields.char('Year', size=4, readonly=True),
-        'day': fields.char('Day', size=15, 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),
-        'employee_id': fields.many2one ('hr.employee', "Employee's Name", readonly=True),
-        'category_id': fields.many2one('hr.employee.category', "Category's Name", readonly=True),
-        'holiday_status_id': fields.many2one('hr.holidays.status', 'Leave Type', readonly=True),
-        'max_leave': fields.float('Allocated Leaves', readonly=True),
-        'taken_leaves': fields.float('Taken Leaves', readonly=True),
-        'remaining_leave': fields.float('Remaining Leaves', readonly=True),
-        'department_id': fields.many2one('hr.department', 'Department', readonly=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'state': fields.selection([('draft', 'Draft'),
-                                   ('confirm', 'Waiting Validation'),
-                                   ('refuse', 'Refused'),
-                                   ('validate', 'Validated'),
-                                   ('cancel', 'Cancelled')]
-                                   ,'State', readonly=True),
-    }
-    def init(self, cr):
-        tools.drop_view_if_exists(cr, 'available_holidays_report')
-        cr.execute("""
-            CREATE or REPLACE view available_holidays_report as (
-                SELECT
-                    min(h.id) as id,
-                    date_trunc('day',h.create_date) as date,
-                    to_char(s.create_date, 'YYYY') as year,
-                    to_char(s.create_date, 'MM') as month,
-                    to_char(s.create_date, 'YYYY-MM-DD') as day,
-                    h.employee_id as employee_id,
-                    h.category_id as category_id,
-                    h.user_id as user_id,
-                    h.department_id,
-                    h.state as state,
-                    h.holiday_status_id as holiday_status_id,
-                    sum(number_of_days) as remaining_leave,
-                    (select sum(number_of_days_temp) from hr_holidays
-                                                     where type='remove'
-                                                     and employee_id=h.employee_id
-                                                     and holiday_status_id=h.holiday_status_id
-                                                     and state='validate') as taken_leaves,
-                    (select sum(number_of_days_temp) from hr_holidays
-                                                     where type='add'
-                                                     and employee_id=h.employee_id
-                                                     and holiday_status_id=h.holiday_status_id
-                                                     and state='validate') as max_leave
-                FROM hr_holidays h
-                LEFT JOIN hr_holidays_status s on (s.id = h.holiday_status_id)
-                WHERE h.state='validate'
-                and s.active <> 'f'
-                GROUP BY h.holiday_status_id, h.employee_id,
-                         date_trunc('day',h.create_date),to_char(s.create_date, 'YYYY'),
-                         to_char(s.create_date, 'MM'), to_char(s.create_date, 'YYYY-MM-DD'), h.user_id,h.state, h.category_id, h.department_id
-
-            )""")
-
-available_holidays_report()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 60f47fb656a..fa04c0ed784 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -1,117 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-<!-- available holidays report -->
-
-        <record id="view_hr_available_holidays_report_tree" model="ir.ui.view">
-            <field name="name">available.holidays.report.tree</field>
-            <field name="model">available.holidays.report</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-               <tree string="Available Holidays">
-                    <field name="employee_id" invisible="1"/>
-					<field name="user_id" invisible="1"/>
-                    <field name="category_id" invisible="1"/>
-                    <field name="holiday_status_id" invisible="1"/>
-                    <field name="department_id" invisible="1"/>
-                    <field name="day" invisible="1"/>
-                    <field name="month" invisible="1"/>
-                    <field name="year" invisible="1"/>
-                    <field name="date" invisible="1"/>
-                    <field name="state" invisible="1"/>
-                    <field name="max_leave" sum="Allocated Leaves"/>
-                    <field name="taken_leaves" sum="Taken Leaves"/>
-                    <field name="remaining_leave" sum="Remaining Leaves"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_hr_available_holidays_report_graph" model="ir.ui.view">
-            <field name="name">available.holidays.report.graph</field>
-            <field name="model">available.holidays.report</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Available Holidays" type="bar">
-                    <field name="holiday_status_id"/>
-                    <field name="taken_leaves" string="Taken Leaves" operator="+"/>
-                    <field name="max_leave" string="Allocated Leaves" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
-        <record id="view_hr_available_holidays_report_search" model="ir.ui.view">
-	        <field name="name">available.holidays.report.search</field>
-	        <field name="model">available.holidays.report</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
-	            <search string="Leaves">
-	            	<group>
-						<filter icon="terp-go-year" string=" Year " domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;=',time.strftime('%%Y-01-01'))]" help="Available Leaves of current year"/>
-						<filter icon="terp-go-month" string=" Month " name="month"
-								domain="[('date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-								help="Available Leaves of current month"/>
-						<filter icon="terp-go-month" string="    Month-1    " separator="1"
-                                domain="[('date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-						        help="Available Leaves of last month"/>
-						<separator orientation="vertical"/>
-						<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"/>
-		                <separator orientation="vertical"/>
-                    <field name="employee_id"/>
-		            </group>
-	                <newline/>
-	                <group expand="0" string="Extended Filters..." colspan="10" col="12">
-	                    <field name="holiday_status_id" widget="selection"/>
-	                	<field name="department_id" widget="selection"/>
-	                </group>
-	                <newline/>
-                    <group expand="1" string="Group By..." colspan="10" col="12">
-						<filter icon="terp-personal" string="Employee"
-                          name="user" context="{'group_by':'employee_id'}"
-                          help="Leaves by employee"/>
-						<filter string="Validation User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-		                <separator orientation="vertical"/>
-                        <filter string="Department" icon="terp-personal+" context="{'group_by':'department_id'}"/>
-                       <separator orientation="vertical"/>
-                    	<filter icon="terp-stock_symbol-selection" string="Category" context="{'group_by':'category_id'}"
-                            help="Leaves by category"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'holiday_status_id'}"/>
-                        <separator orientation="vertical"/>
-                    	<filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
-                   		<separator orientation="vertical"/>
-                        <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}"/>
-                        <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}"/>
-                        <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}"/>
-                    </group>
-	            </search>
-	        </field>
-	    </record>
-
-        <record id="action_hr_available_holidays_report" model="ir.actions.act_window">
-            <field name="name">Leaves Analysis</field>
-            <field name="res_model">available.holidays.report</field>
+        <record model="ir.actions.act_window" id="action_hr_available_holidays_report">
+            <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph</field>
-            <field name="context">{'search_default_month':1,'search_default_user':1,'group_by':[], "search_default_user_id": uid, 'group_by_no_leaf':1}</field>
-            <field name="view_id" ref="view_hr_available_holidays_report_search"/>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" eval="view_holiday_simple"/>
+            <field name="context">{'search_default_group_employee': 1, 'search_default_group_type': 1}</field>
+            <field name="domain">[('holiday_type','=','employee')]</field>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
-        <record model="ir.actions.act_window.view" id="action_hr_available_holidays_report_tree">
-                <field name="sequence" eval="1"/>
-                <field name="view_mode">tree</field>
-                <field name="view_id" ref="view_hr_available_holidays_report_tree"/>
-                <field name="act_window_id" ref="action_hr_available_holidays_report"/>
-        </record>
+        <menuitem
+            name="Leaves Analysis" 
+            id="menu_hr_available_holidays_report_tree" 
+            action="action_hr_available_holidays_report" 
+            parent="menu_hr_reporting_holidays"/>
 
-        <record model="ir.actions.act_window.view" id="action_hr_available_holidays_report_graph">
-                <field name="sequence" eval="2"/>
-                <field name="view_mode">graph</field>
-                <field name="view_id" ref="view_hr_available_holidays_report_graph"/>
-                <field name="act_window_id" ref="action_hr_available_holidays_report"/>
-        </record>
 
-        <menuitem name="Leaves Analysis" id="menu_hr_available_holidays_report_tree" action="action_hr_available_holidays_report" parent="menu_hr_reporting_holidays"/>
-
-	</data>
+    </data>
 </openerp>
 
diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl
index c0a24e551ff..a65425dd0b3 100644
--- a/addons/hr_holidays/report/holidays_summary.xsl
+++ b/addons/hr_holidays/report/holidays_summary.xsl
@@ -244,7 +244,6 @@
                     <td>
                             <para>
                             <xsl:attribute name="style">digits</xsl:attribute>
-                                <xsl:value-of select="attribute::id"/>
                             </para>
                     </td>
                     <td>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index f350b73ed64..940b0f06447 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_holydays_status_user","hr.holidays.status user","model_hr_holidays_status","base.group_hr_user",1,1,1,1
 "access_hr_holidays_user","hr.holidays.user","model_hr_holidays","base.group_hr_user",1,1,1,1
+"access_hr_holidays_employee","hr.holidays.employee","model_hr_holidays","base.group_user",1,1,1,1
+"access_hr_holydays_status_employee","hr.holidays.status employee","model_hr_holidays_status","base.group_user",1,0,0,0
 "access_hr_holidays_remain_user","hr.holidays.ramain.user","model_hr_holidays_remaining_leaves_user","base.group_hr_user",1,1,1,1
 "access_resource_calendar_leaves_manager","resource_calendar_leaves_manager","resource.model_resource_calendar_leaves","base.group_hr_manager",1,1,1,1
-"access_available_holidays_report_user","hr.available.holidays.report.user","model_available_holidays_report","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_holidays/test/hr_holidays_report.yml b/addons/hr_holidays/test/hr_holidays_report.yml
index 9faf7358b53..bc0b4efa51f 100644
--- a/addons/hr_holidays/test/hr_holidays_report.yml
+++ b/addons/hr_holidays/test/hr_holidays_report.yml
@@ -1,14 +1,22 @@
 -
- In order to test the PDF reports defined on a HR Holidays, we will print HR Holidays
+ Print the HR Holidays(Summary Department) Report through the wizard
 -
   !python {model: hr.holidays}: |
-    import netsvc, tools, os, time
-    data_dict = {'model': 'ir.ui.menu', 'form': {'date_from': time.strftime('%Y-%m-01'), 'depts' : [ref('hr.dep_sales')],'holiday_type' : 'Validated' }}
-    (data, format) = netsvc.LocalService('report.holidays.summary').create(cr, uid, [], data_dict, {'active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_holidays-dept_summary_report.'+format), 'wb+').write(data)
-    
-    data_dict = {'model': 'hr.employee', 'form': {'date_from': time.strftime('%Y-%m-01'), 'depts' : [ref('hr.dep_sales')],'holiday_type' : 'Validated','emp':[ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')] }}
-    (data, format) = netsvc.LocalService('report.holidays.summary').create(cr, uid, [], data_dict, {'active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_holidays-employee_summary_report.'+format), 'wb+').write(data)
\ No newline at end of file
+    import time
+    ctx={}
+    ctx.update({'model': 'hr.department','active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
+    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'depts' : [(6,0,[ref('hr.dep_sales')])],'holiday_type' : 'Validated'}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_hr_holidays_summary_dept',wiz_data=data_dict, context=ctx, our_module='hr_holidays')
+
+-
+ Print the HR Holidays(Summary Employee) Report through the wizard
+-
+  !python {model: hr.holidays}: |
+    import time
+    ctx={}
+    ctx.update({'model': 'hr.employee','active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')]})
+    data_dict = {'date_from': time.strftime('%Y-%m-01'), 'emp' : [(6,0,[ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')])],'holiday_type' : 'Validated'}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_hr_holidays_summary_employee',wiz_data=data_dict, context=ctx, our_module='hr_holidays')
+
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index f32afa737b2..6274bb5e23a 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -42,7 +42,6 @@
   I allocate leave request for employee "Phil Graves".
 -
   !record {model: hr.holidays, id: hr_holidays_allocateleaveforuser0}:
-    allocation_type: employee
     employee_id: 'hr_employee_philgraves0'
     holiday_status_id: hr_holidays_status_sick0
     name: Sick Leaves for Phil Graves
@@ -64,7 +63,6 @@
   I connect as "test_holiday_user1", and create a new leave request for employee "Phil Graves".
 -
   !record {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
-    allocation_type: employee
     date_from: '2010-05-20 11:48:00'
     date_to: '2010-05-21 11:48:00'
     employee_id: 'hr_employee_philgraves0'
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index b305e6bf92b..ec228407e4b 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -58,7 +58,7 @@
          'test/payslip.yml',
          'test/payment_advice.yml',
          'test/payroll_register.yml',
-#         'test/hr_payroll_report.yml',
+        # 'test/hr_payroll_report.yml',
     ],
     'demo_xml': [
         'hr_payroll_demo.xml'
diff --git a/addons/hr_payroll/hr_paroll_report.xml b/addons/hr_payroll/hr_paroll_report.xml
index 732b72f6a1d..2fae9bcf4c8 100644
--- a/addons/hr_payroll/hr_paroll_report.xml
+++ b/addons/hr_payroll/hr_paroll_report.xml
@@ -51,7 +51,7 @@
           	name="salary.structure" 
           	rml="hr_payroll/report/report_emp_salary_structure.rml"
           	menu = "True" 
-          	string="Salary Structure" />
+          	string="Salary Structure" groups="base.group_hr_manager"/>
   
 	</data>
 </openerp>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 8ecd991ce8d..73d354bb26d 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- Root Menus -->
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="9"/>
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_hr_manager"/>
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
         <!-- Passport Views    -->
@@ -32,9 +32,6 @@
                             <separator string="Description" colspan="2"/>
                             <field name="note" colspan="4" nolabel="1"/>
                         </page>
-                        <page string="Contracts" groups="base.group_extended">
-                            <field name="contracts_ids" colspan="4" nolabel="1"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
@@ -94,7 +91,7 @@
             <field name="arch" type="xml">
             <data>
                 <xpath expr="/form/notebook/page[@string='Personal Information']" position="after">
-                    <page string="Miscellaneous">
+                    <page string="Miscellaneous" groups="base.group_hr_user">
                         <group colspan="2" col="2">
                             <separator string="Personal Info" colspan="2"/>
                             <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
@@ -109,120 +106,6 @@
                             <field name="medic_exam" select="1" string="Medical Examination"/>
                         </group>
                     </page>
-                    <page string="Contracts" groups="base.group_extended">
-                        <field colspan="4" mode="form,tree" name="contract_ids" nolabel="1">
-                            <tree string="Contracts">
-                                <field name="name"/>
-                                <field name="job_id"/>
-                                <field name="date_start"/>
-                                <field name="date_end"/>
-                                <field name="working_hours"/>
-                                <field name="wage_type_id"/>
-                                <field name="wage"/>
-                            </tree>
-                            <form string="Contracts">
-                                <group colspan="4" col="6">
-                                    <field name="name" select="1"/>
-                                    <field name="job_id"/>
-                                    <newline/>
-                                    <field name="wage"/>
-                                    <field name="wage_type_id" widget="selection"/>
-                                    <field name="type_id" widget="selection"/>
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Contract Details">
-                                        <group col="2" colspan="2">
-                                            <separator colspan="2" string="Duration"/>
-                                            <field name="date_start" select="1"/>
-                                            <field name="date_end" select="1"/>
-                                            <field name="working_hours"/>
-                                        </group>
-                                        <group col="2" colspan="2">
-                                            <separator colspan="2" string="Advantages"/>
-                                            <field name="struct_id" select="1"/>
-                                            <field name="advantages_gross"/>
-                                            <field name="advantages_net"/>
-                                            <field name="advantages" nolabel="1" colspan="2"/>
-                                        </group>
-                                    </page>
-                                    <page string="Work Permit">
-                                        <group col="2" colspan="2">
-                                            <separator colspan="2" string="Passport"/>
-                                            <field name="passport_id" domain="[('employee_id','=',parent.id)]"/>
-                                        </group>
-                                        <group col="2" colspan="2">
-                                            <separator colspan="2" string="Valid for"/>
-                                            <field name="visa_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
-                                            <field name="permit_no" attrs="{'required': [('passport_id','!=',False), ]}"/>
-                                            <field name="visa_expire" attrs="{'required': [('passport_id','!=',False), ]}"/>
-                                        </group>
-                                    </page>
-                                    <separator colspan="4" string="Notes"/>
-                                    <field colspan="4" name="notes" nolabel="1"/>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                </xpath>
-                <xpath expr="/form/notebook/page[@string='Notes']" position="before">
-                    <page string="Salary Structure" groups="base.group_extended">
-                        <group col="10" colspan="4">
-                            <separator string="Salary Computation" colspan="10"/>
-                            <field name="basic"/>
-                            <field name="advantages_gross"/>
-                            <field name="gross"/>
-                            <field name="advantages_net"/>
-                            <field name="net"/>
-                        </group>
-                        <separator string="Employee specific allowances and deductions" colspan="4"/>
-                        <field name="line_ids" nolabel="1" colspan="4" string="Salary Structure">
-                            <tree string="Salary Structure" editable="bottom">
-                                <field name="category_id" on_change="onchange_category(category_id)"/>
-                                <field name="sequence" groups="base.group_extended"/>
-                                <field name="name"/>
-                                <field name="code"/>
-                                <field name="type"/>
-                                <field name="amount_type"/>
-                                <field name="amount" on_change="onchange_amount(amount, amount_type)"/>
-                            </tree>
-                            <form string="Payslip Line">
-                                <group col="6" colspan="4">
-                                    <field name="name" colspan="4" select="1"/>
-                                    <field name="code" select="1"/>
-                                </group>
-                                <group col="2" colspan="2">
-                                    <separator colspan="4" string="Calculations"/>
-                                    <field name="category_id" on_change="onchange_category(category_id)"/>
-                                    <field name="type"/>
-                                    <field name="amount_type"/>
-                                    <field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'readonly':[('amount_type','=','func')]}"/>
-                                    <field name="sequence" groups="base.group_extended"/>
-                                </group>
-                                <group col="2" colspan="2">
-                                    <separator colspan="4" string="Company contribution"/>
-                                    <field name="company_contrib"/>
-                                </group>
-                                <notebook colspan="4">
-                                    <page string="Function">
-                                        <field name="line_ids" colspan="4" nolabel="1" attrs="{'readonly':[('amount_type','!=','func')]}">
-                                            <tree string="Function Arguments" editable="bottom">
-                                                <field name="name"/>
-                                                <field name="sequence" groups="base.group_extended"/>
-                                                <field name="from_val"/>
-                                                <field name="to_val"/>
-                                                <field name="amount_type"/>
-                                                <field name="value"/>
-                                            </tree>
-                                        </field>
-                                    </page>
-                                    <page string="Description">
-                                        <separator colspan="4" string="Description"/>
-                                        <field name="note" colspan="4" nolabel="1"/>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
                 </xpath>
             </data>
             </field>
@@ -391,23 +274,23 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <xpath expr="//group[@name='selection']" position="replace">
-				<group colspan="2">
-							<separator string="Validation" colspan="2"/>
-								<newline/>
-							<field name="active" />
-								<newline/>
-							<field name="double_validation"/>
-								<newline/>
-							<field name="limit"/>
-			  	</group>
-				<group colspan="2">
-					<separator colspan="2" string="Payroll Configurtion"/><newline/>
-					<field name="type"/><newline/>
-					<field name="head_id"/><newline/>
-					<field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/><newline/>
-					<field name="code" readonly="True"/>
-				</group>
-			</xpath>
+                <group colspan="2">
+                            <separator string="Validation" colspan="2"/>
+                                <newline/>
+                            <field name="active" />
+                                <newline/>
+                            <field name="double_validation"/>
+                                <newline/>
+                            <field name="limit"/>
+                  </group>
+                <group colspan="2">
+                    <separator colspan="2" string="Payroll Configurtion"/><newline/>
+                    <field name="type"/><newline/>
+                    <field name="head_id"/><newline/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection" select="2"/><newline/>
+                    <field name="code" readonly="True"/>
+                </group>
+            </xpath>
         </field>
         </record>
         <!-- End Holiday Status -->
@@ -1051,7 +934,7 @@
             </field>
         </record>
         <record id="action_contibution_register_form" model="ir.actions.act_window">
-            <field name="name">Contibution Register</field>
+            <field name="name">Contribution Register</field>
             <field name="res_model">hr.contibution.register</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="hr_contibution_register_tree"/>
@@ -1077,13 +960,17 @@
             </field>
         </record>
 
+
+
         <!--  Shortcuts -->
         <act_window name="Payslips"
             domain="[('employee_id', '=', active_id)]"
             res_model="hr.payslip"
             src_model="hr.employee"
             view_id ="view_hr_payslip_tree"
-            id="act_hr_employee_payslip_list"/>
+            id="act_hr_employee_payslip_list"
+            groups="base.group_hr_manager"/>
+
     </data>
 </openerp>
 
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 1110dc45b12..dbcc111ec3a 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:17+0000\n"
+"PO-Revision-Date: 2010-12-29 09:53+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -1403,7 +1403,7 @@ msgstr "Netto Lohn"
 #. module: hr_payroll
 #: sql_constraint:hr.passport:0
 msgid "The Passport No must be unique !"
-msgstr ""
+msgstr "Die Nummer des Ausweis sollte eindeutig sein !"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po
index 17bccc3e742..ebb58c6196d 100644
--- a/addons/hr_payroll/i18n/es.po
+++ b/addons/hr_payroll/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-26 07:59+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 07:46+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
@@ -26,7 +25,7 @@ msgstr "Dirección de correo electrónico"
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
 msgid "Based"
-msgstr ""
+msgstr "Basado"
 
 #. module: hr_payroll
 #: field:hr.contract,net:0
@@ -544,18 +543,18 @@ msgstr "Tipo"
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡ Error !"
 
 #. module: hr_payroll
 #: view:hr.payroll.register:0
@@ -610,7 +609,7 @@ msgstr "Otros pagos"
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Deductions"
-msgstr ""
+msgstr "Deducciones"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
@@ -644,7 +643,7 @@ msgstr "Total por empleado"
 #: selection:hr.payslip.line,amount_type:0
 #: selection:hr.payslip.line.line,amount_type:0
 msgid "Fixed Amount"
-msgstr ""
+msgstr "Importe fijo"
 
 #. module: hr_payroll
 #: field:company.contribution.line,to_val:0
@@ -652,7 +651,7 @@ msgstr ""
 #: field:hr.payslip.line.line,to_val:0
 #: report:year.salary:0
 msgid "To"
-msgstr ""
+msgstr "Para"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
@@ -694,7 +693,7 @@ msgstr "Para el mes de"
 #: field:hr.payslip,deduction:0
 #: selection:hr.payslip.line,type:0
 msgid "Deduction"
-msgstr ""
+msgstr "Deducción"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payroll_advice
@@ -765,7 +764,7 @@ msgstr "Hoja de confirmación"
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Others:"
-msgstr ""
+msgstr "Otros:"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -817,7 +816,7 @@ msgstr "Tipo de importe"
 #: view:company.contribution:0
 #: field:hr.payslip.line,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -830,7 +829,7 @@ msgstr "Contribución compañía"
 #. module: hr_payroll
 #: field:company.contribution,category_id:0
 msgid "Heads"
-msgstr ""
+msgstr "Cabeceras"
 
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
@@ -840,7 +839,7 @@ msgstr "Imprimir declaración"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -851,7 +850,7 @@ msgstr "Ingresos"
 #: report:hr.payroll.register.sheet:0
 #: report:salary.structure:0
 msgid "Basic"
-msgstr ""
+msgstr "Básico"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
@@ -868,7 +867,7 @@ msgstr "Registro salarial"
 #: report:employees.salary:0
 #: report:hr.payroll.register.sheet:0
 msgid "Employee Name"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_passport
@@ -893,13 +892,13 @@ msgstr "Registro de nóminas"
 #: report:hr.payroll.register.sheet:0
 #: report:payroll.advice:0
 msgid "For"
-msgstr ""
+msgstr "Para"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 #: field:hr.passport,contracts_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contratos"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
@@ -909,7 +908,7 @@ msgstr "Función del empleado"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Paid"
-msgstr ""
+msgstr "Pagado"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -924,12 +923,12 @@ msgstr "¿Pagado? "
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Validación"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 msgid "Title"
-msgstr ""
+msgstr "Título"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -939,12 +938,12 @@ msgstr "Buscar contribución de la compañía"
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -955,7 +954,7 @@ msgstr "Calcular hoja"
 #: field:company.contribution,active:0
 #: field:hr.payroll.register,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activo"
 
 #. module: hr_payroll
 #: help:hr.allounce.deduction.categoty,condition:0
@@ -970,12 +969,12 @@ msgstr "Detalles del salario anual"
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Condición"
 
 #. module: hr_payroll
 #: selection:hr.payroll.register,state:0
@@ -991,7 +990,7 @@ msgstr "Aviso de pago:"
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 msgid "Compute"
-msgstr ""
+msgstr "Calcular"
 
 #. module: hr_payroll
 #: report:employees.salary:0
@@ -999,7 +998,7 @@ msgstr ""
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Designation"
-msgstr ""
+msgstr "Designación"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
@@ -1032,7 +1031,7 @@ msgstr "Categoría prima/deducción"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1061,7 +1060,7 @@ msgstr "Fecha próximo mes"
 #: field:hr.payroll.register,date:0
 #: field:hr.payslip,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: hr_payroll
 #: field:hr.contract,visa_expire:0
@@ -1077,7 +1076,7 @@ msgstr "Buscar pasaporte"
 #: report:employees.salary:0
 #: report:salary.structure:0
 msgid "Phone No."
-msgstr ""
+msgstr "Nº Teléfono"
 
 #. module: hr_payroll
 #: field:company.contribution,contribute_per:0
@@ -1086,25 +1085,25 @@ msgstr ""
 #: view:hr.contibution.register:0
 #: view:hr.contibution.register.line:0
 msgid "Contribution"
-msgstr ""
+msgstr "Contribución"
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,state:0
 msgid "Label"
-msgstr ""
+msgstr "Etiqueta"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 #: view:hr.payslip:0
 #: view:hr.payslip.line:0
 msgid "Company contribution"
-msgstr ""
+msgstr "Contribución compañía"
 
 #. module: hr_payroll
 #: report:employees.salary:0
 #: report:salary.structure:0
 msgid "Other No."
-msgstr ""
+msgstr "Otro Nº"
 
 #. module: hr_payroll
 #: field:company.contribution,code:0
@@ -1115,7 +1114,7 @@ msgstr ""
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
@@ -1139,7 +1138,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Computation Overview"
-msgstr ""
+msgstr "Resumen del cálculo"
 
 #. module: hr_payroll
 #: field:hr.payroll.year.salary,salary_on:0
@@ -1151,7 +1150,7 @@ msgstr "Salario sobre"
 #: field:hr.payroll.register,number:0
 #: field:hr.payslip,number:0
 msgid "Number"
-msgstr ""
+msgstr "Número"
 
 #. module: hr_payroll
 #: field:hr.contract,struct_id:0
@@ -1165,7 +1164,7 @@ msgstr ""
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
-msgstr ""
+msgstr "Estructura salarial"
 
 #. module: hr_payroll
 #: field:hr.contibution.register,register_line_ids:0
@@ -1176,13 +1175,13 @@ msgstr ""
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_payroll
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount:0
@@ -1204,7 +1203,7 @@ msgstr "Fecha mes actual"
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "Salary"
-msgstr ""
+msgstr "Salario"
 
 #. module: hr_payroll
 #: field:hr.contract,passport_id:0
@@ -1241,7 +1240,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:salary.structure:0
 msgid "E-mail"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -1254,7 +1253,7 @@ msgstr ""
 #: view:hr.payroll.employees.detail:0
 #: view:hr.payroll.year.salary:0
 msgid "Print Report"
-msgstr ""
+msgstr "Imprimir informe"
 
 #. module: hr_payroll
 #: field:company.contribution,line_ids:0
@@ -1263,7 +1262,7 @@ msgstr ""
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,line_ids:0
 msgid "Calculations"
-msgstr ""
+msgstr "Cálculos"
 
 #. module: hr_payroll
 #: help:company.contribution,contribute_per:0
@@ -1281,12 +1280,12 @@ msgstr "Otra información"
 #. module: hr_payroll
 #: view:hr.contibution.register:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Issue"
-msgstr ""
+msgstr "Incidencia"
 
 #. module: hr_payroll
 #: view:hr.allounce.deduction.categoty:0
@@ -1306,7 +1305,7 @@ msgstr "Salario base sin ausencias:"
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,function_id:0
 msgid "Function"
-msgstr ""
+msgstr "Función"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -1316,7 +1315,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Dear Sir/Madam,"
-msgstr ""
+msgstr "Apreciado Sr./Sra.,"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
@@ -1326,7 +1325,7 @@ msgstr "Cabeceras prima/deducción"
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Gross Sal."
-msgstr ""
+msgstr "Sal. bruto"
 
 #. module: hr_payroll
 #: view:company.contribution:0
@@ -1346,24 +1345,24 @@ msgstr ""
 #: view:hr.payslip.line:0
 #: field:hr.payslip.line,note:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: hr_payroll
 #: field:hr.payroll.employees.detail,date_from:0
 #: field:hr.payroll.year.salary,date_from:0
 #: report:salary.structure:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha inicio"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Deduction -"
-msgstr ""
+msgstr "Deducción -"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: hr_payroll
 #: view:hr.contibution.register:0
@@ -1375,17 +1374,17 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
 #: model:ir.ui.menu,name:hr_payroll.payroll_configure
 msgid "Payroll"
-msgstr ""
+msgstr "Nómina"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
 msgid "Wage Type"
-msgstr ""
+msgstr "Tipo de salario"
 
 #. module: hr_payroll
 #: report:hr.payroll.register.sheet:0
 msgid "Net Sal."
-msgstr ""
+msgstr "Sal. neto"
 
 #. module: hr_payroll
 #: sql_constraint:hr.passport:0
@@ -1408,7 +1407,7 @@ msgstr "hr.nómina.año.salario"
 #: report:payslip.pdf:0
 #: report:salary.structure:0
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #. module: hr_payroll
 #: field:hr.payslip.line.line,slipline_id:0
@@ -1426,7 +1425,7 @@ msgstr ""
 #: field:hr.payroll.register,bank_id:0
 #: report:salary.structure:0
 msgid "Bank"
-msgstr ""
+msgstr "Banco"
 
 #. module: hr_payroll
 #: view:hr.payroll.advice:0
@@ -1437,7 +1436,7 @@ msgstr ""
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
 msgid "Advance"
-msgstr ""
+msgstr "Adelanto"
 
 #. module: hr_payroll
 #: report:salary.structure:0
@@ -1459,7 +1458,7 @@ msgstr "Primas y deducciones especiales por empleado:"
 #: report:salary.structure:0
 #: report:year.salary:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1469,7 +1468,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.passport:0
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: hr_payroll
 #: view:hr.passport:0
@@ -1479,12 +1478,12 @@ msgstr ""
 #: field:hr.payroll.year.salary,employee_ids:0
 #: view:hr.payslip:0
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: hr_payroll
 #: report:payroll.advice:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Cuenta bancaria"
 
 #. module: hr_payroll
 #: help:company.contribution,register_id:0
@@ -1499,7 +1498,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip,total_pay:0
 msgid "Total Payment"
-msgstr ""
+msgstr "Pago total"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1510,23 +1509,23 @@ msgstr ""
 #: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
 msgid "Wating for Account Verification"
-msgstr ""
+msgstr "Esperando por verificación de la cuenta"
 
 #. module: hr_payroll
 #: field:hr.contibution.register.line,comp_deduction:0
 msgid "Company Deduction"
-msgstr ""
+msgstr "Deducción de la Compañía"
 
 #. module: hr_payroll
 #: view:hr.holidays.status:0
 msgid "Payroll Configurtion"
-msgstr ""
+msgstr "Configuración nómina"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:0
 #, python-format
 msgid "Please define bank account for the %s employee"
-msgstr ""
+msgstr "Por favor, defina la cuenta bancaria para el empleado %s"
 
 #. module: hr_payroll
 #: field:hr.passport,date_issue:0
@@ -1555,7 +1554,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:payslip.pdf:0
 msgid "Bank Details"
-msgstr ""
+msgstr "Detalles bancarios"
 
 #. module: hr_payroll
 #: report:payslip.pdf:0
@@ -1568,7 +1567,7 @@ msgstr ""
 #: field:hr.payslip.line,sequence:0
 #: field:hr.payslip.line.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
diff --git a/addons/hr_payroll/i18n/fr_BE.po b/addons/hr_payroll/i18n/fr_BE.po
deleted file mode 100644
index 41b5899d00c..00000000000
--- a/addons/hr_payroll/i18n/fr_BE.po
+++ /dev/null
@@ -1,1435 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* hr_payroll
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 13:16:10+0000\n"
-"PO-Revision-Date: 2009-11-25 13:16:10+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-msgid "E-mail Address"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "(Based on type Payroll will calculate basic salary)"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-msgid "Net Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,working_days:0
-msgid "Working Days"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "Axis Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,esp_account:0
-msgid "EPS Account"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.employee,analytic_account:0
-msgid "Analytic Account for Salary Analysis"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
-msgid "Department"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-msgid "Deductions:"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Employee No"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.register,company_id:0
-#: field:hr.payslip,company_id:0
-#: wizard_field:payroll.analysis,init,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.employee,employee_account:0
-msgid "Employee Payable Account"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid ","
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: rml:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,slip_id:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip
-#: rml:payslip.pdf:0
-msgid "Pay Slip"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Calculations Rules"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
-msgid "\n"
-"    The Payroll system - India, Manages and depends on,\n"
-"    * HR Details\n"
-"    * HR Contracts\n"
-"    * HR Payslip\n"
-"    * HR Paysheet\n"
-"    * HR Attendance\n"
-"    * HR Holidays\n"
-"    "
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-#: rml:salary.structure:0
-msgid "Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.holidays.status,account_id:0
-msgid "Account"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Payment From"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Miscelleanous / Statutory"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,register_id:0
-msgid "Register"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
-msgid "Next Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.payroll.register,period_id:0
-#: help:hr.payslip,period_id:0
-msgid "Keep empty to use the period of the validation(Payslip) date."
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,value:0
-msgid "Value"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "Name of the Employee"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: rml:payroll.advice:0
-msgid "Amount"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line
-msgid "Payslip Line"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Please Confirm all Expanse Invoice appear for Reimbursement"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Special Allowance and Deductions for Employee"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.register,period_id:0
-#: field:hr.payslip,period_id:0
-msgid "Force Period"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,analytic_account:0
-#: field:hr.employee.grade,account_id:0
-#: field:hr.holidays.status,analytic_account_id:0
-#: field:hr.payslip.line,analytic_account_id:0
-#: rml:salary.structure:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Expanse To"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
-msgid "Bank"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,move_id:0
-msgid "Expanse Entries"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,esi_account:0
-msgid "ESI Account"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Please defined the Employee Home Address Along with Partners !!"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,from:0
-msgid "From"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-msgid "By Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Employee Year Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
-msgid "Employee PaySlip"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
-msgid "Authorised Signature"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,umo_id:0
-msgid "Unite"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Salary Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:salary.structure:0
-msgid "Notes:"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:salary.structure:0
-msgid "End Date"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Accounting Information"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee.grade:0
-msgid "Amount Information"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.employee,passport_id:0
-#: view:hr.passport:0
-msgid "Passport"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
-#: field:hr.payslip,employee_id:0
-#: field:hr.payslip.line,employee_id:0
-msgid "Employee"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:salary.structure:0
-msgid "Start Date"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: wizard_field:payroll.analysis,init,type:0
-#: rml:salary.structure:0
-msgid "Type"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "#"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Miscelleanous"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Integrity Error !"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,pan_no:0
-msgid "PAN No"
-msgstr ""
-
-#. module: hr_payroll
-#: wizard_button:wizard.employees.detail,init,report:0
-#: wizard_button:wizard.year.salary,init,report:0
-msgid "Print"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Accounting Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Contributions Configuration"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-msgid "Gross Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Total Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Basic Salary - Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "C/D"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:payroll.analysis,init,type:0
-msgid "By Employee Function"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.wizard,name:hr_payroll.wizard_print_year_salary
-msgid "Year Salary Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-msgid "Fixed Amount"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Account Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Gross SAL"
-msgstr ""
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
-#, python-format
-msgid "Please defined the Partner in Home Address !!"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
-msgid "For the month of"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Payslip"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: rml:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport List"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,payment_id:0
-msgid "Payment Entries"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "YTD"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,expanse_id:0
-msgid "Expense"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
-msgid "Fided Value"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Complete HR Checking"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Allowances"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Net Amount"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,based_on:0
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
-#: field:hr.payslip,state:0
-msgid "State"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:salary.structure:0
-msgid "Salary Structure:"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-#: model:ir.actions.wizard,name:hr_payroll.wizard_print_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_employees_detail
-msgid "Employees Salary Detail"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_employee_grade
-msgid "Function of the Employee"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-msgid "Others:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Passport and Visa"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-msgid "Employee Code"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: rml:salary.structure:0
-msgid "Amount Type"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,category_id:0
-#: field:hr.payslip.line,category_id:0
-#: rml:salary.structure:0
-msgid "Category"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,move_line_ids:0
-msgid "Accounting Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.register,bank_journal_id:0
-#: field:hr.payslip,bank_journal_id:0
-msgid "Bank Journal"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Total SAL"
-msgstr ""
-
-#. module: hr_payroll
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,hospital_id:0
-msgid "ESI Hospital"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
-msgid "Payslips"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Earnings"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_passport_tree
-msgid "All Passports"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payslip.pdf:0
-msgid "Employee Name"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,salary_account:0
-msgid "Salary Account"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-msgid "Percentage (%)"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:hr.payroll.register.sheet:0
-#: rml:payroll.advice:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
-msgid "For"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.register,journal_id:0
-#: field:hr.payslip,journal_id:0
-msgid "Expanse Journal"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_contract
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_contract
-msgid "Employee Contract"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,contribute:0
-msgid "Contribe by Company ?"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee.grade:0
-msgid "Employee Function"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-msgid "Working Days / Week"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-msgid "Worked Day"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Complete Accountant Checking"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-msgid "Title"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
-msgid "On Attendance"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Allowance/Deduction Heads"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Compute Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.register,active:0
-msgid "Active"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,employee_account:0
-msgid "Employee Account"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:year.salary:0
-msgid "Yearly Salary Details"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,pf_account:0
-msgid "PF Account"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payslip:0
-#: field:hr.payslip,move_payment_ids:0
-msgid "Payment Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
-msgid "Designation"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,based_on:0
-#: field:hr.payslip,basic_before_leaves:0
-#: rml:payslip.pdf:0
-msgid "Basic Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Authorized Signature"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Allowance / Deduction Category"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: rml:hr.payroll.register.sheet:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Basic SAL"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
-msgid "Phone No."
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,include_in_salary:0
-msgid "Included in Salary ?"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.expense.expense,category_id:0
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,account_id:0
-#: rml:salary.structure:0
-msgid "General Account"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.holidays.status,code:0
-#: field:hr.payslip.line,code:0
-#: rml:salary.structure:0
-msgid "Code"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-#: rml:payroll.advice:0
-msgid "Payment Advice"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,to:0
-msgid "To"
-msgstr ""
-
-#. module: hr_payroll
-#: wizard_button:payroll.analysis,init,process:0
-msgid "Process"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: hr_payroll
-#: wizard_field:wizard.year.salary,init,salary_on:0
-msgid "Salary On"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: rml:hr.payroll.register.sheet:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:salary.structure:0
-msgid "Contract Detail:"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee.grade:0
-msgid "General Information"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-#: field:hr.employee,line_ids:0
-#: view:hr.employee.grade:0
-#: field:hr.employee.grade,line_ids:0
-#: rml:salary.structure:0
-msgid "Salary Structure"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-#: wizard_button:payroll.analysis,init,end:0
-#: wizard_button:wizard.employees.detail,init,end:0
-#: wizard_button:wizard.year.salary,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-#: rml:salary.structure:0
-msgid "Amount / Percentage"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Accounting Details"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:wizard.year.salary,init,salary_on:0
-msgid "Current Month Date"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Contract Duration"
-msgstr ""
-
-#. module: hr_payroll
-#: wizard_view:payroll.analysis,init:0
-msgid "Process Form"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee.grade:0
-msgid "Account Information"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Generalities"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "for period"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:salary.structure:0
-msgid "E-mail"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,line_ids:0
-msgid "Calculations"
-msgstr ""
-
-#. module: hr_payroll
-#: wizard_view:wizard.year.salary,init:0
-msgid "Salary Deposit Date Option?"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee.grade,function_id:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:salary.structure:0
-msgid "PAN No."
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,note:0
-msgid "Description"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,pg_joining:0
-msgid "PF Join Date"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
-msgid "Payroll"
-msgstr ""
-
-#. module: hr_payroll
-#: wizard_view:wizard.employees.detail,init:0
-#: wizard_view:wizard.year.salary,init:0
-msgid "Year Salary"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.wizard,name:hr_payroll.wizard_payroll_analysis
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_payroll_analysis
-msgid "Create Analytic Structure"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payslip.pdf:0
-#: rml:salary.structure:0
-msgid "Address"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.employee,property_bank_account:0
-msgid "Select Bank Account from where Salary Expanse will be Paid"
-msgstr ""
-
-#. module: hr_payroll
-#: help:hr.employee,salary_account:0
-msgid "Expanse account when Salary Expanse will be recorded"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Notes"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.ui.menu,name:hr_payroll.payroll_configure
-msgid "Configure Payroll"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
-#: field:hr.payslip,name:0
-#: field:hr.payslip.line,name:0
-#: rml:salary.structure:0
-#: rml:year.salary:0
-msgid "Name"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leaved Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Statutory Information"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
-msgid "Employee Functions"
-msgstr ""
-
-#. module: hr_payroll
-#: wizard_field:wizard.employees.detail,init,employee_ids:0
-#: wizard_field:wizard.year.salary,init,employee_ids:0
-msgid "Employees"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.employee,property_bank_account:0
-#: rml:payroll.advice:0
-msgid "Bank Account"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr ""
-
-#. module: hr_payroll
-#: wizard_field:wizard.employees.detail,init,fiscalyear_id:0
-#: wizard_field:wizard.year.salary,init,fiscalyear_id:0
-msgid "Fiscal Year"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.employee:0
-msgid "Contract"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:payroll.analysis,init,type:0
-msgid "By Allownce / Deduction"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr ""
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr ""
-
-#. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Bank Details"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Deductions"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr ""
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payroll.advice:0
-msgid "By Sal"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:hr.payroll.register.sheet:0
-msgid "Net SAL"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr ""
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
-msgid "Print Salary Structure"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:payslip.pdf:0
-msgid "Total Deductions"
-msgstr ""
-
-#. module: hr_payroll
-#: rml:employees.salary:0
-#: rml:payroll.advice:0
-#: rml:year.salary:0
-msgid "Total"
-msgstr ""
-
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index c5a94bcc69d..c2f7b686f65 100644
--- a/addons/hr_payroll/i18n/hr_payroll.pot
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -143,7 +143,13 @@ msgid "Set to Draft"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error: %s "
 msgstr ""
@@ -254,7 +260,7 @@ msgid "Amount"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Please check configuration of %s, payroll head is missing"
 msgstr ""
@@ -534,7 +540,8 @@ msgid "#"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:469
+#: code:addons/hr_payroll/hr_payroll.py:1225
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -637,7 +644,13 @@ msgid "To"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
 #, python-format
 msgid "Variable Error !"
 msgstr ""
@@ -683,18 +696,17 @@ msgstr ""
 msgid "Bank Advice Note"
 msgstr ""
 
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
-msgid "Contibution Register"
-msgstr ""
-
 #. module: hr_payroll
 #: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
 msgstr ""
 
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
 #. module: hr_payroll
 #: selection:hr.allounce.deduction.categoty,type:0
 #: selection:hr.payslip.line,type:0
@@ -878,7 +890,6 @@ msgid "For"
 msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
 #: field:hr.passport,contracts_ids:0
 msgid "Contracts"
 msgstr ""
@@ -1213,7 +1224,9 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:company.contribution,register_id:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
 #: model:ir.model,name:hr_payroll.model_hr_contibution_register
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
 msgid "Contribution Register"
 msgstr ""
 
@@ -1499,7 +1512,7 @@ msgid "Payroll Configurtion"
 msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:469
 #, python-format
 msgid "Please define bank account for the %s employee"
 msgstr ""
diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index e47a7bfd870..3fecf454aa1 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -175,22 +175,22 @@
             <para style="terp_default_8">[[ l.employee_id.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.basic) ]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.basic, dp='Account') ]] [[ company.currency_id.symbol]] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.other_pay)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.other_pay, dp='Account')]] [[ company.currency_id.symbol]] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.allounce)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.allounce, dp='Account')]] [[ company.currency_id.symbol]] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.grows)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.grows, dp='Account')]] [[ company.currency_id.symbol]] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.deduction)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.deduction, dp='Account')]] [[ company.currency_id.symbol]] </para>
           </td>
           <td>
-            <para style="terp_default_9_right">[[ formatLang(l.net)]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+            <para style="terp_default_9_right">[[ formatLang(l.net, dp='Account')]] [[ company.currency_id.symbol]] </para>
           </td>
         </tr>
       </blockTable>
@@ -206,22 +206,22 @@
           <para style="terp_tblheader_details">Total Salary</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_basic(o))]][[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_basic(o), dp='Account')]][[ company.currency_id.symbol]] </para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_other(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_other(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_allow(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_allow(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_grows(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_grows(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_deduct(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_deduct(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
         </td>
         <td>
-          <para style="terp_tbleheader_details_right">[[formatLang(get_net(o))]] [[ (company.currency_id and company.currency_id.symbol) or '']] </para>
+          <para style="terp_tbleheader_details_right">[[formatLang(get_net(o), dp='Account')]] [[ company.currency_id.symbol]]</para>
         </td>
       </tr>
     </blockTable>
@@ -259,4 +259,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml
index 1e4e13e3026..26c59391234 100644
--- a/addons/hr_payroll/report/payslip.rml
+++ b/addons/hr_payroll/report/payslip.rml
@@ -392,19 +392,19 @@
           <para style="terp_default_Bold_9">Basic Salary</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ formatLang(o.basic_before_leaves) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
+          <para style="terp_default_9">[[ formatLang(o.basic_before_leaves, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] </para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Leaved Deduction</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ o.leaves or '' ]]</para>
+          <para style="terp_default_9">[[ formatLang(o.leaves, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] </para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Basic Salary – Leaves</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ formatLang(o.basic) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
+          <para style="terp_default_9">[[ formatLang(o.basic, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -433,7 +433,7 @@
             <para style="terp_default_9">[[ ld.code ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(ld.total) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(ld.total, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -463,7 +463,7 @@
                 <para style="terp_default_9">Basic Salary</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(o.basic) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(o.basic, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
               </td>
             </tr>
             <tr>
@@ -471,7 +471,7 @@
                 <para style="terp_default_9">[[repeatIn(get_earnings(o.line_ids),'a') ]] [[ a.code ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(a.total) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
+                <para style="terp_default_Right_9">[[ formatLang(a.total, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
               </td>
             </tr>
           </blockTable>
@@ -488,7 +488,7 @@
                   <para style="terp_default_9">[[ b.code ]]</para>
                 </td>
                 <td>
-                  <para style="terp_default_Right_9">[[ formatLang(b.total) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]] </para>
+                  <para style="terp_default_Right_9">[[ formatLang(b.total, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
                 </td>
               </tr>
             </blockTable>
@@ -508,13 +508,13 @@
           <para style="terp_tblheader_Details">Total Earnings<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.symbol or '' ]])</font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic) ]] [[ o.company_id and o.company_id.currency_id.symbol ]] </para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.allounce + o.basic, dp='Account') ]] [[ o.company_id.currency_id.symbol ]] </para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Total Deductions<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.symbol or '' ]])</font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.deduction, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -542,10 +542,10 @@
             <para style="terp_default_9">[[ ol.code or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total) or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_Right_9">[[ ol.type in ['advance','loan','otherpay'] and formatLang(ol.total, dp='Account') or '' ]] [[ ol.type in ['advance','loan','otherpay'] and o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total) or '' ]] [[ ol.type in ['otherdeduct','installment'] and o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
+            <para style="terp_default_Right_9">[[ ol.type in ['otherdeduct','installment'] and formatLang(ol.total, dp='Account') or '' ]] [[ ol.type in ['otherdeduct','installment'] and o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -561,7 +561,7 @@
           <para style="terp_tblheader_Details">Net Amount<font face="Helvetica" size="7.0">([[ o.company_id and o.company_id.currency_id.symbol or '' ]])</font></para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.net) ]] [[ o.company_id and o.company_id.currency_id.symbol or '' ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.net, dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/hr_payroll/report/report_employees_detail.rml b/addons/hr_payroll/report/report_employees_detail.rml
index 67a49abc4c6..87ec7a3d3d9 100644
--- a/addons/hr_payroll/report/report_employees_detail.rml
+++ b/addons/hr_payroll/report/report_employees_detail.rml
@@ -684,47 +684,47 @@
             <para style="terp_tblheader_Details">[[ get_monthly_total()[0] ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[1], dp='Account')) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2], dp='Account')) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3], dp='Account')) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4], dp='Account')) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5], dp='Account')) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6], dp='Account')) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7], dp='Account')) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8], dp='Account')) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9], dp='Account')) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10], dp='Account']) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11], dp='Account']) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
+          </td>                                                                                           
+          <td>                                                                                            
+            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12], dp='Account']) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[2]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[3]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[4]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[5]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[6]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[7]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[8]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[9]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[10]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[11]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(get_monthly_total()[12]) or removeParentNode('para') ]][[ company.currency_id.symbol ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]][[ company.currency_id.symbol ]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total(), dp='Account') ]][[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
     </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/hr_payroll/report/report_payroll_advice.rml b/addons/hr_payroll/report/report_payroll_advice.rml
index bd1b0c632cd..3e0aa3c0af1 100644
--- a/addons/hr_payroll/report/report_payroll_advice.rml
+++ b/addons/hr_payroll/report/report_payroll_advice.rml
@@ -257,10 +257,10 @@
             <para style="terp_default_9">[[ line['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['amount' ]) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line['amount'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line['bysal']) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line['bysal'], dp='Account') ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_9">[[ line['acc_no'] ]]</para>
@@ -282,10 +282,10 @@
           <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(get_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(get_total(), dp='Account') ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(get_bysal_total(), dp='Account') ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">
@@ -361,4 +361,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml
index 4314b91a552..564e87d04ab 100644
--- a/addons/hr_payroll/report/report_year_report.rml
+++ b/addons/hr_payroll/report/report_year_report.rml
@@ -248,66 +248,66 @@
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[1]!='' and formatLang(e[1], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[2]!='' and formatLang(e[2], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[3]!='' and formatLang(e[3], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[4]!='' and formatLang(e[4], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[5]!='' and formatLang(e[5], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[6]!='' and formatLang(e[6], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[7]!='' and formatLang(e[7], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[8]!='' and formatLang(e[8], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[9]!='' and formatLang(e[9], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[10]!='' and formatLang(e[10], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[11]!='' and formatLang(e[11], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
               <para style="terp_default_Right_8">
-                <font face="Helvetica" size="9.0">[[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
+                <font face="Helvetica" size="9.0">[[ (e[12]!='' and formatLang(e[12], dp='Account')) or removeParentNode('font') ]] [[company.currency_id.symbol]]</font>
               </para>
             </td>
             <td>
-              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13]) ]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13], dp='Account') ]] [[company.currency_id.symbol]]</para>
             </td>
           </tr>
         </blockTable>
@@ -321,47 +321,47 @@
             <para style="terp_tblheader_Details">Total</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[1], dp='Account') or removeParentNode('para') ]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[2], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[3], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[4], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[5], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[6], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[7], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[8], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[9], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[10], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[11], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[12], dp='Account') or removeParentNode('para')]] [[company.currency_id.symbol]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(get_total()) ]] [[company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total(), dp='Account') ]] [[company.currency_id.symbol]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
     </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/hr_payroll/test/hr_payroll_report.yml b/addons/hr_payroll/test/hr_payroll_report.yml
index 35020d30ceb..90866d84cfa 100644
--- a/addons/hr_payroll/test/hr_payroll_report.yml
+++ b/addons/hr_payroll/test/hr_payroll_report.yml
@@ -1,6 +1,6 @@
 -
   In order to test the PDF reports defined on HR Payroll, we will print Employees' Salary Structure
-- 
+-
   !python {model: hr.employee}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.salary.structure').create(cr, uid, [ref('hr_payroll.hr_employee_bonamy0')], {}, {})
@@ -9,7 +9,7 @@
 
 -
   Print HR Payslip
-- 
+-
   !python {model: hr.payslip}: |
     import netsvc, tools, os
     (data, format) = netsvc.LocalService('report.payslip.pdf').create(cr, uid, [ref('hr_payroll.hr_payslip_salaryslipofbonamyforjune0')], {}, {})
@@ -17,23 +17,25 @@
         file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-payslip_report.'+format), 'wb+').write(data)
 
 -
-  Print HR Employee Salary Details
+  Print Employee Salary Statement through wizard
 -
   !python {model: hr.payslip}: |
-    import netsvc, tools, os, time
-    emp_ids = [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'employee_ids': emp_ids, 'ids':emp_ids }}
-    (data, format) = netsvc.LocalService('report.employees.salary').create(cr, uid, [], data_dict, {'active_ids': emp_ids})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_salary_detail_report.'+format), 'wb+').write(data)
--
-  Print HR Employee Salary Details Annual basis
--
-  !python {model: hr.payslip}: |
-    import netsvc, tools, os, time
-    emp_ids = [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')]
-    data_dict = {'model': 'hr.payslip', 'form': {'fiscalyear_id': ref('account.data_fiscalyear'), 'salary_on': 'current_month', 'employee_ids': emp_ids, 'ids':emp_ids}}
-    (data, format) = netsvc.LocalService('report.year.salary').create(cr, uid, [], data_dict,{'active_ids': emp_ids} )
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_payroll-employee_yearly_salary_detail_report.'+format), 'wb+').write(data)
+    import time
+    ctx={}
+    ctx.update({'model': 'hr.employee','active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')]})
+    data_dict = {'employee_ids': [(6,0,[ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')])], 'date_from': time.strftime('%Y-01-01'), 'date_to': time.strftime('%Y-%m-%d')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_hr_payroll_employees_detail',wiz_data=data_dict, context=ctx, our_module='hr_payroll')
+
+-
+  Print Salary Register through wizard
+-
+  !python {model: hr.payslip}: |
+    import time
+    ctx={}
+    ctx.update({'model': 'hr.payslip','active_ids': [ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')]})
+    data_dict = {'employee_ids': [(6,0,[ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3'),ref('hr_payroll.hr_employee_bonamy0')])], 'date_from': time.strftime('%Y-01-01'), 'date_to': time.strftime('%Y-%m-%d')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_hr_payroll_year_salary',wiz_data=data_dict, context=ctx, our_module='hr_payroll')
+
 
diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
index 2bb36b6f282..2cb14a53f82 100644
--- a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
+++ b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py
@@ -59,10 +59,10 @@ class hr_payroll_employees_detail(osv.osv_memory):
         if context is None:
             context = {}
         datas = {'ids': context.get('active_ids', [])}
-
         res = self.read(cr, uid, ids, ['employee_ids', 'date_from', 'date_to'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
+        datas['ids'] = res.get('employee_ids',[])
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'employees.salary',
@@ -71,4 +71,4 @@ class hr_payroll_employees_detail(osv.osv_memory):
 
 hr_payroll_employees_detail()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
index 41caf5f4109..cb7d73b6394 100644
--- a/addons/hr_payroll/wizard/hr_payroll_year_salary.py
+++ b/addons/hr_payroll/wizard/hr_payroll_year_salary.py
@@ -64,6 +64,7 @@ class hr_payroll_year_salary(osv.osv_memory):
         res = self.read(cr, uid, ids, ['employee_ids',  'date_from', 'date_to', 'salary_on'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
+        datas['ids'] = res.get('employee_ids',[])
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'year.salary',
@@ -72,4 +73,4 @@ class hr_payroll_year_salary(osv.osv_memory):
 
 hr_payroll_year_salary()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index adf1fada169..4668827ef89 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -64,7 +64,7 @@ class hr_employee(osv.osv):
             method=True,
             domain="[('type', '=', 'liquidity')]",
             view_load=True,
-            help="Select Bank Account from where Salary Expanse will be Paid"),
+            help="Select Bank Account from where Salary Expense will be Paid"),
         'salary_account':fields.property(
             'account.account',
             type='many2one',
@@ -73,7 +73,7 @@ class hr_employee(osv.osv):
             method=True,
             domain="[('type', '=', 'other')]",
             view_load=True,
-            help="Expanse account when Salary Expanse will be recorded"),
+            help="Expense account when Salary Expense will be recorded"),
         'employee_account':fields.property(
             'account.account',
             type='many2one',
@@ -99,7 +99,7 @@ class payroll_register(osv.osv):
     _description = 'Payroll Register'
 
     _columns = {
-        'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+        'journal_id': fields.many2one('account.journal', 'Expense Journal'),
         'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
     }
@@ -213,7 +213,7 @@ class hr_payslip(osv.osv):
     _description = 'Pay Slip'
 
     _columns = {
-        'journal_id': fields.many2one('account.journal', 'Expanse Journal'),
+        'journal_id': fields.many2one('account.journal', 'Expense Journal'),
         'bank_journal_id': fields.many2one('account.journal', 'Bank Journal'),
         'move_ids':fields.one2many('hr.payslip.account.move', 'slip_id', 'Accounting vouchers'),
         'move_line_ids':fields.many2many('account.move.line', 'payslip_lines_rel', 'slip_id', 'line_id', 'Accounting Lines', readonly=True),
@@ -256,6 +256,10 @@ class hr_payslip(osv.osv):
         period_pool = self.pool.get('account.period')
 
         for slip in self.browse(cr, uid, ids, context=context):
+            if not slip.bank_journal_id or not slip.journal_id:
+                # Call super method to process sheet if journal_id or bank_journal_id are not specified.
+                super(hr_payslip, self).process_sheet(cr, uid, [slip.id], context=context)
+                continue
             line_ids = []
             partner = False
             partner_id = False
@@ -332,7 +336,7 @@ class hr_payslip(osv.osv):
                     name = '[%s]-%s' % (slip.number, line.name)
                     invoice_pool.pay_and_reconcile(cr, uid, invids, amount, acc_id, period_id, journal_id, False, period_id, False, context, name)
                     other_pay -= amount
-                    #TODO: link this account entries to the Payment Lines also Expanse Entries to Account Lines
+                    #TODO: link this account entries to the Payment Lines also Expense Entries to Account Lines
                     l_ids = movel_pool.search(cr, uid, [('name','=',name)], context=context)
                     line_ids += l_ids
 
@@ -411,6 +415,10 @@ class hr_payslip(osv.osv):
         payslip_pool = self.pool.get('hr.payslip.line')
 
         for slip in self.browse(cr, uid, ids, context=context):
+            if not slip.journal_id:
+                # Call super method to verify sheet if journal_id is not specified.
+                super(hr_payslip, self).verify_sheet(cr, uid, [slip.id], context=context)
+                continue
             total_deduct = 0.0
 
             line_ids = []
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 04fe9aa73ea..e62d2aecba3 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -2,40 +2,6 @@
 <openerp>
     <data>
 
-        <record id="hr_hr_employee_view_form2_inherit_2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2.inherit_1</field>
-            <field name="model">hr.employee</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Salary Structure']" position="after">
-                    <page string="Accounting">
-                        <field name="property_bank_account" required="1"/>
-                        <field name="salary_account" required="1"/>
-                        <field name="employee_account" required="1"/>
-                        <field name="analytic_account"/>
-                        <field name="slip_ids" colspan="4" nolabel="1"/>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="hr_hr_employee_view_form2_inherit_1" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2.inherit</field>
-            <field name="model">hr.employee</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
-            <field name="arch" type="xml">
-                <xpath expr="/form/notebook/page[@string='Salary Structure']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-                   <field name="account_id"/>
-                   <field name="analytic_account_id"/>
-                </xpath>
-                <xpath expr="/form/notebook/page[@string='Salary Structure']/field[@name='line_ids']/form/group/field[@name='code']" position="after">
-                   <field name="account_id"/>
-                   <field name="analytic_account_id"/>
-                </xpath>
-            </field>
-        </record>
 
         <record model="ir.ui.view" id="view_holiday_status_inherit_form1">
             <field name="name">hr.holidays.status.inherit1</field>
diff --git a/addons/hr_payroll_account/i18n/de.po b/addons/hr_payroll_account/i18n/de.po
index 73977a47f4d..658f2efead3 100644
--- a/addons/hr_payroll_account/i18n/de.po
+++ b/addons/hr_payroll_account/i18n/de.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-09 08:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 10:20+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll_account
@@ -95,6 +96,7 @@ msgstr "Bestätigen Sie alle Spesenrechnungen zwecks Erstattung"
 #, python-format
 msgid "Please defined partner in bank account for %s !"
 msgstr ""
+"Bitte definieren Sie den Geschäftspartner für die Bankkontodaten von %s !"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -105,7 +107,7 @@ msgstr "Finanzen Informationen"
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please defined bank account for %s !"
-msgstr ""
+msgstr "Bitte definieren Sie ein Bankkonto für %s !"
 
 #. module: hr_payroll_account
 #: model:ir.module.module,description:hr_payroll_account.module_meta_information
@@ -116,6 +118,11 @@ msgid ""
 "    * Comany Contribution Managemet\n"
 "    "
 msgstr ""
+"Basis Personalabrechnung mit integrierter Personalbuchhaltung.\n"
+"    * Aufwandserfassung Arbeitszeiten\n"
+"    * Lohn- und Gehaltszahlung an Mitarbeiter\n"
+"    * Verwaltung von Arbeitsgeberanteilen.\n"
+"    "
 
 #. module: hr_payroll_account
 #: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
@@ -148,6 +155,7 @@ msgstr "Aufwandskonto, welches gebucht wird bei Vergütungsabrechnung"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -186,6 +194,8 @@ msgstr "Buchungsbelege"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_payroll_account
 #: help:hr.payroll.register,period_id:0
@@ -256,7 +266,7 @@ msgstr "Abwesenheitstyp"
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
-msgstr ""
+msgstr "Geschäftsjahr wurde für die Abrechnung %s nicht definiert"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register,analytic_account_id:0
@@ -297,7 +307,7 @@ msgstr "Jahr"
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Period is not defined for slip date %s"
-msgstr ""
+msgstr "Die Periode wurde nicht für das Abrechnungsdatum %s definiert."
 
 #. module: hr_payroll_account
 #: view:hr.employee:0
diff --git a/addons/hr_payroll_account/i18n/es.po b/addons/hr_payroll_account/i18n/es.po
index 36d6d7b78f0..7e082eb8386 100644
--- a/addons/hr_payroll_account/i18n/es.po
+++ b/addons/hr_payroll_account/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:24+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 12:37+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-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll_account
@@ -27,7 +26,7 @@ msgstr "Movimientos contables"
 #: field:hr.payroll.register,bank_journal_id:0
 #: field:hr.payslip,bank_journal_id:0
 msgid "Bank Journal"
-msgstr ""
+msgstr "Diario bancario"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
@@ -47,17 +46,17 @@ msgstr "Cuenta analítica para análisis de nóminas"
 #. module: hr_payroll_account
 #: field:hr.contibution.register.line,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Empleado"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Other Informations"
-msgstr ""
+msgstr "Otra información"
 
 #. module: hr_payroll_account
 #: field:hr.payroll.register,journal_id:0
@@ -73,7 +72,7 @@ msgstr "Cuenta de nómina"
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
 msgid "Payroll Register"
-msgstr ""
+msgstr "Registro de nóminas"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
@@ -83,7 +82,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -95,18 +94,18 @@ msgstr ""
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please defined partner in bank account for %s !"
-msgstr ""
+msgstr "¡ Por favor, defina la empresa de la cuenta bancaria para %s !"
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Accounting Informations"
-msgstr ""
+msgstr "Información contable"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Please defined bank account for %s !"
-msgstr ""
+msgstr "¡ Por favor, defina la cuenta bancaria para %s !"
 
 #. module: hr_payroll_account
 #: model:ir.module.module,description:hr_payroll_account.module_meta_information
@@ -127,7 +126,7 @@ msgstr ""
 #: view:hr.payslip:0
 #: field:hr.payslip,move_payment_ids:0
 msgid "Payment Lines"
-msgstr ""
+msgstr "Líneas de pago"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -149,7 +148,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 
 #. module: hr_payroll_account
 #: view:hr.payslip:0
@@ -161,17 +160,17 @@ msgstr ""
 #: field:hr.holidays.status,account_id:0
 #: field:hr.payroll.advice,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Cuenta"
 
 #. module: hr_payroll_account
 #: field:hr.employee,property_bank_account:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Cuenta bancaria"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
@@ -188,6 +187,8 @@ msgstr "Recibos contables"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"¡Error! No puede seleccionar un departamento para el cual el empleado sea el "
+"director."
 
 #. module: hr_payroll_account
 #: help:hr.payroll.register,period_id:0
@@ -198,7 +199,7 @@ msgstr ""
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
 msgid "Bank Advice Note"
-msgstr ""
+msgstr "Observación aviso bancario"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,move_id:0
@@ -214,27 +215,27 @@ msgstr "Recibos contables"
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: hr_payroll_account
 #: field:hr.employee,employee_account:0
 msgid "Employee Account"
-msgstr ""
+msgstr "Cuenta empleado"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.line,account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Cuenta general"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register,yearly_total_by_emp:0
 msgid "Total By Employee"
-msgstr ""
+msgstr "Total por empleado"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: hr_payroll_account
 #: field:hr.payslip.account.move,slip_id:0
@@ -246,12 +247,12 @@ msgstr ""
 #: field:hr.payroll.register,period_id:0
 #: field:hr.payslip,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Forzar período"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
 msgid "Leave Type"
-msgstr ""
+msgstr "Tipo de ausencia"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
@@ -266,22 +267,22 @@ msgstr ""
 #: field:hr.payroll.structure,account_id:0
 #: field:hr.payslip.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Cuenta analítica"
 
 #. module: hr_payroll_account
 #: help:hr.employee,employee_account:0
 msgid "Employee Payable Account"
-msgstr ""
+msgstr "Cuenta a pagar del empleado"
 
 #. module: hr_payroll_account
 #: field:hr.contibution.register,yearly_total_by_comp:0
 msgid "Total By Company"
-msgstr ""
+msgstr "Total por compañía"
 
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
 msgid "Salary Structure"
-msgstr ""
+msgstr "Estructura salarial"
 
 #. module: hr_payroll_account
 #: code:addons/hr_payroll_account/hr_payroll_account.py:0
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index 6953f24bffa..64882a8c921 100644
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -41,6 +41,12 @@ msgstr ""
 msgid "Analytic Account for Salary Analysis"
 msgstr ""
 
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr ""
+
 #. module: hr_payroll_account
 #: field:hr.contibution.register.line,period_id:0
 msgid "Period"
@@ -57,14 +63,13 @@ msgid "Other Informations"
 msgstr ""
 
 #. module: hr_payroll_account
-#: field:hr.payroll.register,journal_id:0
-#: field:hr.payslip,journal_id:0
-msgid "Expanse Journal"
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
 msgstr ""
 
 #. module: hr_payroll_account
-#: field:hr.employee,salary_account:0
-msgid "Salary Account"
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
 msgstr ""
 
 #. module: hr_payroll_account
@@ -83,13 +88,13 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
 #, python-format
 msgid "Please defined partner in bank account for %s !"
 msgstr ""
@@ -100,7 +105,12 @@ msgid "Accounting Informations"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
 #, python-format
 msgid "Please defined bank account for %s !"
 msgstr ""
@@ -126,19 +136,16 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
 
 #. module: hr_payroll_account
-#: help:hr.employee,property_bank_account:0
-msgid "Select Bank Account from where Salary Expanse will be Paid"
-msgstr ""
-
-#. module: hr_payroll_account
-#: help:hr.employee,salary_account:0
-msgid "Expanse account when Salary Expanse will be recorded"
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll_account
@@ -205,7 +212,13 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -230,12 +243,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: hr_payroll_account
-#: field:hr.payslip.account.move,slip_id:0
-#: model:ir.model,name:hr_payroll_account.model_hr_payslip
-msgid "Pay Slip"
-msgstr ""
-
 #. module: hr_payroll_account
 #: field:hr.payroll.register,period_id:0
 #: field:hr.payslip,period_id:0
@@ -248,7 +255,8 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -278,7 +286,7 @@ msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -289,29 +297,28 @@ msgid "Year"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
 
-#. module: hr_payroll_account
-#: view:hr.employee:0
-msgid "Accounting"
-msgstr ""
-
 #. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
diff --git a/addons/hr_payroll_account/i18n/it.po b/addons/hr_payroll_account/i18n/it.po
new file mode 100644
index 00000000000..b80c143ca80
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/it.po
@@ -0,0 +1,324 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+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: 2011-01-01 17:08+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: 2011-01-02 05:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr "Periodo"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "Impiegato"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr "Altre informazioni"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expanse Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr "Conto stipendio"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr "Descrizione"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+"Per favore confermare tutte le fatture di spesa che compaiono nei rimborsi"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr "Per favore definire il conto banca per %s!"
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+"    * Expanse Encoding\n"
+"    * Payment Encoding\n"
+"    * Comany Contribution Managemet\n"
+"    "
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expanse will be Paid"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expanse account when Salary Expanse will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Errore! Non è possibile creare gerarchie ricorsive di impiegati."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr "Conto"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "Conto bancario"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Errore! Non è possibile selezionare un reparto per il quale l'impiegato è "
+"manager."
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr "Voce di spesa"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Attenzione!"
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr "Contabilità Generale"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr "Totale per impiegato"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr "Tipo di permesso"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Conto Analitico"
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr "Struttura stipendio"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr "Anno"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.employee:0
+msgid "Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr "Errore di Integrità!"
diff --git a/addons/hr_payroll_account/security/ir.model.access.csv b/addons/hr_payroll_account/security/ir.model.access.csv
index d71b8404a12..32f98a3a9ff 100644
--- a/addons/hr_payroll_account/security/ir.model.access.csv
+++ b/addons/hr_payroll_account/security/ir.model.access.csv
@@ -1,2 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_payslip_account_move_user","access.hr.payslip.account.move.user","model_hr_payslip_account_move","base.group_user",1,0,0,0
+"access_hr_payslip_user","access.hr.payslip.user","model_hr_payslip","base.group_user",1,0,0,0
+"access_hr_payslip_line_user","access.hr.payslip.line.user","model_hr_payslip_line","base.group_user",1,0,0,0
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 0cf34e36de4..fee3e4e8b78 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -38,7 +38,7 @@
           </xpath>
         </field>
     </record>
-    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0" groups="base.group_hr_manager,base.group_hr_user"/>
+    <menuitem id="base.menu_hr_dasboard" name="Dashboard" parent="hr.menu_hr_reporting" sequence="0"/>
     <menuitem
         action="hr.open_board_hr_manager"
         icon="terp-graph"
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 7c158bb8795..2e941877b65 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -10,6 +10,7 @@
             <field name="view_id" ref="crm_case_tree_view_job"/>
             <field name="context">{"search_default_user_id":uid, 'search_default_current': 1,"search_default_department_id": department_id}</field>
             <field name="search_view_id" ref="view_crm_case_jobs_filter"/>
+            <field name="help">From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content.</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_hr_sec_tree_view_act_job">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index e3955002c26..3738a1d8be6 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -23,11 +23,12 @@
     # Stage
     # ------------------------------------------------------
     <record id="hr_job_stage_act" model="ir.actions.act_window">
-        <field name="name">Applicant Stages</field>
+        <field name="name">Recruitment / Applicants Stages</field>
         <field name="res_model">hr.recruitment.stage</field>
         <field name="view_type">form</field>
         <field name="domain">[]</field>
         <field name="context">{}</field>
+        <field name="help">Define here your stages of the recruitment process, for example: qualification call, first interview, second interview, refused, hired.</field>
     </record>
 
 
diff --git a/addons/hr_recruitment/i18n/es.po b/addons/hr_recruitment/i18n/es.po
index b7a815bf87c..7d482bb1025 100644
--- a/addons/hr_recruitment/i18n/es.po
+++ b/addons/hr_recruitment/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:27+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 07:47+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-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_recruitment
@@ -64,7 +63,7 @@ msgstr "Fecha próxima acción"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Jobs"
-msgstr ""
+msgstr "Trabajos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,company_id:0
@@ -81,7 +80,7 @@ msgstr "Email de los observadores"
 #. module: hr_recruitment
 #: field:hr.recruitment.partner.create,close:0
 msgid "Close job request"
-msgstr ""
+msgstr "Cerrar petición de trabajo"
 
 #. module: hr_recruitment
 #: field:hr.applicant,day_open:0
@@ -96,7 +95,7 @@ msgstr "Objetivos"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,partner_address_id:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Nombre contacto de empresa"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -109,7 +108,7 @@ msgstr "Crear empresa"
 #: view:hr.recruitment.report:0
 #: field:hr.recruitment.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -144,28 +143,28 @@ msgstr "Próximas acciones"
 #. module: hr_recruitment
 #: model:crm.case.categ,name:hr_recruitment.categ_job2
 msgid "Junior Developer"
-msgstr ""
+msgstr "Desarrollador junior"
 
 #. module: hr_recruitment
 #: field:hr.applicant,job_id:0
 #: field:hr.recruitment.report,job_id:0
 msgid "Applied Job"
-msgstr ""
+msgstr "Trabajo solicitado"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
 msgid "Graduate"
-msgstr ""
+msgstr "Diplomado/Licenciado"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
 msgid "Initial Jobs Demand"
-msgstr ""
+msgstr "Demanda inicial de trabajos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contacto empresa"
 
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
@@ -182,7 +181,7 @@ msgstr "Estatus del candidato"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "My Recruitment"
-msgstr ""
+msgstr "Mi proceso de selección"
 
 #. module: hr_recruitment
 #: field:hr.applicant,title_action:0
@@ -197,7 +196,7 @@ msgstr "Proceso de selección"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop:0
 msgid "Salary Proposed"
-msgstr ""
+msgstr "Salario propuesto"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_id:0
@@ -209,7 +208,7 @@ msgstr "Empresa"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Avg Proposed Salary"
-msgstr ""
+msgstr "Salario propuesto promedio"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -247,7 +246,7 @@ msgstr "Siguiente"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Descripción del trabajo"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -317,7 +316,7 @@ msgstr "Apreciación"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Job"
-msgstr ""
+msgstr "Trabajo"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -336,13 +335,13 @@ msgstr "Segunda entrevista"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_exp:0
 msgid "Salary Expected"
-msgstr ""
+msgstr "Salario esperado"
 
 #. module: hr_recruitment
 #: field:hr.applicant,salary_expected:0
 #: view:hr.recruitment.report:0
 msgid "Expected Salary"
-msgstr ""
+msgstr "Salario esperado"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -352,7 +351,7 @@ msgstr "Julio"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Subject"
-msgstr ""
+msgstr "Asunto"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -426,7 +425,7 @@ msgstr "En curso"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Trabajos - Formulario selección"
 
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
@@ -446,12 +445,12 @@ msgstr "Diciembre"
 #. module: hr_recruitment
 #: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
 msgid "HR - Recruitement"
-msgstr ""
+msgstr "RRHH - Reclutamiento"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Job Info"
-msgstr ""
+msgstr "Información del trabajo"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
@@ -477,7 +476,7 @@ msgstr "Comercial"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Search Jobs"
-msgstr ""
+msgstr "Buscar trabajos"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,category_id:0
@@ -498,7 +497,7 @@ msgstr "Muy bueno"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "# Cases"
-msgstr ""
+msgstr "Nº casos"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date_open:0
@@ -519,7 +518,7 @@ msgstr "En proceso"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Reset to New"
-msgstr ""
+msgstr "Reestablecer a nuevo"
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_expected:0
@@ -556,7 +555,7 @@ msgstr "Respuesta"
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_close:0
 msgid "Avg. Delay to Close"
-msgstr ""
+msgstr "Retraso prom. hasta cierre"
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed:0
@@ -604,7 +603,7 @@ msgstr "Teléfono"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC global"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -665,7 +664,7 @@ msgstr "Respuesta"
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
 msgid "Licenced"
-msgstr ""
+msgstr "Licenciado"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -677,7 +676,7 @@ msgstr "Salario promedio propuesto"
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
 msgid "Schedule Phone Call"
-msgstr ""
+msgstr "Planificar llamada telefónica"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -693,7 +692,7 @@ msgstr "Estas personas recibirán un email."
 #: selection:hr.applicant,priority:0
 #: selection:hr.recruitment.report,priority:0
 msgid "Not Good"
-msgstr ""
+msgstr "No bueno"
 
 #. module: hr_recruitment
 #: field:hr.applicant,date:0
@@ -754,7 +753,7 @@ msgstr "Abierto"
 #: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr ""
+msgstr "Ya existe una empresa con ese nombre."
 
 #. module: hr_recruitment
 #: help:hr.recruitment.degree,sequence:0
@@ -809,7 +808,7 @@ msgstr "Casos por etapa y estimaciones"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Reply"
-msgstr ""
+msgstr "Responder"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -872,7 +871,7 @@ msgstr "En promedio"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
 msgid "Degree of Recruitment"
-msgstr ""
+msgstr "Progreso del proceso de selección"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index dbac449f470..1b72377eeec 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:15+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:15+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:40+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:40+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -217,7 +217,7 @@ msgid "Previous"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
 #: view:hr.applicant:0
 #, python-format
 msgid "Phone Call"
@@ -249,7 +249,7 @@ msgid "Send New Email"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
 #, python-format
 msgid "A partner is already defined on this job request."
 msgstr ""
@@ -284,11 +284,17 @@ msgid "Good"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
 #, python-format
 msgid "Error !"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid "Define here your stages of the recruitment process, for example: qualification call, first interview, second interview, refused, hired."
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 #: field:hr.applicant,create_date:0
@@ -699,6 +705,11 @@ msgstr ""
 msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
 
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid "From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content."
+msgstr ""
+
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "History"
@@ -739,7 +750,7 @@ msgid "Open"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
 #, python-format
 msgid "A partner is already existing with the same name."
 msgstr ""
@@ -829,7 +840,7 @@ msgid "Refused"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:0
+#: code:addons/hr_recruitment/hr_recruitment.py:412
 #, python-format
 msgid "Applicant '%s' is being hired."
 msgstr ""
@@ -902,7 +913,7 @@ msgid "Assign To"
 msgstr ""
 
 #. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:0
+#: code:addons/hr_recruitment/hr_recruitment.py:396
 #, python-format
 msgid "The job request '%s' has been set 'in progress'."
 msgstr ""
diff --git a/addons/hr_recruitment/i18n/it.po b/addons/hr_recruitment/i18n/it.po
new file mode 100644
index 00000000000..813477b090f
--- /dev/null
+++ b/addons/hr_recruitment/i18n/it.po
@@ -0,0 +1,943 @@
+# Italian 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: 2011-01-01 17:07+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: 2011-01-02 05:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+"Se il campo attivo è impostato su \"falso\", vi permetterà di nascondere il "
+"caso senza rimuoverlo."
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr "Assunzioni"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Ritardo medio di apertura"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr "# di Casi"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr "Dipartimento"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr "Data prossima azione"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr "Lavori"
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr "Company"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email osservatori"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr "Obiettivi"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr "Giorno"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr "Aggiungi nota interna"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr "Cellulare"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr "Messaggi"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr "Prossima azione"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr "Sviluppatore Junior"
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr "Laureato"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contatto del partner"
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr "Le mie assunzioni"
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr "Prossima azione"
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr "Assunzioni"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr "Stipendio medio proposto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr "Disponibilità"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr "Precedente"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr "Telefonata"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr "Converti a partner"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr "Statistiche assunzioni"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr "Prossimo"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr "Descrizione lavoro"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr "Invia nuova email"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr "Un partner è già definito su questa richiesta di lavoro."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr "Disponibilità (giorni)"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr "Buono"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "Error !"
+msgstr "Errore!"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr "Data creazione"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr "Data pianificata"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr "Lavoro"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr "Fase"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr "Seconda intervista"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr "Stipendio previsto"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr "Stipendio previsto"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr "Luglio"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr "Oggetto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr "Candidati"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "    Month-1    "
+msgstr "    Mese-1    "
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr "Candidato"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr "Fornisce l'ordinamento quando è visualizzata la lista delle fasi-"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr "Contatto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr "Qualifica"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr "Fase dell'assunzione"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr "Fasi"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr "In corso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr "Probabililtà"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr "Settembre"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr "Dicembre"
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr "HR - Assunzioni"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr "Info lavoro"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Prima intervista"
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr "Stipendio Proposto"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr "Commerciale"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Cerca lavori"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr "Categoria"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr "Nome candidato"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr "Molto Buono"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr "# Casi"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr "Raggruppa per ..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr "In corso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr "Salario previsto per candidato"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Questi indirizzi email verranno aggiunti nel campo CC di tutte le email, in "
+"entrate e uscita, prima di essere spedite. E' necessario separare gli "
+"indirizzi con una virgola"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr "Definizione fase"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr "Riunione"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr "In sospeso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr "Grado"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefono"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr "CC globale"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr "Ottobre"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr "Giugno"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr "Fasi candidato"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr "Rifiutato dalla società"
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr "Giorni per la chiusura"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr "Utente"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr "Eccellente"
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr "Attivo"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr "Novembre"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr "Filtri estesi..."
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr "Stipendio medio proposto"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr "Pianifica telefonata"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr "Gennaio"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr "Queste persone riceveranno email."
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr "Non buono"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr "Descrizione telefonata"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+"Sei sicuro di volere creare un partner basandosi su questa richiesta lavoro?"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr "Storico"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr "Allegati"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr "Contratto proposto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr "Stato"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr "Categorie candidato"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr "Un partner esiste già con lo stesso nome."
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr "Responsabile"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr "Analisi assunzione"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr "Attuale"
+
+#. module: hr_recruitment
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid ""
+"\n"
+"Manages job positions and the recruitement process. It's integrated with "
+"the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks "
+"email\n"
+"sent to jobs@YOURCOMPANY.com. It's also integrated with the document "
+"management\n"
+"system to store and search in your CV base.\n"
+"    "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr "Dettagli"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr "Casi per fasi e stime"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr "Rispondi"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr "Intervista"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr "Descrizione"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr "Maggio"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr "Contratto firmato"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr "Rifiutato"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr "Il candidato \"%s\" è stato assunto."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr "Assunto"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Emails"
+msgstr "Email"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr "Febbraio"
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Aprile"
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr "Assegnato a"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr "La richiesta lavoro \"%s\" è stata impostata a \"in corso\"."
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr "Anno"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr "Sondaggio"
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 3ba27af9228..5234e933813 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -21,6 +21,8 @@
 import tools
 from osv import fields,osv
 from hr_recruitment import hr_recruitment
+from decimal_precision import decimal_precision as dp
+
 
 AVAILABLE_STATES = [
     ('draft','New'),
@@ -56,9 +58,9 @@ class hr_recruitment_report(osv.osv):
         'type_id': fields.many2one('hr.recruitment.degree', 'Degree'),
         'department_id': fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
-        'salary_prop': fields.float("Salary Proposed"),
-        'salary_prop_avg': fields.float("Avg Salary Proposed", group_operator="avg"),
-        'salary_exp': fields.float("Salary Expected"),
+        'salary_prop' : fields.float("Salary Proposed", digits_compute=dp.get_precision('Account')),
+        'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg", digits_compute=dp.get_precision('Account')),
+        'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
         'available': fields.float("Availability"),
@@ -66,7 +68,6 @@ class hr_recruitment_report(osv.osv):
                                        help="Number of Days to close the project issue"),
         'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
-
     }
     _order = 'date desc'
     def init(self, cr):
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 5e343a40fa0..948c0aa0c47 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -7,3 +7,5 @@
 "access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
 "access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
 "access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
+"access_crm_phonecall_hruser","crm.phonecall hruser","crm.model_crm_phonecall","base.group_hr_user",1,1,1,1
+"access_crm_meeting_hruser","crm.meeting.hruser","crm.model_crm_meeting","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 9cfbf0c992c..131148f373a 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -102,7 +102,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <page string="Categories" position="after">
-                    <page string="Timesheets">
+                    <page string="Timesheets" groups="base.group_hr_user">
                         <field name="product_id" domain="[('type','=','service')]"/>
                         <field name="journal_id" widget="selection"/>
                     </page>
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index e33261d83fc..99c62628175 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:43+0000\n"
+"PO-Revision-Date: 2010-12-29 13:04+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -143,6 +143,8 @@ msgstr "kürzlich erledigte Arbeit"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Fehler ! Sie können keine Abteilung auswählen, für die dieser Mitarbeiter "
+"die Leitung ausübt."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -291,6 +293,25 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung bietet in Ergänzung zur reinen Anwesenheit auch eine "
+"tabellarische Arbeitszeiterfassung ein. Jeder Mitarbeiter kann hierbei seine "
+"gearbeitetete Arbeitszeit nicht nur generell durch die Anwesenheit und "
+"Abwesenheit erfassen, sondern auch indivduell für Projekt, Aufgabe oder "
+"Konto Zeiten erfassen. Durch ein Projekt wird grundsätzlich auch ein "
+"analytische Konto angelegt auf welches diese Zeiten dann gebucht wurden.\n"
+"\n"
+"Es werden zahlreiche Auswertungen als Erweiterung für dieses Modul "
+"angeboten.\n"
+"\n"
+"Diese Anwendung ist vollständig mit den Finanz- und Kostenmodulen integriert "
+"und ermöglicht eine\n"
+"vorgangsbezogene Buchung von Zeiten.\n"
+"\n"
+"Es wurde eine vollständige Integration mit den Modulen der Finanzbuchhaltung "
+"und den Kostenmodulen\n"
+"vorgenommen.Sie können das Modul einfach per Modul\n"
+"    "
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -448,6 +469,7 @@ msgstr "November"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index 5b718dc88bc..9f7d4e83072 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 08:06+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 07:19+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-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -43,7 +42,7 @@ msgstr "¡No se ha definido un empleado para su usuario!"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -57,7 +56,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Today"
-msgstr ""
+msgstr "Hoy"
 
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
@@ -133,6 +132,8 @@ msgstr "Trabajo realizado en el último período"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"¡Error! No puede seleccionar un departamento para el cual el empleado sea el "
+"director."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -144,7 +145,7 @@ msgstr "Estado actual"
 #: field:hr.sign.in.project,name:0
 #: field:hr.sign.out.project,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Nombre empleados"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
@@ -155,7 +156,7 @@ msgstr ""
 #: code:addons/hr_timesheet/hr_timesheet.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
@@ -185,7 +186,7 @@ msgstr "Cuenta analítica"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
@@ -256,7 +257,7 @@ msgstr "Fecha de inicio"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Categorías"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -418,7 +419,7 @@ msgstr "marzo"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -430,7 +431,7 @@ msgstr "Noviembre"
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
@@ -477,7 +478,7 @@ msgstr ""
 #: field:hr.sign.in.project,emp_id:0
 #: field:hr.sign.out.project,emp_id:0
 msgid "Employee ID"
-msgstr ""
+msgstr "ID empleado"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -526,13 +527,13 @@ msgstr "febrero"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Information"
-msgstr ""
+msgstr "Información"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.employee,employee_id:0
 #: model:ir.model,name:hr_timesheet.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Empleado"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -549,7 +550,7 @@ msgstr "Fecha actual"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Anlytic account"
-msgstr ""
+msgstr "Cuenta analítica"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -565,7 +566,7 @@ msgstr "Producto"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturación"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -622,7 +623,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -685,12 +686,12 @@ msgstr "Año"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilidad"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner Id"
-msgstr ""
+msgstr "Id empresa"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index e75c386eb79..3e9e588ee6c 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:16+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:16+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:41+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgid "Service on Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Wed"
 msgstr ""
@@ -33,7 +33,7 @@ msgid "(Keep empty for current_time)"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "No employee defined for your user !"
 msgstr ""
@@ -87,8 +87,8 @@ msgid "janvier"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Mon"
 msgstr ""
@@ -141,26 +141,28 @@ msgid "Print Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#: code:addons/hr_timesheet/hr_timesheet.py:176
 #, python-format
 msgid "Warning !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "UserError"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #, python-format
 msgid "No cost unit defined for this employee !"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Tue"
 msgstr ""
@@ -171,7 +173,7 @@ msgid "Analytic Account"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -188,24 +190,19 @@ msgid "Sign In/Out By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Sat"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Sun"
 msgstr ""
 
-#. module: hr_timesheet
-#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
-msgid "Working Hours allows you to log your working hours by project every day."
-msgstr ""
-
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 #: view:hr.analytical.timesheet.users:0
@@ -229,8 +226,8 @@ msgid "Monthly Employees Timesheet"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "July"
 msgstr ""
@@ -252,6 +249,11 @@ msgstr ""
 msgid "novembre"
 msgstr ""
 
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid "Through Working Hours you can register your working hours by project every day."
+msgstr ""
+
 #. module: hr_timesheet
 #: model:ir.module.module,description:hr_timesheet.module_meta_information
 msgid "\n"
@@ -268,8 +270,8 @@ msgid "\n"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "March"
 msgstr ""
@@ -286,8 +288,8 @@ msgid "décembre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "September"
 msgstr ""
@@ -332,13 +334,12 @@ msgstr ""
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Fri"
 msgstr ""
@@ -349,7 +350,7 @@ msgid "Sign in / Sign out"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
+#: code:addons/hr_timesheet/hr_timesheet.py:174
 #, python-format
 msgid "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
@@ -377,15 +378,15 @@ msgid "août"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "August"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "June"
 msgstr ""
@@ -407,8 +408,8 @@ msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "November"
 msgstr ""
@@ -424,15 +425,15 @@ msgid "Closing Date"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "October"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "January"
 msgstr ""
@@ -443,8 +444,8 @@ msgid "Key dates"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
 #, python-format
 msgid "Thu"
 msgstr ""
@@ -481,8 +482,8 @@ msgid "Analysis summary"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "December"
 msgstr ""
@@ -554,8 +555,8 @@ msgid "Invoicing"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "May"
 msgstr ""
@@ -589,8 +590,8 @@ msgid "Sign In By Project"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "February"
 msgstr ""
@@ -617,14 +618,14 @@ msgid "octobre"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
 #, python-format
 msgid "April"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
+#: code:addons/hr_timesheet/hr_timesheet.py:176
 #, python-format
 msgid "No analytic account defined on the project.\n"
 "Please set one or we can not automatically fill the timesheet."
@@ -653,7 +654,7 @@ msgid "Stats by user"
 msgstr ""
 
 #. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "No employee defined for this user"
 msgstr ""
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index e32300f87dd..f98f901991f 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-12 10:03+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
-"<lorenzo.battistini@agilebg.com>\n"
+"PO-Revision-Date: 2011-01-01 16: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:30+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
@@ -291,6 +290,20 @@ msgid ""
 "to set up a management by affair.\n"
 "    "
 msgstr ""
+"\n"
+"Questo modulo implementa il sistema timesheet. Ogni impiegato può codificare "
+"e\n"
+"tenere traccia del propio tempo dedicato ai differenti progetti. Un progetto "
+"è un\n"
+"conto analitico e il tempo speso sul progetto genera costi nel\n"
+"conto analitico.\n"
+"\n"
+"Molti report, per tracciamento tempistiche ed impiegati, sono forniti.\n"
+"\n"
+"E completamente integrato con il modulo contabilità costi. Esso vi "
+"permetterà di \n"
+"installare una gestione per affare.\n"
+"    "
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
diff --git a/addons/hr_timesheet/report/user_timesheet.xsl b/addons/hr_timesheet/report/user_timesheet.xsl
index b4a5a8c8d25..b58e8af33b2 100644
--- a/addons/hr_timesheet/report/user_timesheet.xsl
+++ b/addons/hr_timesheet/report/user_timesheet.xsl
@@ -48,7 +48,7 @@
 
     <xsl:template name="story">
 		<spacer length="1cm" />
-		<para style="title" t="1">Timesheet</para>
+		<para style="title" t="1">Timesheet by Employee</para>
 		<spacer length="1cm" />
 		<para style="employee"><xsl:value-of select="/report/employee" /></para>
 		<spacer length="1cm" />
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 40ac84200ef..6e932d4e8f8 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,8 +1,11 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","base.group_hr_user",1,1,1,1
 "access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","base.group_hr_user",1,1,1,1
+"access_hr_account_analytic_line_employee","account.account.analytic.line employee","account.model_account_analytic_line","base.group_user",1,0,0,0
 "access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","base.group_hr_user",1,1,1,1
 "access_product_product_user","product.product user","product.model_product_product","base.group_hr_user",1,1,1,1
 "access_product_template_hr_timesheet","product.template.hr.timesheet","product.model_product_template","base.group_hr_user",1,1,1,1
 "access_product_uom_hr_timesheet","product.uom.hr.timesheet","product.model_product_uom","base.group_hr_user",1,1,1,1
 "access_account_fiscalyear_hr_user","account.account.fiscalyear.user","account.model_account_fiscalyear","base.group_hr_user",1,1,1,1
+"hr.access_account_journal_view_hruser","account.journal.view hruser","account.model_account_journal_view","base.group_hr_user",1,0,0,0
+"hr.access_account_journal_column_hruser","account.journal.column hruser","account.model_account_journal_column","base.group_hr_user",1,0,0,0
diff --git a/addons/hr_timesheet/test/hr_timesheet_report.yml b/addons/hr_timesheet/test/hr_timesheet_report.yml
index b1cd445a35d..5005c5d724d 100644
--- a/addons/hr_timesheet/test/hr_timesheet_report.yml
+++ b/addons/hr_timesheet/test/hr_timesheet_report.yml
@@ -1,23 +1,21 @@
 -
- In order to test the PDF reports defined on Employee, we will print Timesheet of a User
+ Print the HR Timesheet By Employee report through the wizard
 -
   !python {model: hr.employee}: |
     import netsvc, tools, os, time
-    month = time.gmtime()[1]
-    year = time.gmtime()[0]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'employee_id' : ref('hr.employee1') }}
-    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-user_report.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'hr.employee','active_ids': []})
+    data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_id' : ref('hr.employee1')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_hr_timesheet_my',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
 
 -
- In order to test the PDF reports defined on Employee, we will print Timesheet of Users
+ Print the HR Timesheet By Employee report through the wizard
 -
   !python {model: hr.employee}: |
     import netsvc, tools, os, time
-    month = time.gmtime()[1]
-    year = time.gmtime()[0]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'month': month, 'year' : year, 'employee_ids' : [ref('hr.employee1')] }}
-    (data, format) = netsvc.LocalService('report.hr.analytical.timesheet_users').create(cr, uid, [], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet-users_report.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'hr.employee','active_ids': []})
+    data_dict = {'month': time.gmtime()[1], 'year': time.gmtime()[0], 'employee_ids' : [(6,0,[ref('hr.employee1'),ref('hr.employee2'),ref('hr.employee3')])]}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_hr_timesheet_users',wiz_data=data_dict, context=ctx, our_module='hr_timesheet')
\ No newline at end of file
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/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
index 10136bb34ff..4e704c5b05d 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml
@@ -26,7 +26,7 @@
                 <form string="Sign In/Out By Project">
                     <group colspan="4" >
                         <separator string="Sign in" colspan="4"/>
-                           <field name="name" readonly="True" />
+                        <field name="name" readonly="True" />
                         <field name="state" readonly="True" />
                         <field name="server_date"/>
                         <label string="(local time on the server side)" colspan="2"/>
@@ -64,7 +64,7 @@
                         <field name="date_start"/>
                         <field name="server_date"/>
                         <separator string="Work done in the last period" colspan="4" />
-                        <field name="account_id" colspan="2" groups="analytic.group_analytic_accounting"/>
+                        <field name="account_id" colspan="2"/>
                         <field name="info" colspan="2"/>
                         <field name="date"/>
                         <label string="(Keep empty for current_time)" colspan="2"/>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index fc9226551e3..215c98c02ac 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -52,7 +52,6 @@ class account_analytic_account(osv.osv):
             account_to_invoice_map.setdefault(rec['account_id'], []).append(rec['invoice_id'])
 
         for account in self.browse(cr, uid, ids, context=context):
-            invoiced = {}
             invoice_ids = filter(None, list(set(account_to_invoice_map.get(account.id, []))))
             for invoice in obj_invoice.browse(cr, uid, invoice_ids, context=context):
                 res.setdefault(account.id, 0.0)
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index df23aaae3b8..b0edacd7272 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -84,13 +84,12 @@
             <field name="type">search</field>
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
-                <filter name="others" position="after">
-                    <separator orientation="vertical"/>
+                <field name="date" position="before">
                     <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
-                </filter>
+                    <separator orientation="vertical"/>
+                </field>
             </field>
         </record>
-	
 
         <record id="view_account_analytic_line_tree_inherit" model="ir.ui.view">
             <field name="name">account.analytic.line.tree.to_invoice</field>
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 145db842584..a317bf1d2c8 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:17+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 09:56+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -181,7 +182,7 @@ msgstr "Betrag"
 #. module: hr_timesheet_invoice
 #: view:board.board:0
 msgid "Uninvoice Lines With Billing Rate"
-msgstr ""
+msgstr "Offene Positionen mit Abrechnungsfaktor"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
@@ -280,7 +281,7 @@ msgstr "Partner"
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Analytische Konten definieren."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,time:0
@@ -393,6 +394,10 @@ msgid ""
 "revenue\n"
 "reports, eso."
 msgstr ""
+"\n"
+"Anwendung für die Abrechnung von Personalspesen auf Basis bereits erfasster "
+"Kostendaten (Personalspesen, Auslagen etc.). Sie können außerdem diverse "
+"Preislisten bei analytischen Konten für den Verkauf zuweisen."
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index 88061eefaac..d5a93d419c7 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-10-30 15:43+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 12:29+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -59,7 +58,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "    7 Days    "
-msgstr ""
+msgstr "    7 días    "
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -69,7 +68,7 @@ msgstr "Ingreso"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "A facturar"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -83,7 +82,7 @@ msgstr "Hoja de servicios por día"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create.final,name:0
@@ -109,7 +108,7 @@ msgstr ""
 #: view:report_timesheet.account.date:0
 #: view:report_timesheet.user:0
 msgid "This Year"
-msgstr ""
+msgstr "Este año"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,time:0
@@ -119,13 +118,13 @@ msgstr "Mostrar tiempo en el historial de trabajos"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Journals"
-msgstr ""
+msgstr "Diarios"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: hr_timesheet_invoice
 #: field:random.timesheet.lines,uom_id:0
@@ -136,7 +135,7 @@ msgstr "UdM"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Account"
-msgstr ""
+msgstr "Cuenta"
 
 #. module: hr_timesheet_invoice
 #: view:report.random.timesheet:0
@@ -217,7 +216,7 @@ msgstr ""
 #: view:random.timesheet.lines:0
 #: view:report.timesheet.line:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -234,7 +233,7 @@ msgstr "Hoja de servicios diaria por cuenta"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Final invoice for analytic account"
-msgstr ""
+msgstr "Factura final para la cuenta analítica"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
@@ -261,7 +260,7 @@ msgstr "Fecha límite"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Cuentas a facturar"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,partner_id:0
@@ -271,7 +270,7 @@ msgstr "Empresa"
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "¡Error! No se pueden crear cuentas analíticas recursivas."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,time:0
@@ -341,7 +340,7 @@ msgstr "Empleado"
 #. module: hr_timesheet_invoice
 #: help:account.analytic.line,to_invoice:0
 msgid "It allows to set the discount while making invoice"
-msgstr ""
+msgstr "Permite establecer el descuento al facturar"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,price:0
@@ -353,7 +352,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,customer_name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
@@ -369,7 +368,7 @@ msgstr "¡Error!"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor3
 msgid "Gratis"
-msgstr ""
+msgstr "Gratis"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,description:hr_timesheet_invoice.module_meta_information
@@ -416,7 +415,7 @@ msgstr "Mostrar detalle del trabajo en la línea de factura."
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_random_timesheet
@@ -480,7 +479,7 @@ msgstr "Descuento (%)"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
 msgid "Yes (100%)"
-msgstr ""
+msgstr "Sí (100%)"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -500,7 +499,7 @@ msgstr "Facturas"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,month:0
@@ -547,7 +546,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,invoice_id:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Facturado"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity_max:0
@@ -587,7 +586,7 @@ msgstr "Periodo hasta"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Línea analítica"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -596,7 +595,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -608,7 +607,7 @@ msgstr "Costo contable"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
 msgid "50%"
-msgstr ""
+msgstr "50%"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -617,7 +616,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,date:0
@@ -657,12 +656,12 @@ msgstr "Por favor rellene el campo dirección de la empresa: %s."
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,amount_invoice:0
@@ -683,7 +682,7 @@ msgstr "Facturar las líneas analíticas"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "Cód. diario/Nombre mov."
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -697,7 +696,7 @@ msgstr "Total:"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -745,7 +744,7 @@ msgstr "Cantidad"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Fecha/Código"
 
 #. module: hr_timesheet_invoice
 #: view:random.timesheet.lines:0
@@ -796,7 +795,7 @@ msgstr "Precio máx. factura"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
@@ -819,7 +818,7 @@ msgstr "Cancelar"
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
 #: view:report.timesheet.line:0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Línea de hoja de asistencia"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
@@ -830,7 +829,7 @@ msgstr "Producto de balance necesario"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Billing Data"
-msgstr ""
+msgstr "Datos facturación"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
@@ -844,12 +843,12 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,customer_name:0
 msgid "Label for the customer"
-msgstr ""
+msgstr "Etiqueta para el cliente"
 
 #. module: hr_timesheet_invoice
 #: view:random.timesheet.lines:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
@@ -869,7 +868,7 @@ msgstr "Líneas hoja de servicios aleatorias"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,price:0
@@ -946,7 +945,7 @@ msgstr "A facturar"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,journal_ids:0
@@ -981,12 +980,12 @@ msgstr "Este mes"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_lines_board
 msgid "Working Hours"
-msgstr ""
+msgstr "Horario de trabajo"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
 msgid "Select Period"
-msgstr ""
+msgstr "Seleccionar periodo"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -1000,7 +999,7 @@ msgstr "Periodo desde fecha inicial"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: hr_timesheet_invoice
 #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
@@ -1020,7 +1019,7 @@ msgstr "Precio venta"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,name:0
@@ -1030,7 +1029,7 @@ msgstr ""
 #: field:report_timesheet.account.date,name:0
 #: field:report_timesheet.user,name:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
@@ -1044,7 +1043,7 @@ msgstr "Hojas de servicios por día"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -1054,7 +1053,7 @@ msgstr "Datos facturación"
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,factor:0
 msgid "Discount in percentage"
-msgstr ""
+msgstr "Descuento en porcentaje"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index 0b69b771880..2007acd6560 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:17+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:17+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:42+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:42+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgid "Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:68
 #, python-format
 msgid "Analytic account incomplete"
 msgstr ""
@@ -47,11 +47,6 @@ msgstr ""
 msgid "Force to use a specific product"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
-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 ""
-
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "    7 Days    "
@@ -122,7 +117,6 @@ msgid "Day"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,uom_id:0
 #: field:report.account.analytic.line.to.invoice,product_uom_id:0
 msgid "UoM"
 msgstr ""
@@ -133,8 +127,9 @@ msgid "Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:report.random.timesheet:0
-msgid "Random Timesheets"
+#: field:hr.timesheet.invoice.create,time:0
+#: field:hr.timesheet.invoice.create.final,time:0
+msgid "Time spent"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -147,11 +142,6 @@ msgstr ""
 msgid "Uninvoiced line with billing rate"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Random Timesheets Lines"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
 msgid "Project"
@@ -163,14 +153,13 @@ msgid "Sale Pricelist"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,amount:0
 #: field:report.account.analytic.line.to.invoice,amount:0
 msgid "Amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:board.board:0
-msgid "Uninvoice Lines With Billing Rate"
+#: view:account.analytic.account:0
+msgid "Reactivate Account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -178,11 +167,6 @@ msgstr ""
 msgid "The detail of each work done will be displayed on the invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_board
-msgid "Random Timesheet"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
 msgid "Create invoice from timesheet"
@@ -199,12 +183,11 @@ msgid "Analytic account to close"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
-msgid "OpenERP allows you to create default invoicing types. You could need to regularly make discounts based on a specific contract or agreement with a customer. From this menu, you can create additional default types of invoicing that will speed up your invoicing."
+#: view:board.board:0
+msgid "Uninvoice Lines With Billing Rate"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
 #: view:report.timesheet.line:0
 msgid "Group By..."
 msgstr ""
@@ -227,16 +210,13 @@ msgid "Final invoice for analytic account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:76
 #, python-format
 msgid "Analytic Account incomplete"
 msgstr ""
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,analytic_account_id:0
-#: field:report.random.timesheet,analytic_account_id:0
 #: field:report.timesheet.line,account_id:0
 #: field:report_timesheet.account,account_id:0
 #: field:report_timesheet.account.date,account_id:0
@@ -307,13 +287,12 @@ msgid "Analytic account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
 #: field:report.analytic.account.close,state:0
 msgid "State"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "Data Insufficient!"
 msgstr ""
@@ -349,7 +328,7 @@ msgid "Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:119
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -381,7 +360,7 @@ msgid "Timesheet Profit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:80
 #, python-format
 msgid "Partner incomplete"
 msgstr ""
@@ -400,11 +379,6 @@ msgstr ""
 msgid "July"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_report_random_timesheet
-msgid "Random Timesheet Report"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Printing date"
@@ -428,7 +402,7 @@ msgid "Theorical"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:120
 #, python-format
 msgid "You can not modify an invoiced analytic line!"
 msgstr ""
@@ -470,7 +444,7 @@ msgid "Employee or Journal Name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
 #, python-format
 msgid "Invoices"
 msgstr ""
@@ -500,9 +474,6 @@ msgid "Currency"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,user_id:0
-#: field:report.random.timesheet,user_id:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,user_id:0
 #: field:report_timesheet.account,user_id:0
@@ -552,6 +523,11 @@ msgstr ""
 msgid "From"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_invoiced:0
 msgid "Total invoiced"
@@ -616,14 +592,12 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,date:0
 #: field:hr.timesheet.invoice.create.final,date:0
-#: field:random.timesheet.lines,date:0
-#: field:report.random.timesheet,date:0
 #: field:report.timesheet.line,date:0
 msgid "Date"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:81
 #, python-format
 msgid "Please fill in the Address field in the Partner: %s."
 msgstr ""
@@ -683,14 +657,19 @@ msgid "Credit"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:69
 #, python-format
 msgid "Please fill in the partner and pricelist field in the analytic account:\n"
 "%s"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
 #, python-format
 msgid "Error"
 msgstr ""
@@ -707,9 +686,7 @@ msgid "Balance"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,quantity:0
 #: field:report.analytic.account.close,quantity:0
-#: field:report.random.timesheet,quantity:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,quantity:0
 #: field:report_timesheet.account,quantity:0
@@ -725,8 +702,6 @@ msgid "Date/Code"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,general_account_id:0
 #: field:report.timesheet.line,general_account_id:0
 msgid "General Account"
 msgstr ""
@@ -783,6 +758,7 @@ msgid "Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
 #: view:hr.timesheet.analytic.cost.ledger:0
 #: view:hr.timesheet.analytic.profit:0
 #: view:hr.timesheet.invoice.create:0
@@ -790,6 +766,16 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
+msgid "OpenERP allows you to create default invoicing types. You might have to regularly assign discounts because of a specific contract or agreement with a customer. From this menu, you can create additional types of invoicing to speed up your invoicing."
+msgstr ""
+
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_analytic_timesheet
@@ -799,7 +785,7 @@ msgid "Timesheet Line"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
 #, python-format
 msgid "Balance product needed"
 msgstr ""
@@ -810,7 +796,7 @@ msgid "Billing Data"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:77
 #, python-format
 msgid "Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n"
 "%s"
@@ -821,22 +807,12 @@ msgstr ""
 msgid "Label for the customer"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Current"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
 #: view:hr.timesheet.analytic.profit:0
 msgid "Print"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_random_timesheet_lines
-msgid "Random Timesheet Lines"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
 #: selection:report.timesheet.line,month:0
@@ -857,7 +833,7 @@ msgid "The real date of each work will be displayed on the invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
 #, python-format
 msgid "At least one line has no product !"
 msgstr ""
@@ -867,23 +843,11 @@ msgstr ""
 msgid "Timesheets to invoice"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
-#, python-format
-msgid "Please fill a Balance product in the wizard"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.cost.ledger,date1:0
 msgid "Start of period"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: field:hr.timesheet.invoice.create,time:0
-#: field:hr.timesheet.invoice.create.final,time:0
-msgid "Time spent"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
 msgid "Daily Timesheet by Account"
@@ -891,8 +855,6 @@ msgstr ""
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,product:0
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,product_id:0
 #: field:report.account.analytic.line.to.invoice,product_id:0
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,product_id:0
@@ -910,8 +872,8 @@ msgid "%"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,to_invoice:0
-msgid "Invoicing"
+#: field:hr_timesheet_invoice.factor,name:0
+msgid "Internal name"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -934,7 +896,12 @@ msgid "The product that will be used to invoice the remaining amount"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+msgid "This list shows you every task you can invoice to the customer. Select the lines and click the Action button to generate the invoices automatically."
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
 #, python-format
 msgid "No Records Found for Report!"
 msgstr ""
@@ -953,11 +920,6 @@ msgstr ""
 msgid "This Month"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_lines_board
-msgid "Working Hours"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
 msgid "Select Period"
@@ -997,16 +959,6 @@ msgstr ""
 msgid "Employees"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: field:report.account.analytic.line.to.invoice,name:0
-#: view:report.timesheet.line:0
-#: field:report.timesheet.line,name:0
-#: field:report_timesheet.account,name:0
-#: field:report_timesheet.account.date,name:0
-#: field:report_timesheet.user,name:0
-msgid "Year"
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
 msgid "Timesheets per day"
@@ -1042,8 +994,8 @@ msgid "Timesheets per account"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: field:hr_timesheet_invoice.factor,name:0
-msgid "Internal name"
+#: field:hr.timesheet.invoice.create,name:0
+msgid "Description"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -1063,10 +1015,9 @@ msgid "Analytic Lines to Invoice"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: field:hr.timesheet.invoice.create,name:0
-#: field:random.timesheet.lines,name:0
-#: field:report.random.timesheet,name:0
-msgid "Description"
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#, python-format
+msgid "Please fill a Balance product in the wizard"
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -1085,7 +1036,12 @@ msgid "Cost"
 msgstr ""
 
 #. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Search Timesheet Lines"
+#: field:report.account.analytic.line.to.invoice,name:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,name:0
+#: field:report_timesheet.account,name:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
+msgid "Year"
 msgstr ""
 
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index a64735df2e3..ea8f95e8ac9 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-27 07:47+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 07:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
@@ -122,7 +122,7 @@ msgstr "Mostra le tempistiche nello storico dei lavori"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Journals"
-msgstr ""
+msgstr "Libri giornali"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -139,7 +139,7 @@ msgstr "Unità di Misura"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Account"
-msgstr ""
+msgstr "Conto"
 
 #. module: hr_timesheet_invoice
 #: view:report.random.timesheet:0
@@ -399,6 +399,9 @@ msgid ""
 "costs in this analytic account: timesheets, expenses, ...You can configure "
 "an automatic invoice rate on analytic accounts."
 msgstr ""
+"Riempire questo campo se pianificate di generare automaticamente fatture "
+"basandole sui costi nel conto analitico: timesheet, spese, ... E' possibile "
+"configurare un tasso di fatturazione automatico sui conti analitici."
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
@@ -552,7 +555,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Non Assigned timesheets to users"
-msgstr ""
+msgstr "Timesheet non assegnati a utenti"
 
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,invoice_id:0
@@ -658,7 +661,7 @@ msgstr "Data"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
 #, python-format
 msgid "Please fill in the Address field in the Partner: %s."
-msgstr ""
+msgstr "Per favore compilare il campo indirizzo nel partner: %s."
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -721,6 +724,8 @@ msgid ""
 "Please fill in the partner and pricelist field in the analytic account:\n"
 "%s"
 msgstr ""
+"Per favore compilare il partner e il campo listino nel conto analitico:\n"
+"%s"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
@@ -850,11 +855,14 @@ msgid ""
 "Analytic Account:\n"
 "%s"
 msgstr ""
+"Per favore compilare il partner o cliente e il campo listino di vendita nel "
+"conto analitico:\n"
+"%s"
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,customer_name:0
 msgid "Label for the customer"
-msgstr ""
+msgstr "Etichetta per il cliente"
 
 #. module: hr_timesheet_invoice
 #: view:random.timesheet.lines:0
@@ -937,7 +945,7 @@ msgstr "Prodotto"
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
 msgid "Uninvoice lines with billing rate"
-msgstr ""
+msgstr "Linee non fatturate con tasso di fatturazione"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -966,13 +974,13 @@ msgstr "Registro"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,balance_product:0
 msgid "The product that will be used to invoice the remaining amount"
-msgstr ""
+msgstr "Il prodotto che verrà utilizzato per fatture l'importo rimenente"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
 #, python-format
 msgid "No Records Found for Report!"
-msgstr ""
+msgstr "Record non trovati per il report!"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
@@ -1090,7 +1098,7 @@ msgstr "Unità"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipo di fatturazione"
 
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
@@ -1122,7 +1130,7 @@ msgstr "Costo"
 #. module: hr_timesheet_invoice
 #: view:random.timesheet.lines:0
 msgid "Search Timesheet Lines"
-msgstr ""
+msgstr "Cerca linee timesheet"
 
 #~ msgid "Visible name"
 #~ msgstr "Nome visualizzato"
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
index 90ba2aa7f6c..eb1437534d4 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -217,91 +217,3 @@ class report_timesheet_invoice(osv.osv):
         """)
 report_timesheet_invoice()
 
-class report_random_timsheet(osv.osv):
-    _name = "report.random.timesheet"
-    _description = "Random Timesheet Report"
-    _auto = False
-
-    _columns = {
-        'analytic_account_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True),
-        'name': fields.char('Description', size=64, readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
-        'date': fields.date('Date', readonly=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True)
-    }
-    _order = "date desc"
-
-    def __init__(self, pool, cr):
-        super(report_random_timsheet, self).__init__(pool, cr)
-        self.called = False
-
-    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        """ To call the init() method timely
-        """
-        if not self.called:
-            self.init(cr, user)
-        self.called = True # To make sure that init doesn't get called multiple times
-
-        res = super(report_random_timsheet, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        return res
-
-    def init(self, cr, uid=1):
-        drop_view_if_exists(cr, 'report_random_timesheet')
-
-        cr.execute("""create or replace view report_random_timesheet as (
-
-            select
-                line.id as id, line.account_id as analytic_account_id, line.name as name,
-                line.unit_amount as quantity, line.date as date, line.user_id as user_id
-            from
-                account_analytic_line line, hr_department dept,hr_employee dept_user
-            where
-                (dept.id = dept_user.department_id AND dept_user.id=line.user_id AND line.user_id is not null)
-                AND (dept.manager_id = """ + str(uid) + """ )
-                AND (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-3))
-            LIMIT 10
-            )
-            """ )
-
-report_random_timsheet()
-
-class random_timesheet_lines(osv.osv):
-    _name = "random.timesheet.lines"
-    _description = "Random Timesheet Lines"
-    _auto = False
-
-    _columns = {
-        'date': fields.date('Date', readonly=True),
-        'name': fields.char('Description', size=64, readonly=True),
-        'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True),
-        'analytic_account_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True),
-        'uom_id': fields.many2one('product.uom', 'UoM', readonly=True),
-        'amount': fields.float('Amount', readonly=True),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoicing', readonly=True),
-        'general_account_id': fields.many2one('account.account', 'General Account', readonly=True)
-    }
-
-    _order = "date desc"
-
-    def init(self, cr):
-        drop_view_if_exists(cr, 'random_timesheet_lines')
-
-        cr.execute("""create or replace view random_timesheet_lines as (
-            select
-                line.id as id, line.date as date, line.name as name, line.unit_amount as quantity,
-                line.product_id as product_id, line.account_id as analytic_account_id,
-                line.product_uom_id as uom_id, line.amount as amount, line.to_invoice as to_invoice,
-                line.general_account_id as general_account_id, line.user_id as user_id
-            from
-                account_analytic_line line
-            where
-                (line.date <= CURRENT_DATE AND line.date > (CURRENT_DATE-15))
-            )
-            """ )
-
-random_timesheet_lines()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
index b763f96c10a..1d2f5195687 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml
@@ -425,85 +425,5 @@
         src_model="res.users"/>
 
 
-        <!-- Random Timesheet  -->
-
-        <record model="ir.ui.view" id="view_random_timesheet_tree">
-            <field name="name">report.random.timesheet.tree</field>
-            <field name="model">report.random.timesheet</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Random Timesheets">
-                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="name" select="1"/>
-                    <field name="quantity" select="2" />
-                    <field name="date" select="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_random_timesheet_board">
-            <field name="name">Random Timesheet</field>
-            <field name="res_model">report.random.timesheet</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_random_timesheet_tree"/>
-        </record>
-
-        <!-- Random Timesheet Lines of random activities -->
-
-    <record id="view_random_timesheet_lines_search" model="ir.ui.view">
-            <field name="name">random.timesheet.lines.search</field>
-            <field name="model">random.timesheet.lines</field>
-            <field name="type">search</field>
-            <field name="arch" type="xml">
-                <search string="Search Timesheet Lines">
-                   <group col='15' colspan='4'>
-                        <filter icon="terp-check" string="Current" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
-                        <separator orientation="vertical"/>
-                      <field name="user_id" widget="selection"/>
-                      <field name="product_id" widget="selection"/>
-                   </group>
-                   <newline/>
-                   <group expand="0" string="Group By...">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Analytic Account" icon="terp-folder-violet" domain="[]" context="{'group_by':'analytic_account_id'}"/>
-                       <filter string="General Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'general_account_id'}"/>
-                   </group>
-               </search>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_random_timesheet_lines_tree">
-            <field name="name">random.timesheet.lines.tree</field>
-            <field name="model">random.timesheet.lines</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Random Timesheets Lines">
-                    <field name="date" select="1"/>
-                    <field name="user_id"/>
-                    <field name="name" select="1"/>
-                    <field name="quantity" />
-                    <field name="product_id" select="1"/>
-                    <field name="analytic_account_id" select="1" groups="analytic.group_analytic_accounting"/>
-                    <field name="uom_id" />
-                    <field name="amount" />
-                    <field name="to_invoice" select="1"/>
-                    <field name="general_account_id" />
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_random_timesheet_lines_board">
-            <field name="type">ir.actions.act_window</field>
-            <field name="name">Working Hours</field>
-            <field name="res_model">random.timesheet.lines</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_user_id':uid }</field>
-            <field name="view_id" ref="view_random_timesheet_lines_tree"/>
-            <field name="search_view_id" ref="view_random_timesheet_lines_search"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/security/ir.model.access.csv b/addons/hr_timesheet_invoice/security/ir.model.access.csv
index c647fec62cf..9d8c41be2cd 100644
--- a/addons/hr_timesheet_invoice/security/ir.model.access.csv
+++ b/addons/hr_timesheet_invoice/security/ir.model.access.csv
@@ -7,8 +7,6 @@
 "access_report_timesheet_account","report_timesheet.account","model_report_timesheet_account","base.group_hr_manager",1,1,1,1
 "access_report_timesheet_account_date","report_timesheet.account.date","model_report_timesheet_account_date","base.group_hr_manager",1,1,1,1
 "access_report_timesheet_invoice","report_timesheet.invoice","model_report_timesheet_invoice","base.group_hr_manager",1,1,1,1
-"access_report_random_timesheet","report_random_timesheet","model_report_random_timesheet","base.group_hr_manager",1,1,1,1
-"access_report_random_timesheet_lines","random_timesheet_lines","model_random_timesheet_lines","base.group_hr_manager",1,1,1,1
 "access_report_analytic_account_close_manager","report.analytic.account.close.manager","model_report_analytic_account_close","base.group_hr_manager",1,1,1,1
 "access_report_account_analytic_line_to_invoice_manager","report.account.analytic.line.to.invoice.manager","model_report_account_analytic_line_to_invoice","base.group_hr_manager",1,1,1,1
 "access_account_invoice_hr_user","account.invoice.hr.user","account.model_account_invoice","base.group_hr_user",1,1,1,1
diff --git a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
index 32f22e7eb4b..886bb89b5b7 100644
--- a/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
+++ b/addons/hr_timesheet_invoice/test/hr_timesheet_invoice_report.yml
@@ -7,14 +7,14 @@
     (data, format) = netsvc.LocalService('report.account.analytic.profit').create(cr, uid, [], data_dict, {})
     if tools.config['test_report_directory']:
        file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-account_analytic_profit_report.'+format), 'wb+').write(data)
-
 -
-  In order to test the PDF reports defined on HR Cost Ledger, we will print report of HR Cost Ledger
+ Print the HR Cost Ledger report through the wizard
 -
   !python {model: account.analytic.account}: |
     import netsvc, tools, os, time
+    ctx={}
     acc_ids = [ref('account.analytic_absences'),ref('account.analytic_internal'),ref('account.analytic_sednacom'),ref('account.analytic_thymbra'),ref('account.analytic_partners_camp_to_camp')]
-    data_dict = {'model': 'ir.ui.menu', 'form': {'date1': time.strftime('%Y-01-01'), 'date2': time.strftime('%Y-%m-%d')}}
-    (data, format) = netsvc.LocalService('report.hr.timesheet.invoice.account.analytic.account.cost_ledger').create(cr, uid, acc_ids, data_dict, {'active_ids': acc_ids})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'hr_timesheet_invoice-cost_ledger_report.'+format), 'wb+').write(data)
+    ctx.update({'model': 'ir.ui.menu','active_ids': acc_ids})
+    data_dict = {'date1': time.strftime('%Y-01-01'), 'date2': time.strftime('%Y-%m-%d')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_hr_timesheet_invoice_cost_ledger',wiz_data=data_dict, context=ctx, our_module='hr_timesheet_invoice')
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 6c7c5618311..986a4a734c3 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -237,27 +237,23 @@ class hr_timesheet_sheet(osv.osv):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
         return True
 
-    def sign_in(self, cr, uid, ids, context=None):
+    def sign(self, cr, uid, ids, typ, context=None):
         emp_obj = self.pool.get('hr.employee')
+        sheet = self.browse(cr, uid, ids, context=context)[0]
         if context is None:
             context = {}
-        if not self.browse(cr, uid, ids, context=context)[0].date_current == time.strftime('%Y-%m-%d'):
+        if not sheet.date_current == time.strftime('%Y-%m-%d'):
             raise osv.except_osv(_('Error !'), _('You can not sign in from an other date than today'))
-        emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        emp_id = sheet.employee_id.id
         context['sheet_id']=ids[0]
-        emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_in', context=context,)
+        emp_obj.attendance_action_change(cr, uid, [emp_id], type=typ, context=context,)
         return True
 
+    def sign_in(self, cr, uid, ids, context=None):
+        return self.sign(cr,uid,ids,'sign_in',context=None)
+
     def sign_out(self, cr, uid, ids, context=None):
-        emp_obj = self.pool.get('hr.employee')
-        if context is None:
-            context = {}
-        if not self.browse(cr, uid, ids, context=context)[0].date_current == time.strftime('%Y-%m-%d'):
-            raise osv.except_osv(_('Error !'), _('You can not sign out from an other date than today'))
-        emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)])
-        context['sheet_id']=ids[0]
-        emp_obj.attendance_action_change(cr, uid, emp_ids, type='sign_out', context=context,)
-        return True
+        return self.sign(cr,uid,ids,'sign_out',context=None)
 
     _columns = {
         'name': fields.char('Description', size=64, select=1,
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 4edfbe27fb6..8456bca1f3d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -132,8 +132,8 @@
                         <field name="state"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-check"/>
                         <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_manager"/>
-                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_manager"/>
+                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
+                        <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
                     </group>
                 </form>
             </field>
@@ -178,7 +178,7 @@
         </record>
 
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-             sequence="2"/>
+             sequence="2" groups="base.group_hr_user,base.group_hr_manager"/>
 
         <!--
             Company inheritancy
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
index 1afc8909323..667658685f9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_workflow.xml
@@ -40,21 +40,25 @@
         <record id="t0" model="workflow.transition">
             <field name="act_from" ref="act_new"/>
             <field name="act_to" ref="act_draft"/>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
         <record id="t1" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirm"/>
             <field name="signal">confirm</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
         <record id="t2" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_done"/>
             <field name="signal">done</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
         <record id="t3" model="workflow.transition">
             <field name="act_from" ref="act_confirm"/>
             <field name="act_to" ref="act_draft"/>
             <field name="signal">cancel</field>
+            <field name="group_id" ref="base.group_hr_user"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index 75a68403f71..ed34ea3f432 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 10:14+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -309,6 +310,33 @@ msgid ""
 "* Maximal difference between timesheet and attendances\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung hilft bei der Erfassung, Prüfung und Genehmigung von "
+"Anwesenheit und\n"
+"Arbeitszeit innerhalb einer einzigen Ansicht. Im oberen Teil der Ansicht "
+"sehen Sie die Anwesenheit, die\n"
+"durch Anmelden und Abmelden erfasst wird. Der untere Bereich ist für die "
+"Zeiterfassung vorgesehen.\n"
+"\n"
+"Der zweite Aktenreiter beinhaltet eine Statistik zur Prüfung der "
+"vollständigen Erfassung von Zeiten einzelner\n"
+"Mitarbeiter oder des Teams:\n"
+"* Anwesenheitszeit je Tag\n"
+"* Arbeitszeit je Tag (nach Projekten, Konten etc.)\n"
+"\n"
+"Ausserdem ermöglicht die Anwendung einen komplett durchgängigen Vorgang für "
+"die Eingabe von Zeiten \n"
+"bis hin zur Prüfung und Freigabe:\n"
+"* Regelmässige Zeiterfassung durch den Mitarbeiter während der Periode "
+"(Status Entwurf)\n"
+"* Bestätigung der erfassten Zeiten durch den Mitarbeiter zum Periodenende\n"
+"* Prüfung und Freigabe durch den Projektmanager\n"
+"\n"
+"Die Eingabe, Prüfung und Freigabe kann dabei je Unternehmen individualisiert "
+"werden:\n"
+"* Periodendauer des Unternehmens (Tag, Woche, Monat, Jahr)\n"
+"* Maximal akzeptierte Abweichung zwischen Anwesenheit und Arbeitszeit u.a.\n"
+"    "
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
@@ -446,7 +474,7 @@ msgstr "Gesamte Projektzeit"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Anwesenheitszeit"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -764,7 +792,7 @@ msgstr "Zeiterfassung nach Konten"
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "Zeiterfassung"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index eed26ff1256..eb6d684e08c 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 09:13+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-31 08: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-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
@@ -40,7 +39,7 @@ msgstr "Hoja"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
 msgid "Service"
-msgstr ""
+msgstr "Servicio"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
@@ -53,7 +52,7 @@ msgstr "¡No se ha definido un empleado para su usuario!"
 #: view:hr_timesheet_sheet.sheet:0
 #: view:timesheet.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
@@ -67,12 +66,12 @@ msgstr "Total servicio"
 #: view:timesheet.report:0
 #: field:timesheet.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Departamento"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr ""
+msgstr "Hoja de asistencia de tarea"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -92,7 +91,7 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -101,7 +100,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -128,7 +127,7 @@ msgstr "Fecha hasta"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "Basado en la hoja de asistencia"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -152,7 +151,7 @@ msgstr "Presente"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Total Cost"
-msgstr ""
+msgstr "Coste total"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -172,6 +171,8 @@ msgstr "Rechazar"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
+"¡No puede introducir una fecha de asistencia fuera de las fechas de la hoja "
+"de asistencia actual!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -194,12 +195,12 @@ msgstr "No puede registrar entrada en otra fecha que no sea hoy"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mes-1 "
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "Validation"
-msgstr ""
+msgstr "Validación"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -210,7 +211,7 @@ msgstr "¡Aviso!"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Entrada de hojas de asistencia del empleado"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -229,7 +230,7 @@ msgstr "Hoja de servicios del proyecto"
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "#Núm"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -241,7 +242,7 @@ msgstr "Fecha desde"
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Month "
-msgstr ""
+msgstr " Mes "
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -303,24 +304,24 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No se pueden crear compañías recursivas."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
 #: view:timesheet.report:0
 #: field:timesheet.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "State is 'confirmed'."
-msgstr ""
+msgstr "El estado es 'confirmado'"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
 msgid "Employee"
-msgstr ""
+msgstr "Empleado"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -332,12 +333,12 @@ msgstr "Nuevo"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
 msgid "You cannot duplicate a timesheet !"
-msgstr ""
+msgstr "¡ No puede duplicar una hoja de asistencia !"
 
 #. 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 "Mis asistencias totales por semana"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -359,18 +360,20 @@ msgstr "Líneas de la hoja de asistencia"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Hours"
-msgstr ""
+msgstr "Horas"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
 #: field:timesheet.report,cost:0
 msgid "#Cost"
-msgstr ""
+msgstr "#Coste"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Error: Registro de entrada (resp. Registro de salida) debe seguir al "
+"Registro de salida (resp. Registro de entrada)"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -386,13 +389,13 @@ msgstr "¡Acción no válida!"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "El jefe de proyecto valida las hojas de asistencia."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -406,11 +409,13 @@ msgid ""
 "You cannot create a timesheet for an employee that does not have any user "
 "defined !"
 msgstr ""
+"¡ No puede crear una hoja de asistencia para un empleado que no tiene ningún "
+"usuario definido !"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "Trabajar en tarea"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -421,7 +426,7 @@ msgstr "Vista diaria"
 #: view:timesheet.report:0
 #: field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "#Cantidad"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -432,7 +437,7 @@ msgstr "Total hoja servicios"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Asistencia disponible"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -443,12 +448,12 @@ msgstr "Registrar entrada"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr ""
+msgstr "#Total hoja asistencia"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
 msgid "hr.timesheet.current.open"
-msgstr ""
+msgstr "rrhh.hojaasistencia.actual.abrir"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -459,18 +464,18 @@ msgstr "Ir a:"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Abrirá su hoja de asistencia actual"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -485,22 +490,22 @@ msgstr "Mes"
 #: view:timesheet.report:0
 #: field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr ""
+msgstr "#Total dif."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "En borrador"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Fichar/salir"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "Billing"
-msgstr ""
+msgstr "Cobros"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
@@ -533,7 +538,7 @@ msgstr "Borrador"
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr ""
+msgstr "Diferencia (horas) permitida en hoja de asistencia"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -544,18 +549,18 @@ msgstr "No puede registrar salida en otra fecha que no sea hoy"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
-msgstr ""
+msgstr "La factura se crea en base a la hoja de asistencia."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr ""
+msgstr "Borrador hoja de asistencia"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid " Year "
-msgstr ""
+msgstr " Año "
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
@@ -566,13 +571,13 @@ msgstr "Semana"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
@@ -589,7 +594,7 @@ msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
 msgid "Timesheets by Period"
-msgstr ""
+msgstr "Hojas de asistencia por periodo"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -615,18 +620,18 @@ msgstr "Fecha"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "Rango hoja de asistencia"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
@@ -636,34 +641,34 @@ msgstr "Líneas hoja de servicios"
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "Mi asistencia total por semana"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr ""
+msgstr "El empleado ficha y sale."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -671,7 +676,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Cuenta general"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -699,7 +704,7 @@ msgstr "¡No puede modificar una entrada en una hoja de servicios confirmada!"
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_project_management_timesheet_sheet_form
 msgid "My Timesheet"
-msgstr ""
+msgstr "Mi hoja de asistencia"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -711,22 +716,22 @@ msgstr "Realizado"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "State is 'draft'."
-msgstr ""
+msgstr "El estado es 'borrador'"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Validado"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Open"
-msgstr ""
+msgstr "Abierto"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -737,7 +742,7 @@ msgstr "Hoja de servicios por cuentas"
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "Abrir hoja de asistencia"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -748,7 +753,7 @@ msgstr "¡No se puede(n) eliminar hoja(s) que ya está(n) confirmada(s)!"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "State is 'validated'."
-msgstr ""
+msgstr "El estado es 'validado'"
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -766,12 +771,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
 msgid "Timesheet Analysis"
-msgstr ""
+msgstr "Análisis de hojas de asistencia"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "Buscar hoja de asistencia"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -792,7 +797,7 @@ msgstr "Línea hoja de servicios"
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -811,18 +816,18 @@ msgstr "Descripción"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr ""
+msgstr "El empleado confirma periódicamente sus propias hojas de asistencia."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
 msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Define el resumen del trabajo de una tarea"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -867,12 +872,12 @@ msgstr "Ausente"
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Empleados"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -883,12 +888,12 @@ msgstr ""
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Confirmación"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -903,7 +908,7 @@ msgstr "Facturar sobre trabajo"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprobar"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -914,7 +919,7 @@ msgstr "Cuentas analíticas"
 #: view:timesheet.report:0
 #: field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipo de facturación"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -933,7 +938,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Coste"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
@@ -958,7 +963,7 @@ msgstr "Año"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "Para aprobar"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -968,7 +973,7 @@ msgstr "Total"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Diario"
 
 #~ msgid "Review end of day check day is complete"
 #~ msgstr "Revisar final del día que la comprobación del día está completa"
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index beab0a3d3da..e517f1d04ea 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:18+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:18+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:43+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
 #: constraint:hr_timesheet_sheet.sheet:0
 #, python-format
 msgid "You can not have 2 timesheets that overlaps !\n"
@@ -37,7 +37,7 @@ msgid "Service"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "No employee defined for your user !"
 msgstr ""
@@ -74,7 +74,7 @@ msgid "Today"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
 #, python-format
 msgid "Please verify that the total difference of the sheet is lower than %.2f !"
 msgstr ""
@@ -146,7 +146,8 @@ msgid "Total Cost"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -158,7 +159,8 @@ msgid "Refuse"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
 #, python-format
 msgid "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
@@ -169,7 +171,7 @@ msgid "My Timesheet opens your timesheet so that you can book your activities in
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
 #, python-format
 msgid "You can not sign in from an other date than today"
 msgstr ""
@@ -186,7 +188,7 @@ msgid "Validation"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -311,7 +313,7 @@ msgid "New"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
 #, python-format
 msgid "You cannot duplicate a timesheet !"
 msgstr ""
@@ -322,8 +324,16 @@ msgid "My Total Attendances By Week"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -360,7 +370,8 @@ msgid "No employee defined"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -382,7 +393,8 @@ msgid "Configuration"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
 #, python-format
 msgid "You cannot create a timesheet for an employee that does not have any user defined !"
 msgstr ""
@@ -509,12 +521,6 @@ msgstr ""
 msgid "Timesheet allowed difference(Hours)"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-#, python-format
-msgid "You can not sign out from an other date than today"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
@@ -554,7 +560,8 @@ msgid "Current Status"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet !"
 msgstr ""
@@ -618,6 +625,11 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid "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."
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0
 #: selection:timesheet.report,month:0
@@ -659,7 +671,8 @@ msgid "Period"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
 #, python-format
 msgid "You can not modify an entry in a confirmed timesheet !"
 msgstr ""
@@ -696,8 +709,8 @@ msgid "Validated"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: view:hr.timesheet.current.open:0
-msgid "Open"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -706,13 +719,13 @@ msgid "Timesheet by Accounts"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
 #, python-format
 msgid "Cannot delete Sheet(s) which are already confirmed !"
 msgstr ""
@@ -742,7 +755,7 @@ msgid "Search Timesheet"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
 #, python-format
 msgid "The timesheet cannot be validated as it does not contain equal no. of sign ins and sign outs!"
 msgstr ""
@@ -796,7 +809,7 @@ msgid "Sign Out"
 msgstr ""
 
 #. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
 #, python-format
 msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 msgstr ""
@@ -861,11 +874,6 @@ msgstr ""
 msgid "Invoice rate"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Approve"
@@ -888,11 +896,6 @@ msgstr ""
 msgid "#Total Attendance"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-msgid "This view allows you to check timesheet sheets following a specific period. You can also encode time spent on a project that is an analytic account and the time spent on a project generate costs on the analytic account."
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
@@ -918,6 +921,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
+
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index 9effdd1cb3e..68e07631695 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 12:13+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 08:33+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
index 84ef868ab81..d20ad3a5f4c 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
@@ -21,6 +21,8 @@
 
 import tools
 from osv import fields,osv
+from decimal_precision import decimal_precision as dp
+
 
 class hr_timesheet_report(osv.osv):
     _name = "hr.timesheet.report"
@@ -40,7 +42,7 @@ class hr_timesheet_report(osv.osv):
         'user_id': fields.many2one('res.users', 'User',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),
-        'cost': fields.float('Cost',readonly=True),
+        'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
         'quantity': fields.float('Quantity',readonly=True),
     }
 
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index f55ee0fb5e0..462a2e5a512 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -1,9 +1,8 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_hr_user",1,1,1,1
-"access_hr_timesheet_sheet_sheet_system_user","hr_timesheet_sheet.sheet.system.user","model_hr_timesheet_sheet_sheet","base.group_user",1,0,0,0
+"access_hr_timesheet_sheet_sheet_user","hr_timesheet_sheet.sheet.user","model_hr_timesheet_sheet_sheet","base.group_user",1,1,1,1
+"access_hr_timesheet_sheet_sheet_system_employee","hr_timesheet_sheet.sheet.system.employee","model_hr_timesheet_sheet_sheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","base.group_hr_user",1,1,1,1
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
-"access_timesheet_report_user","timesheet.report.user","model_timesheet_report","base.group_hr_manager",1,1,1,1
diff --git a/addons/html_view/i18n/de.po b/addons/html_view/i18n/de.po
index dac721c07b2..634b3ad91c9 100644
--- a/addons/html_view/i18n/de.po
+++ b/addons/html_view/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:14+0000\n"
+"PO-Revision-Date: 2010-12-29 10:56+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
@@ -57,6 +57,10 @@ msgid ""
 "view.\n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung zeigt einen Test der html tag Unterstützung in normalen "
+"xml basierten Ansichten.\n"
+"    "
 
 #. module: html_view
 #: model:ir.model,name:html_view.model_html_view
diff --git a/addons/html_view/i18n/html_view.pot b/addons/html_view/i18n/html_view.pot
index c7c2abe8946..792ee770015 100644
--- a/addons/html_view/i18n/html_view.pot
+++ b/addons/html_view/i18n/html_view.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:43+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/idea/i18n/idea.pot b/addons/idea/i18n/idea.pot
index 329f879048a..338d62f84e9 100644
--- a/addons/idea/i18n/idea.pot
+++ b/addons/idea/i18n/idea.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:44+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgid "March"
 msgstr ""
 
 #. module: idea
-#: code:addons/idea/wizard/idea_post_vote.py:0
+#: code:addons/idea/wizard/idea_post_vote.py:92
 #, python-format
 msgid "Idea must be in 'Open' state before vote for that idea."
 msgstr ""
@@ -124,8 +124,9 @@ msgid "Category of ideas"
 msgstr ""
 
 #. module: idea
-#: code:addons/idea/idea.py:0
-#: code:addons/idea/wizard/idea_post_vote.py:0
+#: code:addons/idea/idea.py:253
+#: code:addons/idea/wizard/idea_post_vote.py:89
+#: code:addons/idea/wizard/idea_post_vote.py:92
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -170,7 +171,7 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: idea
-#: code:addons/idea/wizard/idea_post_vote.py:0
+#: code:addons/idea/wizard/idea_post_vote.py:89
 #, python-format
 msgid "You can not give Vote for this idea more than %s times"
 msgstr ""
@@ -597,7 +598,7 @@ msgid "Refused"
 msgstr ""
 
 #. module: idea
-#: code:addons/idea/idea.py:0
+#: code:addons/idea/idea.py:253
 #, python-format
 msgid "Draft/Accepted/Cancelled ideas Could not be voted"
 msgstr ""
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/knowledge.pot b/addons/knowledge/i18n/knowledge.pot
index e934613de1a..8b876bf2426 100644
--- a/addons/knowledge/i18n/knowledge.pot
+++ b/addons/knowledge/i18n/knowledge.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:44+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
new file mode 100644
index 00000000000..3dcd59e76ec
--- /dev/null
+++ b/addons/knowledge/i18n/zh_CN.po
@@ -0,0 +1,154 @@
+# Chinese (Simplified) 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-31 11:01+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@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: 2011-01-01 05:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "知识管理"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr "创建一个标准质量手册的示例骨架"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Share information within the company with these specific Addons."
+msgstr "使用这些特定的模块在公司内部共享信息。"
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr "共享仓库（FTP）"
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr "知识管理系统"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
+msgstr "协作编辑内容（维基）"
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr "提供 FTP 方式访问您的 OpenERP 文档管理系统。您可以通过标准的 FTP 客户端访问系统中的附件和虚拟文档。"
+
+#. module: knowledge
+#: help:knowledge.installer,document_webdav:0
+msgid ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+msgstr "提供 WebDAV 方式访问您的 OpenERP 文档管理系统。您可以通过标准的 Web 浏览器访问系统中的附件和虚拟文档。"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure"
+msgstr "配置"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "title"
+msgstr "title"
+
+#. module: knowledge
+#: model:ir.module.module,description:knowledge.module_meta_information
+msgid ""
+"Installer for knowledge-based tools\n"
+"    "
+msgstr ""
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "配置"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr "知识管理模块安装"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr "质量手册"
+
+#. module: knowledge
+#: field:knowledge.installer,document_webdav:0
+msgid "Shared Repositories (WebDAV)"
+msgstr "共享仓库（WebDAV）"
+
+#. module: knowledge
+#: field:knowledge.installer,progress:0
+msgid "Configuration Progress"
+msgstr "配置进度"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_faq:0
+msgid ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr "内部 FAQ"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "可协作内容"
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr "图片"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Knowledge Application Configuration"
+msgstr "知识管理应用配置"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr "knowledge.installer"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure Your Knowledge Application"
+msgstr "配置您的知识管理应用"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr "内容模板"
diff --git a/addons/knowledge/security/ir.model.access.csv b/addons/knowledge/security/ir.model.access.csv
index d111677a4d3..7a057fcfcbe 100644
--- a/addons/knowledge/security/ir.model.access.csv
+++ b/addons/knowledge/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_ir_attachment_sale_manager","ir_attachment manager","base.model_ir_attachment","base.group_sale_manager",1,1,1,1
 "access_ir_attachment_partner_manager","ir_attachment_partner manager","base.model_ir_attachment","base.group_partner_manager",1,1,1,1
+
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index 40075d5bc12..c1406982da9 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 11:03+0000\n"
+"PO-Revision-Date: 2010-12-28 08:32+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/l10n_be.pot b/addons/l10n_be/i18n/l10n_be.pot
index 071d8436301..d91b04398c4 100644
--- a/addons/l10n_be/i18n/l10n_be.pot
+++ b/addons/l10n_be/i18n/l10n_be.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:22+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,14 +16,82 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers_receiv
-msgid "Tiers - Recevable"
+#: field:partner.vat,test_xml:0
+#: field:partner.vat.intra,test_xml:0
+msgid "Test XML file"
 msgstr ""
 
 #. module: l10n_be
-#: field:l1on_be.vat.declaration,tax_code_id:0
-#: field:partner.vat.intra,tax_code_id:0
-msgid "Tax Code"
+#: field:vat.listing.clients,name:0
+msgid "Client Name"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#, python-format
+msgid "No partner has a VAT Number asociated with him."
+msgstr ""
+
+#. module: l10n_be
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "No VAT Number Associated with Main Company!"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
+#, python-format
+msgid "Data Insufficient!"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list:0
+msgid "Create XML"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Save the File with '.xml' extension."
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Save XML"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:150
+#, python-format
+msgid "Save"
 msgstr ""
 
 #. module: l10n_be
@@ -32,20 +100,38 @@ msgid "Régime Intra-Communautaire"
 msgstr ""
 
 #. module: l10n_be
-#: model:ir.model,name:l10n_be.model_partner_vat_intra
-#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
-msgid "Partner VAT Intra"
+#: field:l1on_be.vat.declaration,msg:0
+#: field:partner.vat.intra,msg:0
+#: field:partner.vat.list,msg:0
+msgid "File created"
 msgstr ""
 
 #. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:116
 #, python-format
 msgid "Save XML For Vat declaration"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_immo
-msgid "Immobilisation"
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
+#, python-format
+msgid "The period code you entered is not valid."
+msgstr ""
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_resitution:0
+msgid "It indicates whether a resitution is to made or not?"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
+msgid "Vat Declaraion"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,no_vat:0
+msgid "Partner With No VAT"
 msgstr ""
 
 #. module: l10n_be
@@ -55,13 +141,122 @@ msgid "Company"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers_payable
-msgid "Tiers - Payable"
+#: field:l1on_be.vat.declaration,tax_code_id:0
+#: field:partner.vat.intra,tax_code_id:0
+msgid "Tax Code"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_list
+msgid "partner.vat.list"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
+msgid "Annual Listing Of VAT-Subjected Customers"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
+msgid "Belgium - Plan Comptable Minimum Normalise"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "Select Fiscal Year"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_resitution:0
+msgid "Ask Restitution"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_intra
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
+msgid "Partner VAT Intra"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
+#: view:l1on_be.vat.declaration:0
+msgid "Periodical VAT Declaration"
 msgstr ""
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
-msgid "Save XML"
+msgid "Note: "
+msgstr ""
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1
+msgid "Régime National"
+msgstr ""
+
+#. module: l10n_be
+#: view:vat.listing.clients:0
+msgid "VAT listing"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Periods"
+msgstr ""
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat,limit_amount:0
+msgid "Limit Amount"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Ok"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "This wizard will create an XML file for Vat details and total invoiced amounts per partner."
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.intra,no_vat:0
+msgid "The Partner whose VAT number is not defined they doesn't include in XML File."
+msgstr ""
+
+#. module: l10n_be
+#: field:vat.listing.clients,vat:0
+msgid "VAT"
+msgstr ""
+
+#. module: l10n_be
+#: field:vat.listing.clients,country:0
+msgid "Country"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,client_nihil:0
+msgid "Tick this case only if it concerns only the last statement on the civil or cessation of activity"
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_ids:0
+msgid "Select here the period(s) you want to include in your intracom declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -69,14 +264,57 @@ msgstr ""
 msgid "Amount"
 msgstr ""
 
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_vat_listing_clients
+msgid "vat.listing.clients"
+msgstr ""
+
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Is Last Declaration"
 msgstr ""
 
 #. module: l10n_be
-#: model:ir.model,name:l10n_be.model_vat_listing_clients
-msgid "vat.listing.clients"
+#: model:ir.model,name:l10n_be.model_partner_vat
+msgid "partner.vat"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,client_nihil:0
+msgid "Last Declaration of Enterprise"
+msgstr ""
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_payment:0
+msgid "It indicates whether a payment is to made or not?"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "Data Insufficient"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
+msgid "Belgium Statements"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
+msgid "Partner Vat Intra"
+msgstr ""
+
+#. module: l10n_be
+#: field:vat.listing.clients,turnover:0
+msgid "Turnover"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Declare Periodical VAT"
 msgstr ""
 
 #. module: l10n_be
@@ -86,13 +324,21 @@ msgid "This identifies the representative of the sending company. This is a stri
 msgstr ""
 
 #. module: l10n_be
-#: field:vat.listing.clients,vat:0
-msgid "VAT"
+#: view:l1on_be.vat.declaration:0
+msgid "Save xml"
 msgstr ""
 
 #. module: l10n_be
-#: field:vat.listing.clients,turnover:0
-msgid "Turnover"
+#: field:partner.vat,mand_id:0
+#: field:partner.vat.intra,mand_id:0
+msgid "MandataireId"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,file_save:0
+#: field:partner.vat.intra,file_save:0
+#: field:partner.vat.list,file_save:0
+msgid "Save File"
 msgstr ""
 
 #. module: l10n_be
@@ -108,125 +354,26 @@ msgid "This is where you have to set the period code for the intracom declaratio
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tax
-msgid "Tax"
+#: field:l1on_be.vat.declaration,name:0
+#: field:partner.vat.intra,name:0
+#: field:partner.vat.list,name:0
+msgid "File Name"
 msgstr ""
 
 #. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
 #, python-format
-msgid "No VAT Number Associated with Main Company!"
+msgid "Wrong Period Code"
 msgstr ""
 
 #. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
+#: field:partner.vat,fyear:0
+msgid "Fiscal Year"
 msgstr ""
 
 #. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_financiers
-msgid "Financier"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat:0
-msgid "View Client"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Please select at least one Period."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1
-msgid "Régime National"
-msgstr ""
-
-#. module: l10n_be
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Data Insufficient!"
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat.list,partner_ids:0
-msgid "You can remove clients/partners which you do not want to show in xml file"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Save"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "General Information"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,file_save:0
-#: field:partner.vat.intra,file_save:0
-#: field:partner.vat.list,file_save:0
-msgid "Save File"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "Select Fiscal Year"
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid "Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers
-msgid "Tiers"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "You can remove clients/partners which you do not want in exported xml file"
-msgstr ""
-
-#. module: l10n_be
-#: help:l1on_be.vat.declaration,client_nihil:0
-msgid "Tick this case only if it concerns only the last statement on the civil or cessation of activity"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,test_xml:0
-#: field:partner.vat.intra,test_xml:0
-msgid "Test XML file"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-msgid "Save xml"
+#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
+msgid "Vat Declaration"
 msgstr ""
 
 #. module: l10n_be
@@ -235,100 +382,6 @@ msgstr ""
 msgid "European Countries"
 msgstr ""
 
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "Create an XML file for Vat Intra"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "Partner VAT intra"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,msg:0
-#: field:partner.vat.intra,msg:0
-#: field:partner.vat.list,msg:0
-msgid "File created"
-msgstr ""
-
-#. module: l10n_be
-#: help:l1on_be.vat.declaration,ask_resitution:0
-msgid "It indicates whether a resitution is to made or not?"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_partner_vat_list
-msgid "partner.vat.list"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,ask_resitution:0
-msgid "Ask Restitution"
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat.intra,no_vat:0
-msgid "The Partner whose VAT number is not defined they doesn't include in XML File."
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
-msgid "Vat Declaraion"
-msgstr ""
-
-#. module: l10n_be
-#: view:vat.listing.clients:0
-msgid "VAT listing"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_produit
-msgid "Produit"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,limit_amount:0
-msgid "Limit Amount"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
-msgid "Partner Vat Intra"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,mand_id:0
-#: field:partner.vat.intra,mand_id:0
-msgid "MandataireId"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Wrong Period Code"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
-msgid "Vat Declaration"
-msgstr ""
-
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing
 #: view:partner.vat:0
@@ -337,13 +390,37 @@ msgstr ""
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
-#: field:partner.vat.intra,no_vat:0
-msgid "Partner With No VAT"
+msgid "General Information"
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.list,partner_ids:0
+msgid "You can remove clients/partners which you do not want to show in xml file"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "You can remove clients/partners which you do not want in exported xml file"
 msgstr ""
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
-msgid "Periods"
+msgid "Create an XML file for Vat Intra"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_payment:0
+msgid "Ask Payment"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "View Client"
 msgstr ""
 
 #. module: l10n_be
@@ -359,145 +436,9 @@ msgid "Close"
 msgstr ""
 
 #. module: l10n_be
-#: field:partner.vat.intra,period_ids:0
-msgid "Period (s)"
-msgstr ""
-
-#. module: l10n_be
-#: field:vat.listing.clients,name:0
-msgid "Client Name"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
 #, python-format
-msgid "No partner has a VAT Number asociated with him."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_charge
-msgid "Charge"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-#: view:partner.vat.intra:0
-#: view:partner.vat.list:0
-msgid "Create XML"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_capitaux
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-#: view:partner.vat.intra:0
-msgid "Save the File with '.xml' extension."
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-msgid "Ok"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "The period code you entered is not valid."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_stock
-msgid "Stock et Encours"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
-msgid "Annual Listing Of VAT-Subjected Customers"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
-msgid "Belgium - Plan Comptable Minimum Normalise"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "Note: "
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
-#: view:l1on_be.vat.declaration:0
-msgid "Periodical VAT Declaration"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,ask_payment:0
-msgid "Ask Payment"
-msgstr ""
-
-#. module: l10n_be
-#: field:vat.listing.clients,country:0
-msgid "Country"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,fyear:0
-msgid "Fiscal Year"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,client_nihil:0
-msgid "Last Declaration of Enterprise"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Data Insufficient"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
-msgid "Belgium Statements"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-msgid "Declare Periodical VAT"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_partner_vat
-msgid "partner.vat"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,name:0
-#: field:partner.vat.intra,name:0
-#: field:partner.vat.list,name:0
-msgid "File Name"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat:0
-msgid "This wizard will create an XML file for Vat details and total invoiced amounts per partner."
+msgid "Please select at least one Period."
 msgstr ""
 
 #. module: l10n_be
@@ -523,7 +464,12 @@ msgid "\n"
 msgstr ""
 
 #. module: l10n_be
-#: help:l1on_be.vat.declaration,ask_payment:0
-msgid "It indicates whether a payment is to made or not?"
+#: view:partner.vat.intra:0
+msgid "Partner VAT intra"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_ids:0
+msgid "Period (s)"
 msgstr ""
 
diff --git a/addons/l10n_ca/__init__.py b/addons/l10n_ca/__init__.py
index 24ab202267f..2a86c685c01 100644
--- a/addons/l10n_ca/__init__.py
+++ b/addons/l10n_ca/__init__.py
@@ -2,19 +2,19 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010 Savoir-faire Linux (<http://www.savoirfairelinux.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
+#    it under the terms of the GNU General Public License as
 #    published by the Free Software Foundation, either version 3 of the
 #    License, or (at your option) any later version.
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
+#    GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU Affero General Public License
+#    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml
index ec56371bedb..e87ce37aa0f 100644
--- a/addons/l10n_ca/account_tax_en.xml
+++ b/addons/l10n_ca/account_tax_en.xml
@@ -2,56 +2,56 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="notax_en" model="account.tax.template">
-                <field name="chart_template_id" ref="ca_en_chart_template_en"/>
-                <field name="name">No tax</field>
-                <field name="amount">0.00</field>
-                <field name="type">percent</field>
-                <field name="base_code_id" ref="vat_code_base_due_en"/>
-                <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
-        </record>
+    <record id="notax_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">No tax</field>
+        <field name="amount">0.00</field>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="vat_code_base_due_en"/>
+        <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
+    </record>
 
-	<record id="gst_en" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-		<field name="name">GST (5.0%)</field>
-		<field name="code">GST</field>
-		<field name="amount">0.050000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart241000_en"/>
-		<field name="account_paid_id" ref="chart243000_en"/>
-		<field name="base_code_id" ref="vat_code_base_due_en"/>
-		<field name="tax_code_id" ref="vat_code_due_tva_en"/>
-		<field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_en"/>
-	</record>
+    <record id="gst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">GST (5.0%)</field>
+        <field name="code">GST</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart241000_en"/>
+        <field name="account_paid_id" ref="chart243000_en"/>
+        <field name="base_code_id" ref="vat_code_base_due_en"/>
+        <field name="tax_code_id" ref="vat_code_due_tva_en"/>
+        <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_en"/>
+    </record>
 
-	<record id="pst_en" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-		<field name="name">PST (7,5%)</field>
-		<field name="code">PST</field>
-		<field name="amount">0.075000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart242000_en"/>
-		<field name="account_paid_id" ref="chart244000_en"/>
-		<field name="base_code_id" ref="vat_code_base_due_en"/>
-		<field name="tax_code_id" ref="vat_code_due_tva_en"/>
-		<field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_en"/>
-	</record>
+    <record id="pst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">PST (7,5%)</field>
+        <field name="code">PST</field>
+        <field name="amount">0.075000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart242000_en"/>
+        <field name="account_paid_id" ref="chart244000_en"/>
+        <field name="base_code_id" ref="vat_code_base_due_en"/>
+        <field name="tax_code_id" ref="vat_code_due_tva_en"/>
+        <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_en"/>
+    </record>
 
-	<record id="hst_en" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_en_chart_template_en"/>
-		<field name="name">HST (13%)</field>
-		<field name="code">HST</field>
-		<field name="amount">0.130000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart242000_en"/>
-		<field name="account_paid_id" ref="chart244000_en"/>
-		<field name="base_code_id" ref="vat_code_base_due_en"/>
-		<field name="tax_code_id" ref="vat_code_due_tva_en"/>
-		<field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_en"/>
-	</record>
+    <record id="hst_en" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_en_chart_template_en"/>
+        <field name="name">HST (13%)</field>
+        <field name="code">HST</field>
+        <field name="amount">0.130000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart242000_en"/>
+        <field name="account_paid_id" ref="chart244000_en"/>
+        <field name="base_code_id" ref="vat_code_base_due_en"/>
+        <field name="tax_code_id" ref="vat_code_due_tva_en"/>
+        <field name="ref_base_code_id" ref="vat_code_receivable_net_en"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_en"/>
+    </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml
index fbdb756a992..6bcb3abf495 100644
--- a/addons/l10n_ca/account_tax_fr.xml
+++ b/addons/l10n_ca/account_tax_fr.xml
@@ -2,56 +2,85 @@
 <openerp>
     <data noupdate="1">
 
-	<record id="notax_fr" model="account.tax.template">
-        	<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-            	<field name="name">Pas de taxes</field>
-            	<field name="description">Pas de taxes</field>
-            	<field name="amount">0.00</field>
-            	<field name="type">percent</field>
-        </record>
+    <record id="tpstvq_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS (5%) + TVQ</field>
+        <field name="description">TPSTVQ</field>
+        <field name="amount">1</field>
+        <field name="child_depend">1</field>
+        <field name="type">percent</field>
+    </record>
 
-	<record id="tvq_fr" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-		<field name="name">TVQ (7.5%)</field>
-		<field name="code">TVQ</field>
-		<field name="amount">0.075000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart241200_fr"/>
-		<field name="account_paid_id" ref="chart242200_fr"/>
-		<field name="base_code_id" ref="vat_code_base_receivable_tvq_fr"/>
-		<field name="tax_code_id" ref="vat_code_receivable_tvq_fr"/>
-		<field name="ref_base_code_id" ref="vat_code_base_payable_tvq_fr"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_tvq_fr"/>
-	</record>
 
-	<record id="tps_fr" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-		<field name="name">TPS (5.0%)</field>
-		<field name="code">TPS</field>
-		<field name="amount">0.050000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart241100_fr"/>
-		<field name="account_paid_id" ref="chart242100_fr"/>
-		<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
-		<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
-		<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
-		<field name="parent_id" ref="tvq_fr"/>
-	</record>
+    <record id="tpstvq_tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS (5%)</field>
+        <field name="description">TPSTVQ</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="include_base_amount" eval="True"/>
+        <field name="account_collected_id" ref="chart241100_fr"/>
+        <field name="account_paid_id" ref="chart242100_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
+        <field name="parent_id" ref="tpstvq_fr"/>
+    </record>
 
-	<record id="tvh_fr" model="account.tax.template">
-		<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
-		<field name="name">TVH (13%)</field>
-		<field name="code">TVH</field>
-		<field name="amount">0.130000</field>
-		<field name="type">percent</field>
-		<field name="account_collected_id" ref="chart241300_fr"/>
-		<field name="account_paid_id" ref="chart242300_fr"/>
-		<field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
-		<field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
-		<field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
-		<field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
-	</record>
 
-</data>
+    <record id="tvq_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVQ (8.5%)</field>
+        <field name="description">TVQ</field>
+        <field name="amount">0.085000</field>
+        <field name="type">percent</field>
+        <field name="sequence">1</field>
+        <field name="account_collected_id" ref="chart241200_fr"/>
+        <field name="account_paid_id" ref="chart242200_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_tvq_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvq_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvq_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_tvq_fr"/>
+        <field name="parent_id" ref="tpstvq_fr"/>
+    </record>
+
+    <record id="tvh_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TVH (13%)</field>
+        <field name="description">TVH</field>
+        <field name="amount">0.130000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart241300_fr"/>
+        <field name="account_paid_id" ref="chart242300_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
+    </record>
+
+    <record id="tps_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">TPS (5%)</field>
+        <field name="description">TPS</field>
+        <field name="amount">0.050000</field>
+        <field name="type">percent</field>
+        <field name="account_collected_id" ref="chart241100_fr"/>
+        <field name="account_paid_id" ref="chart242100_fr"/>
+        <field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
+        <field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
+        <field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
+        <field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
+    </record>
+
+    <record id="notax_fr" model="account.tax.template">
+        <field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
+        <field name="name">Pas de taxes</field>
+        <field name="description">Pas de taxes</field>
+        <field name="amount">0.00</field>
+        <field name="type">percent</field>
+    </record>
+
+    </data>
 </openerp>
diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml
index b55572aaf80..c3e2bb78227 100644
--- a/addons/l10n_ca/fiscal_templates_fr.xml
+++ b/addons/l10n_ca/fiscal_templates_fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
+    <data>
 
 	<!-- Fiscal Position Templates -->
 
@@ -29,51 +29,78 @@
 
 	<record id="fiscal_position_tax_template_1_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_1_fr"  />
-		<field name="tax_src_id" ref="tvq_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_fr" />
+		<field name="tax_dest_id" ref="tpstvq_fr" />
 	</record>
 
 	<record id="fiscal_position_tax_template_2_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_2_fr"  />
-		<field name="tax_src_id" ref="tvh_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_fr" />
+		<field name="tax_dest_id" ref="tvh_fr" />
 	</record>
+
 	<record id="fiscal_position_tax_template_3_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="tax_src_id" ref="tps_fr" />
-		<field name="tax_dest_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_fr" />
+		<field name="tax_dest_id" ref="tps_fr" />
 	</record>
+
 	<record id="fiscal_position_tax_template_4_fr" model="account.fiscal.position.tax.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="tax_src_id" ref="notax_fr" />
+		<field name="tax_src_id" ref="tpstvq_fr" />
 		<field name="tax_dest_id" ref="notax_fr" />
 	</record>
 
-	<!-- Fiscal Position Account Templates -->
+	<!-- Fiscal Position Account Templates - Goods -->
 
 	<record id="fiscal_position_account_template_1_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_1_fr"  />
 		<field name="account_src_id" ref="chart411110_fr" />
+		<field name="account_dest_id" ref="chart411110_fr" />
+	</record>
+
+	<record id="fiscal_position_account_template_2_fr" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_2_fr"  />
+		<field name="account_src_id" ref="chart411110_fr" />
+		<field name="account_dest_id" ref="chart411120_fr" />
+	</record>
+
+	<record id="fiscal_position_account_template_3_fr" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_3_fr"  />
+		<field name="account_src_id" ref="chart411110_fr" />
+		<field name="account_dest_id" ref="chart411130_fr" />
+	</record>
+
+	<record id="fiscal_position_account_template_4_fr" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_4_fr"  />
+		<field name="account_src_id" ref="chart411110_fr" />
+		<field name="account_dest_id" ref="chart411140_fr" />
+	</record>
+
+	<!-- Fiscal Position Account Templates - Services -->
+
+	<record id="fiscal_position_account_template_1_fr" model="account.fiscal.position.account.template">
+		<field name="position_id" ref="fiscal_position_template_1_fr"  />
+		<field name="account_src_id" ref="chart411210_fr" />
 		<field name="account_dest_id" ref="chart411210_fr" />
 	</record>
 
 	<record id="fiscal_position_account_template_2_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_2_fr"  />
-		<field name="account_src_id" ref="chart411120_fr" />
+		<field name="account_src_id" ref="chart411210_fr" />
 		<field name="account_dest_id" ref="chart411220_fr" />
 	</record>
 
 	<record id="fiscal_position_account_template_3_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_3_fr"  />
-		<field name="account_src_id" ref="chart411130_fr" />
+		<field name="account_src_id" ref="chart411210_fr" />
 		<field name="account_dest_id" ref="chart411230_fr" />
 	</record>
 
 	<record id="fiscal_position_account_template_4_fr" model="account.fiscal.position.account.template">
 		<field name="position_id" ref="fiscal_position_template_4_fr"  />
-		<field name="account_src_id" ref="chart411140_fr" />
+		<field name="account_src_id" ref="chart411210_fr" />
 		<field name="account_dest_id" ref="chart411240_fr" />
 	</record>
-
-</data>
+    </data>
 </openerp>    
diff --git a/addons/l10n_ca/i18n/es.po b/addons/l10n_ca/i18n/es.po
index 677d680fc62..54d327302b0 100644
--- a/addons/l10n_ca/i18n/es.po
+++ b/addons/l10n_ca/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-08-02 21:08+0000\n"
-"PO-Revision-Date: 2010-12-27 11:00+0000\n"
+"PO-Revision-Date: 2010-12-28 09:19+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ca
diff --git a/addons/l10n_ch/i18n/es.po b/addons/l10n_ch/i18n/es.po
index 2132e9db54f..27d7ba8a9ff 100644
--- a/addons/l10n_ch/i18n/es.po
+++ b/addons/l10n_ch/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-10 17:15+0000\n"
-"PO-Revision-Date: 2010-12-27 11:05+0000\n"
+"PO-Revision-Date: 2010-12-28 08:53+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
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 8bff7f516f0..e72acbbeab9 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/es.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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-12-27 10:57+0000\n"
+"PO-Revision-Date: 2010-12-28 08:55+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/i18n/es.po b/addons/l10n_chart_uk_minimal/i18n/es.po
index 132b59af30d..7a2abaacb6b 100644
--- a/addons/l10n_chart_uk_minimal/i18n/es.po
+++ b/addons/l10n_chart_uk_minimal/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-12-27 10:58+0000\n"
+"PO-Revision-Date: 2010-12-28 08:52+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index 6e56007fc46..df0b218ae49 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -33,13 +33,13 @@
             <field name="code">terceros</field>
             <field name="close_method">balance</field>
         </record>
-        <record id="terceros - rec" model="account.account.type">
+        <record id="terceros_-_rec" model="account.account.type">
             <field name="name">Terceros - A Cobrar</field>
             <field name="code">terceros - rec</field>
             <field name="report_type">asset</field>
             <field name="close_method">balance</field>
         </record>
-        <record id="terceros - pay" model="account.account.type">
+        <record id="terceros_-_pay" model="account.account.type">
             <field name="name">Terceros - A Pagar</field>
             <field name="code">terceros - pay</field>
             <field name="report_type">liability</field>
@@ -3883,7 +3883,7 @@
             <field name="parent_id" ref="pgc_4"/>
             <field name="type">view</field>
             <field name="name">Proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_400" model="account.account.template">
             <field name="code">400</field>
@@ -3891,7 +3891,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4000" model="account.account.template">
             <field name="code">4000</field>
@@ -3899,7 +3899,7 @@
             <field name="parent_id" ref="pgc_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4000_child" model="account.account.template">
             <field name="code">4000</field>
@@ -3907,7 +3907,7 @@
             <field name="parent_id" ref="pgc_4000"/>
             <field name="type">payable</field>
             <field name="name">Proveedores (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4004" model="account.account.template">
             <field name="code">4004</field>
@@ -3915,7 +3915,7 @@
             <field name="parent_id" ref="pgc_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4004_child" model="account.account.template">
             <field name="code">4004</field>
@@ -3923,7 +3923,7 @@
             <field name="parent_id" ref="pgc_4004"/>
             <field name="type">payable</field>
             <field name="name">Proveedores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4009" model="account.account.template">
             <field name="code">4009</field>
@@ -3931,7 +3931,7 @@
             <field name="parent_id" ref="pgc_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4009_child" model="account.account.template">
             <field name="code">4009</field>
@@ -3939,7 +3939,7 @@
             <field name="parent_id" ref="pgc_4009"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_401" model="account.account.template">
             <field name="code">401</field>
@@ -3947,7 +3947,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_401_child" model="account.account.template">
             <field name="code">401</field>
@@ -3955,7 +3955,7 @@
             <field name="parent_id" ref="pgc_401"/>
             <field name="type">other</field>
             <field name="name">Proveedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_403" model="account.account.template">
             <field name="code">403</field>
@@ -3963,7 +3963,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4030" model="account.account.template">
             <field name="code">4030</field>
@@ -3971,7 +3971,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4030_child" model="account.account.template">
             <field name="code">4030</field>
@@ -3979,7 +3979,7 @@
             <field name="parent_id" ref="pgc_4030"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4031" model="account.account.template">
             <field name="code">4031</field>
@@ -3987,7 +3987,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4031_child" model="account.account.template">
             <field name="code">4031</field>
@@ -3995,7 +3995,7 @@
             <field name="parent_id" ref="pgc_4031"/>
             <field name="type">payable</field>
             <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4034" model="account.account.template">
             <field name="code">4034</field>
@@ -4003,7 +4003,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4034_child" model="account.account.template">
             <field name="code">4034</field>
@@ -4011,7 +4011,7 @@
             <field name="parent_id" ref="pgc_4034"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4036" model="account.account.template">
             <field name="code">4036</field>
@@ -4019,7 +4019,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4036_child" model="account.account.template">
             <field name="code">4036</field>
@@ -4027,7 +4027,7 @@
             <field name="parent_id" ref="pgc_4036"/>
             <field name="type">payable</field>
             <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4039" model="account.account.template">
             <field name="code">4039</field>
@@ -4035,7 +4035,7 @@
             <field name="parent_id" ref="pgc_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4039_child" model="account.account.template">
             <field name="code">4039</field>
@@ -4043,7 +4043,7 @@
             <field name="parent_id" ref="pgc_4039"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_404" model="account.account.template">
             <field name="code">404</field>
@@ -4051,7 +4051,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas asociadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_404_child" model="account.account.template">
             <field name="code">404</field>
@@ -4059,7 +4059,7 @@
             <field name="parent_id" ref="pgc_404"/>
             <field name="type">other</field>
             <field name="name">Proveedores, empresas asociadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_405" model="account.account.template">
             <field name="code">405</field>
@@ -4067,7 +4067,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_405_child" model="account.account.template">
             <field name="code">405</field>
@@ -4075,7 +4075,7 @@
             <field name="parent_id" ref="pgc_405"/>
             <field name="type">other</field>
             <field name="name">Proveedores, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_406" model="account.account.template">
             <field name="code">406</field>
@@ -4083,7 +4083,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_406_child" model="account.account.template">
             <field name="code">406</field>
@@ -4091,7 +4091,7 @@
             <field name="parent_id" ref="pgc_406"/>
             <field name="type">other</field>
             <field name="name">Envases y embalajes a devolver a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_407" model="account.account.template">
             <field name="code">407</field>
@@ -4099,7 +4099,7 @@
             <field name="parent_id" ref="pgc_40"/>
             <field name="type">view</field>
             <field name="name">Anticipos a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_407_child" model="account.account.template">
             <field name="code">407</field>
@@ -4107,7 +4107,7 @@
             <field name="parent_id" ref="pgc_407"/>
             <field name="type">other</field>
             <field name="name">Anticipos a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_41" model="account.account.template">
             <field name="code">41</field>
@@ -4115,7 +4115,7 @@
             <field name="parent_id" ref="pgc_4"/>
             <field name="type">view</field>
             <field name="name">Acreedores varios</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_410" model="account.account.template">
             <field name="code">410</field>
@@ -4123,7 +4123,7 @@
             <field name="parent_id" ref="pgc_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4100" model="account.account.template">
             <field name="code">4100</field>
@@ -4131,7 +4131,7 @@
             <field name="parent_id" ref="pgc_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4100_child" model="account.account.template">
             <field name="code">4100</field>
@@ -4139,7 +4139,7 @@
             <field name="parent_id" ref="pgc_4100"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4104" model="account.account.template">
             <field name="code">4104</field>
@@ -4147,7 +4147,7 @@
             <field name="parent_id" ref="pgc_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4104_child" model="account.account.template">
             <field name="code">4104</field>
@@ -4155,7 +4155,7 @@
             <field name="parent_id" ref="pgc_4104"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4109" model="account.account.template">
             <field name="code">4109</field>
@@ -4163,7 +4163,7 @@
             <field name="parent_id" ref="pgc_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_4109_child" model="account.account.template">
             <field name="code">4109</field>
@@ -4171,7 +4171,7 @@
             <field name="parent_id" ref="pgc_4109"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_411" model="account.account.template">
             <field name="code">411</field>
@@ -4179,7 +4179,7 @@
             <field name="parent_id" ref="pgc_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_411_child" model="account.account.template">
             <field name="code">411</field>
@@ -4187,7 +4187,7 @@
             <field name="parent_id" ref="pgc_411"/>
             <field name="type">other</field>
             <field name="name">Acreedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_419" model="account.account.template">
             <field name="code">419</field>
@@ -4195,7 +4195,7 @@
             <field name="parent_id" ref="pgc_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores por operaciones en común</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_419_child" model="account.account.template">
             <field name="code">419</field>
@@ -4203,7 +4203,7 @@
             <field name="parent_id" ref="pgc_419"/>
             <field name="type">other</field>
             <field name="name">Acreedores por operaciones en común</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_43" model="account.account.template">
             <field name="code">43</field>
@@ -4211,7 +4211,7 @@
             <field name="parent_id" ref="pgc_4"/>
             <field name="type">view</field>
             <field name="name">Clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_430" model="account.account.template">
             <field name="code">430</field>
@@ -4219,7 +4219,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4300" model="account.account.template">
             <field name="code">4300</field>
@@ -4227,7 +4227,7 @@
             <field name="parent_id" ref="pgc_430"/>
             <field name="type">view</field>
             <field name="name">Clientes (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4300_child" model="account.account.template">
             <field name="code">4300</field>
@@ -4235,7 +4235,7 @@
             <field name="parent_id" ref="pgc_4300"/>
             <field name="type">receivable</field>
             <field name="name">Clientes (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4304" model="account.account.template">
             <field name="code">4304</field>
@@ -4243,7 +4243,7 @@
             <field name="parent_id" ref="pgc_430"/>
             <field name="type">view</field>
             <field name="name">Clientes (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4304_child" model="account.account.template">
             <field name="code">4304</field>
@@ -4251,7 +4251,7 @@
             <field name="parent_id" ref="pgc_4304"/>
             <field name="type">receivable</field>
             <field name="name">Clientes (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4309" model="account.account.template">
             <field name="code">4309</field>
@@ -4259,7 +4259,7 @@
             <field name="parent_id" ref="pgc_430"/>
             <field name="type">view</field>
             <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4309_child" model="account.account.template">
             <field name="code">4309</field>
@@ -4267,7 +4267,7 @@
             <field name="parent_id" ref="pgc_4309"/>
             <field name="type">receivable</field>
             <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_431" model="account.account.template">
             <field name="code">431</field>
@@ -4275,7 +4275,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, efectos comerciales a cobrar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4310" model="account.account.template">
             <field name="code">4310</field>
@@ -4283,7 +4283,7 @@
             <field name="parent_id" ref="pgc_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4310_child" model="account.account.template">
             <field name="code">4310</field>
@@ -4291,7 +4291,7 @@
             <field name="parent_id" ref="pgc_4310"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4311" model="account.account.template">
             <field name="code">4311</field>
@@ -4299,7 +4299,7 @@
             <field name="parent_id" ref="pgc_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4311_child" model="account.account.template">
             <field name="code">4311</field>
@@ -4307,7 +4307,7 @@
             <field name="parent_id" ref="pgc_4311"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4312" model="account.account.template">
             <field name="code">4312</field>
@@ -4315,7 +4315,7 @@
             <field name="parent_id" ref="pgc_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4312_child" model="account.account.template">
             <field name="code">4312</field>
@@ -4323,7 +4323,7 @@
             <field name="parent_id" ref="pgc_4312"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4315" model="account.account.template">
             <field name="code">4315</field>
@@ -4331,7 +4331,7 @@
             <field name="parent_id" ref="pgc_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4315_child" model="account.account.template">
             <field name="code">4315</field>
@@ -4339,7 +4339,7 @@
             <field name="parent_id" ref="pgc_4315"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_432" model="account.account.template">
             <field name="code">432</field>
@@ -4347,7 +4347,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_432_child" model="account.account.template">
             <field name="code">432</field>
@@ -4355,7 +4355,7 @@
             <field name="parent_id" ref="pgc_432"/>
             <field name="type">other</field>
             <field name="name">Clientes, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_433" model="account.account.template">
             <field name="code">433</field>
@@ -4363,7 +4363,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4330" model="account.account.template">
             <field name="code">4330</field>
@@ -4371,7 +4371,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4330_child" model="account.account.template">
             <field name="code">4330</field>
@@ -4379,7 +4379,7 @@
             <field name="parent_id" ref="pgc_4330"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4331" model="account.account.template">
             <field name="code">4331</field>
@@ -4387,7 +4387,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4331_child" model="account.account.template">
             <field name="code">4331</field>
@@ -4395,7 +4395,7 @@
             <field name="parent_id" ref="pgc_4331"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4332" model="account.account.template">
             <field name="code">4332</field>
@@ -4403,7 +4403,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4332_child" model="account.account.template">
             <field name="code">4332</field>
@@ -4411,7 +4411,7 @@
             <field name="parent_id" ref="pgc_4332"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4334" model="account.account.template">
             <field name="code">4334</field>
@@ -4419,7 +4419,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4334_child" model="account.account.template">
             <field name="code">4334</field>
@@ -4427,7 +4427,7 @@
             <field name="parent_id" ref="pgc_4334"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4336" model="account.account.template">
             <field name="code">4336</field>
@@ -4435,7 +4435,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4336_child" model="account.account.template">
             <field name="code">4336</field>
@@ -4443,7 +4443,7 @@
             <field name="parent_id" ref="pgc_4336"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4337" model="account.account.template">
             <field name="code">4337</field>
@@ -4451,7 +4451,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4337_child" model="account.account.template">
             <field name="code">4337</field>
@@ -4459,7 +4459,7 @@
             <field name="parent_id" ref="pgc_4337"/>
             <field name="type">receivable</field>
             <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4339" model="account.account.template">
             <field name="code">4339</field>
@@ -4467,7 +4467,7 @@
             <field name="parent_id" ref="pgc_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4339_child" model="account.account.template">
             <field name="code">4339</field>
@@ -4475,7 +4475,7 @@
             <field name="parent_id" ref="pgc_4339"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_434" model="account.account.template">
             <field name="code">434</field>
@@ -4483,7 +4483,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, empresas asociadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_434_child" model="account.account.template">
             <field name="code">434</field>
@@ -4491,7 +4491,7 @@
             <field name="parent_id" ref="pgc_434"/>
             <field name="type">other</field>
             <field name="name">Clientes, empresas asociadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_435" model="account.account.template">
             <field name="code">435</field>
@@ -4499,7 +4499,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_435_child" model="account.account.template">
             <field name="code">435</field>
@@ -4507,7 +4507,7 @@
             <field name="parent_id" ref="pgc_435"/>
             <field name="type">other</field>
             <field name="name">Clientes, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_436" model="account.account.template">
             <field name="code">436</field>
@@ -4515,7 +4515,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Clientes de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_436_child" model="account.account.template">
             <field name="code">436</field>
@@ -4523,7 +4523,7 @@
             <field name="parent_id" ref="pgc_436"/>
             <field name="type">other</field>
             <field name="name">Clientes de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_437" model="account.account.template">
             <field name="code">437</field>
@@ -4531,7 +4531,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver por clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_437_child" model="account.account.template">
             <field name="code">437</field>
@@ -4539,7 +4539,7 @@
             <field name="parent_id" ref="pgc_437"/>
             <field name="type">other</field>
             <field name="name">Envases y embalajes a devolver por clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_438" model="account.account.template">
             <field name="code">438</field>
@@ -4547,7 +4547,7 @@
             <field name="parent_id" ref="pgc_43"/>
             <field name="type">view</field>
             <field name="name">Anticipos de clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_438_child" model="account.account.template">
             <field name="code">438</field>
@@ -4555,7 +4555,7 @@
             <field name="parent_id" ref="pgc_438"/>
             <field name="type">other</field>
             <field name="name">Anticipos de clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_44" model="account.account.template">
             <field name="code">44</field>
@@ -4563,7 +4563,7 @@
             <field name="parent_id" ref="pgc_4"/>
             <field name="type">view</field>
             <field name="name">Deudores varios</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_440" model="account.account.template">
             <field name="code">440</field>
@@ -4571,7 +4571,7 @@
             <field name="parent_id" ref="pgc_44"/>
             <field name="type">view</field>
             <field name="name">Deudores</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4400" model="account.account.template">
             <field name="code">4400</field>
@@ -4579,7 +4579,7 @@
             <field name="parent_id" ref="pgc_440"/>
             <field name="type">view</field>
             <field name="name">Deudores (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4400_child" model="account.account.template">
             <field name="code">4400</field>
@@ -4587,7 +4587,7 @@
             <field name="parent_id" ref="pgc_4400"/>
             <field name="type">receivable</field>
             <field name="name">Deudores (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4404" model="account.account.template">
             <field name="code">4404</field>
@@ -4595,7 +4595,7 @@
             <field name="parent_id" ref="pgc_440"/>
             <field name="type">view</field>
             <field name="name">Deudores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4404_child" model="account.account.template">
             <field name="code">4404</field>
@@ -4603,7 +4603,7 @@
             <field name="parent_id" ref="pgc_4404"/>
             <field name="type">receivable</field>
             <field name="name">Deudores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4409" model="account.account.template">
             <field name="code">4409</field>
@@ -4611,7 +4611,7 @@
             <field name="parent_id" ref="pgc_440"/>
             <field name="type">view</field>
             <field name="name">Deudores, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4409_child" model="account.account.template">
             <field name="code">4409</field>
@@ -4619,7 +4619,7 @@
             <field name="parent_id" ref="pgc_4409"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_441" model="account.account.template">
             <field name="code">441</field>
@@ -4627,7 +4627,7 @@
             <field name="parent_id" ref="pgc_44"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales a cobrar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4410" model="account.account.template">
             <field name="code">4410</field>
@@ -4635,7 +4635,7 @@
             <field name="parent_id" ref="pgc_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4410_child" model="account.account.template">
             <field name="code">4410</field>
@@ -4643,7 +4643,7 @@
             <field name="parent_id" ref="pgc_4410"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4411" model="account.account.template">
             <field name="code">4411</field>
@@ -4651,7 +4651,7 @@
             <field name="parent_id" ref="pgc_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4411_child" model="account.account.template">
             <field name="code">4411</field>
@@ -4659,7 +4659,7 @@
             <field name="parent_id" ref="pgc_4411"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4412" model="account.account.template">
             <field name="code">4412</field>
@@ -4667,7 +4667,7 @@
             <field name="parent_id" ref="pgc_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4412_child" model="account.account.template">
             <field name="code">4412</field>
@@ -4675,7 +4675,7 @@
             <field name="parent_id" ref="pgc_4412"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4415" model="account.account.template">
             <field name="code">4415</field>
@@ -4683,7 +4683,7 @@
             <field name="parent_id" ref="pgc_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_4415_child" model="account.account.template">
             <field name="code">4415</field>
@@ -4691,7 +4691,7 @@
             <field name="parent_id" ref="pgc_4415"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_446" model="account.account.template">
             <field name="code">446</field>
@@ -4699,7 +4699,7 @@
             <field name="parent_id" ref="pgc_44"/>
             <field name="type">view</field>
             <field name="name">Deudores de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_446_child" model="account.account.template">
             <field name="code">446</field>
@@ -4707,7 +4707,7 @@
             <field name="parent_id" ref="pgc_446"/>
             <field name="type">other</field>
             <field name="name">Deudores de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_449" model="account.account.template">
             <field name="code">449</field>
@@ -4715,7 +4715,7 @@
             <field name="parent_id" ref="pgc_44"/>
             <field name="type">view</field>
             <field name="name">Deudores por operaciones en común</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_449_child" model="account.account.template">
             <field name="code">449</field>
@@ -4723,7 +4723,7 @@
             <field name="parent_id" ref="pgc_449"/>
             <field name="type">other</field>
             <field name="name">Deudores por operaciones en común</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_46" model="account.account.template">
             <field name="code">46</field>
@@ -4739,7 +4739,7 @@
             <field name="parent_id" ref="pgc_46"/>
             <field name="type">view</field>
             <field name="name">Anticipos de remuneraciones</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_460_child" model="account.account.template">
             <field name="code">460</field>
@@ -4747,7 +4747,7 @@
             <field name="parent_id" ref="pgc_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_465" model="account.account.template">
             <field name="code">465</field>
@@ -4755,7 +4755,7 @@
             <field name="parent_id" ref="pgc_46"/>
             <field name="type">view</field>
             <field name="name">Remuneraciones pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_465_child" model="account.account.template">
             <field name="code">465</field>
@@ -4763,7 +4763,7 @@
             <field name="parent_id" ref="pgc_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_466" model="account.account.template">
             <field name="code">466</field>
@@ -4771,7 +4771,7 @@
             <field name="parent_id" ref="pgc_46"/>
             <field name="type">view</field>
             <field name="name">Remuneraciones mediante sistemas de aportación definida pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_466_child" model="account.account.template">
             <field name="code">466</field>
@@ -4779,7 +4779,7 @@
             <field name="parent_id" ref="pgc_466"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones mediante sistemas de aportación definida pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_47" model="account.account.template">
             <field name="code">47</field>
@@ -5059,7 +5059,7 @@
             <field name="parent_id" ref="pgc_48"/>
             <field name="type">view</field>
             <field name="name">Gastos anticipados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_480_child" model="account.account.template">
             <field name="code">480</field>
@@ -5067,7 +5067,7 @@
             <field name="parent_id" ref="pgc_480"/>
             <field name="type">other</field>
             <field name="name">Gastos anticipados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_485" model="account.account.template">
             <field name="code">485</field>
@@ -5075,7 +5075,7 @@
             <field name="parent_id" ref="pgc_48"/>
             <field name="type">view</field>
             <field name="name">Ingresos anticipados</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_485_child" model="account.account.template">
             <field name="code">485</field>
@@ -5083,7 +5083,7 @@
             <field name="parent_id" ref="pgc_485"/>
             <field name="type">other</field>
             <field name="name">Ingresos anticipados</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_49" model="account.account.template">
             <field name="code">49</field>
diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml
index 50ab4987113..2e52df600ab 100644
--- a/addons/l10n_es/account_chart_pymes.xml
+++ b/addons/l10n_es/account_chart_pymes.xml
@@ -3550,7 +3550,7 @@
             <field name="parent_id" ref="pgc_pymes_4"/>
             <field name="type">view</field>
             <field name="name">Proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_400" model="account.account.template">
             <field name="code">400</field>
@@ -3558,7 +3558,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4000" model="account.account.template">
             <field name="code">4000</field>
@@ -3566,7 +3566,7 @@
             <field name="parent_id" ref="pgc_pymes_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4000_child" model="account.account.template">
             <field name="code">4000</field>
@@ -3574,7 +3574,7 @@
             <field name="parent_id" ref="pgc_pymes_4000"/>
             <field name="type">payable</field>
             <field name="name">Proveedores (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4004" model="account.account.template">
             <field name="code">4004</field>
@@ -3582,7 +3582,7 @@
             <field name="parent_id" ref="pgc_pymes_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4004_child" model="account.account.template">
             <field name="code">4004</field>
@@ -3590,7 +3590,7 @@
             <field name="parent_id" ref="pgc_pymes_4004"/>
             <field name="type">payable</field>
             <field name="name">Proveedores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4009" model="account.account.template">
             <field name="code">4009</field>
@@ -3598,7 +3598,7 @@
             <field name="parent_id" ref="pgc_pymes_400"/>
             <field name="type">view</field>
             <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4009_child" model="account.account.template">
             <field name="code">4009</field>
@@ -3606,7 +3606,7 @@
             <field name="parent_id" ref="pgc_pymes_4009"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_401" model="account.account.template">
             <field name="code">401</field>
@@ -3614,7 +3614,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_401_child" model="account.account.template">
             <field name="code">401</field>
@@ -3622,7 +3622,7 @@
             <field name="parent_id" ref="pgc_pymes_401"/>
             <field name="type">other</field>
             <field name="name">Proveedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_403" model="account.account.template">
             <field name="code">403</field>
@@ -3630,7 +3630,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4030" model="account.account.template">
             <field name="code">4030</field>
@@ -3638,7 +3638,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4030_child" model="account.account.template">
             <field name="code">4030</field>
@@ -3646,7 +3646,7 @@
             <field name="parent_id" ref="pgc_pymes_4030"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4031" model="account.account.template">
             <field name="code">4031</field>
@@ -3654,7 +3654,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4031_child" model="account.account.template">
             <field name="code">4031</field>
@@ -3662,7 +3662,7 @@
             <field name="parent_id" ref="pgc_pymes_4031"/>
             <field name="type">payable</field>
             <field name="name">Efectos comerciales a pagar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4034" model="account.account.template">
             <field name="code">4034</field>
@@ -3670,7 +3670,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4034_child" model="account.account.template">
             <field name="code">4034</field>
@@ -3678,7 +3678,7 @@
             <field name="parent_id" ref="pgc_pymes_4034"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4036" model="account.account.template">
             <field name="code">4036</field>
@@ -3686,7 +3686,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4036_child" model="account.account.template">
             <field name="code">4036</field>
@@ -3694,7 +3694,7 @@
             <field name="parent_id" ref="pgc_pymes_4036"/>
             <field name="type">payable</field>
             <field name="name">Envases y embalajes a devolver a proveedores, empresas del grupo</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4039" model="account.account.template">
             <field name="code">4039</field>
@@ -3702,7 +3702,7 @@
             <field name="parent_id" ref="pgc_pymes_403"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4039_child" model="account.account.template">
             <field name="code">4039</field>
@@ -3710,7 +3710,7 @@
             <field name="parent_id" ref="pgc_pymes_4039"/>
             <field name="type">payable</field>
             <field name="name">Proveedores, empresas del grupo, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_404" model="account.account.template">
             <field name="code">404</field>
@@ -3718,7 +3718,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, empresas asociadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_404_child" model="account.account.template">
             <field name="code">404</field>
@@ -3726,7 +3726,7 @@
             <field name="parent_id" ref="pgc_pymes_404"/>
             <field name="type">other</field>
             <field name="name">Proveedores, empresas asociadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_405" model="account.account.template">
             <field name="code">405</field>
@@ -3734,7 +3734,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Proveedores, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_405_child" model="account.account.template">
             <field name="code">405</field>
@@ -3742,7 +3742,7 @@
             <field name="parent_id" ref="pgc_pymes_405"/>
             <field name="type">other</field>
             <field name="name">Proveedores, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_406" model="account.account.template">
             <field name="code">406</field>
@@ -3750,7 +3750,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_406_child" model="account.account.template">
             <field name="code">406</field>
@@ -3758,7 +3758,7 @@
             <field name="parent_id" ref="pgc_pymes_406"/>
             <field name="type">other</field>
             <field name="name">Envases y embalajes a devolver a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_407" model="account.account.template">
             <field name="code">407</field>
@@ -3766,7 +3766,7 @@
             <field name="parent_id" ref="pgc_pymes_40"/>
             <field name="type">view</field>
             <field name="name">Anticipos a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_407_child" model="account.account.template">
             <field name="code">407</field>
@@ -3774,7 +3774,7 @@
             <field name="parent_id" ref="pgc_pymes_407"/>
             <field name="type">other</field>
             <field name="name">Anticipos a proveedores</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_41" model="account.account.template">
             <field name="code">41</field>
@@ -3782,7 +3782,7 @@
             <field name="parent_id" ref="pgc_pymes_4"/>
             <field name="type">view</field>
             <field name="name">Acreedores varios</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_410" model="account.account.template">
             <field name="code">410</field>
@@ -3790,7 +3790,7 @@
             <field name="parent_id" ref="pgc_pymes_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4100" model="account.account.template">
             <field name="code">4100</field>
@@ -3798,7 +3798,7 @@
             <field name="parent_id" ref="pgc_pymes_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4100_child" model="account.account.template">
             <field name="code">4100</field>
@@ -3806,7 +3806,7 @@
             <field name="parent_id" ref="pgc_pymes_4100"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios (euros)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4104" model="account.account.template">
             <field name="code">4104</field>
@@ -3814,7 +3814,7 @@
             <field name="parent_id" ref="pgc_pymes_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4104_child" model="account.account.template">
             <field name="code">4104</field>
@@ -3822,7 +3822,7 @@
             <field name="parent_id" ref="pgc_pymes_4104"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4109" model="account.account.template">
             <field name="code">4109</field>
@@ -3830,7 +3830,7 @@
             <field name="parent_id" ref="pgc_pymes_410"/>
             <field name="type">view</field>
             <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_4109_child" model="account.account.template">
             <field name="code">4109</field>
@@ -3838,7 +3838,7 @@
             <field name="parent_id" ref="pgc_pymes_4109"/>
             <field name="type">payable</field>
             <field name="name">Acreedores por prestaciones de servicios, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_411" model="account.account.template">
             <field name="code">411</field>
@@ -3846,7 +3846,7 @@
             <field name="parent_id" ref="pgc_pymes_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_411_child" model="account.account.template">
             <field name="code">411</field>
@@ -3854,7 +3854,7 @@
             <field name="parent_id" ref="pgc_pymes_411"/>
             <field name="type">other</field>
             <field name="name">Acreedores, efectos comerciales a pagar</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_419" model="account.account.template">
             <field name="code">419</field>
@@ -3862,7 +3862,7 @@
             <field name="parent_id" ref="pgc_pymes_41"/>
             <field name="type">view</field>
             <field name="name">Acreedores por operaciones en común</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_419_child" model="account.account.template">
             <field name="code">419</field>
@@ -3870,7 +3870,7 @@
             <field name="parent_id" ref="pgc_pymes_419"/>
             <field name="type">other</field>
             <field name="name">Acreedores por operaciones en común</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_43" model="account.account.template">
             <field name="code">43</field>
@@ -3878,7 +3878,7 @@
             <field name="parent_id" ref="pgc_pymes_4"/>
             <field name="type">view</field>
             <field name="name">Clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_430" model="account.account.template">
             <field name="code">430</field>
@@ -3886,7 +3886,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4300" model="account.account.template">
             <field name="code">4300</field>
@@ -3894,7 +3894,7 @@
             <field name="parent_id" ref="pgc_pymes_430"/>
             <field name="type">view</field>
             <field name="name">Clientes (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4300_child" model="account.account.template">
             <field name="code">4300</field>
@@ -3902,7 +3902,7 @@
             <field name="parent_id" ref="pgc_pymes_4300"/>
             <field name="type">receivable</field>
             <field name="name">Clientes (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4304" model="account.account.template">
             <field name="code">4304</field>
@@ -3910,7 +3910,7 @@
             <field name="parent_id" ref="pgc_pymes_430"/>
             <field name="type">view</field>
             <field name="name">Clientes (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4304_child" model="account.account.template">
             <field name="code">4304</field>
@@ -3918,7 +3918,7 @@
             <field name="parent_id" ref="pgc_pymes_4304"/>
             <field name="type">receivable</field>
             <field name="name">Clientes (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4309" model="account.account.template">
             <field name="code">4309</field>
@@ -3926,7 +3926,7 @@
             <field name="parent_id" ref="pgc_pymes_430"/>
             <field name="type">view</field>
             <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4309_child" model="account.account.template">
             <field name="code">4309</field>
@@ -3934,7 +3934,7 @@
             <field name="parent_id" ref="pgc_pymes_4309"/>
             <field name="type">receivable</field>
             <field name="name">Clientes, facturas pendientes de recibir o de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_431" model="account.account.template">
             <field name="code">431</field>
@@ -3942,7 +3942,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, efectos comerciales a cobrar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4310" model="account.account.template">
             <field name="code">4310</field>
@@ -3950,7 +3950,7 @@
             <field name="parent_id" ref="pgc_pymes_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4310_child" model="account.account.template">
             <field name="code">4310</field>
@@ -3958,7 +3958,7 @@
             <field name="parent_id" ref="pgc_pymes_4310"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4311" model="account.account.template">
             <field name="code">4311</field>
@@ -3966,7 +3966,7 @@
             <field name="parent_id" ref="pgc_pymes_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4311_child" model="account.account.template">
             <field name="code">4311</field>
@@ -3974,7 +3974,7 @@
             <field name="parent_id" ref="pgc_pymes_4311"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4312" model="account.account.template">
             <field name="code">4312</field>
@@ -3982,7 +3982,7 @@
             <field name="parent_id" ref="pgc_pymes_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4312_child" model="account.account.template">
             <field name="code">4312</field>
@@ -3990,7 +3990,7 @@
             <field name="parent_id" ref="pgc_pymes_4312"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4315" model="account.account.template">
             <field name="code">4315</field>
@@ -3998,7 +3998,7 @@
             <field name="parent_id" ref="pgc_pymes_431"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4315_child" model="account.account.template">
             <field name="code">4315</field>
@@ -4006,7 +4006,7 @@
             <field name="parent_id" ref="pgc_pymes_4315"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_432" model="account.account.template">
             <field name="code">432</field>
@@ -4014,7 +4014,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_432_child" model="account.account.template">
             <field name="code">432</field>
@@ -4022,7 +4022,7 @@
             <field name="parent_id" ref="pgc_pymes_432"/>
             <field name="type">other</field>
             <field name="name">Clientes, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_433" model="account.account.template">
             <field name="code">433</field>
@@ -4030,7 +4030,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4330" model="account.account.template">
             <field name="code">4330</field>
@@ -4038,7 +4038,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4330_child" model="account.account.template">
             <field name="code">4330</field>
@@ -4046,7 +4046,7 @@
             <field name="parent_id" ref="pgc_pymes_4330"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4331" model="account.account.template">
             <field name="code">4331</field>
@@ -4054,7 +4054,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4331_child" model="account.account.template">
             <field name="code">4331</field>
@@ -4062,7 +4062,7 @@
             <field name="parent_id" ref="pgc_pymes_4331"/>
             <field name="type">receivable</field>
             <field name="name">Efectos comerciales a cobrar, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4332" model="account.account.template">
             <field name="code">4332</field>
@@ -4070,7 +4070,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4332_child" model="account.account.template">
             <field name="code">4332</field>
@@ -4078,7 +4078,7 @@
             <field name="parent_id" ref="pgc_pymes_4332"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo, operaciones de factoring</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4334" model="account.account.template">
             <field name="code">4334</field>
@@ -4086,7 +4086,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4334_child" model="account.account.template">
             <field name="code">4334</field>
@@ -4094,7 +4094,7 @@
             <field name="parent_id" ref="pgc_pymes_4334"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4336" model="account.account.template">
             <field name="code">4336</field>
@@ -4102,7 +4102,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4336_child" model="account.account.template">
             <field name="code">4336</field>
@@ -4110,7 +4110,7 @@
             <field name="parent_id" ref="pgc_pymes_4336"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4337" model="account.account.template">
             <field name="code">4337</field>
@@ -4118,7 +4118,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4337_child" model="account.account.template">
             <field name="code">4337</field>
@@ -4126,7 +4126,7 @@
             <field name="parent_id" ref="pgc_pymes_4337"/>
             <field name="type">receivable</field>
             <field name="name">Envases y embalajes a devolver a clientes, empresas del grupo</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4339" model="account.account.template">
             <field name="code">4339</field>
@@ -4134,7 +4134,7 @@
             <field name="parent_id" ref="pgc_pymes_433"/>
             <field name="type">view</field>
             <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4339_child" model="account.account.template">
             <field name="code">4339</field>
@@ -4142,7 +4142,7 @@
             <field name="parent_id" ref="pgc_pymes_4339"/>
             <field name="type">receivable</field>
             <field name="name">Clientes empresas del grupo, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_434" model="account.account.template">
             <field name="code">434</field>
@@ -4150,7 +4150,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, empresas asociadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_434_child" model="account.account.template">
             <field name="code">434</field>
@@ -4158,7 +4158,7 @@
             <field name="parent_id" ref="pgc_pymes_434"/>
             <field name="type">other</field>
             <field name="name">Clientes, empresas asociadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_435" model="account.account.template">
             <field name="code">435</field>
@@ -4166,7 +4166,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_435_child" model="account.account.template">
             <field name="code">435</field>
@@ -4174,7 +4174,7 @@
             <field name="parent_id" ref="pgc_pymes_435"/>
             <field name="type">other</field>
             <field name="name">Clientes, otras partes vinculadas</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_436" model="account.account.template">
             <field name="code">436</field>
@@ -4182,7 +4182,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Clientes de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_436_child" model="account.account.template">
             <field name="code">436</field>
@@ -4190,7 +4190,7 @@
             <field name="parent_id" ref="pgc_pymes_436"/>
             <field name="type">other</field>
             <field name="name">Clientes de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_437" model="account.account.template">
             <field name="code">437</field>
@@ -4198,7 +4198,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Envases y embalajes a devolver por clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_437_child" model="account.account.template">
             <field name="code">437</field>
@@ -4206,7 +4206,7 @@
             <field name="parent_id" ref="pgc_pymes_437"/>
             <field name="type">other</field>
             <field name="name">Envases y embalajes a devolver por clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_438" model="account.account.template">
             <field name="code">438</field>
@@ -4214,7 +4214,7 @@
             <field name="parent_id" ref="pgc_pymes_43"/>
             <field name="type">view</field>
             <field name="name">Anticipos de clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_438_child" model="account.account.template">
             <field name="code">438</field>
@@ -4222,7 +4222,7 @@
             <field name="parent_id" ref="pgc_pymes_438"/>
             <field name="type">other</field>
             <field name="name">Anticipos de clientes</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_44" model="account.account.template">
             <field name="code">44</field>
@@ -4230,7 +4230,7 @@
             <field name="parent_id" ref="pgc_pymes_4"/>
             <field name="type">view</field>
             <field name="name">Deudores varios</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_440" model="account.account.template">
             <field name="code">440</field>
@@ -4238,7 +4238,7 @@
             <field name="parent_id" ref="pgc_pymes_44"/>
             <field name="type">view</field>
             <field name="name">Deudores</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4400" model="account.account.template">
             <field name="code">4400</field>
@@ -4246,7 +4246,7 @@
             <field name="parent_id" ref="pgc_pymes_440"/>
             <field name="type">view</field>
             <field name="name">Deudores (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4400_child" model="account.account.template">
             <field name="code">4400</field>
@@ -4254,7 +4254,7 @@
             <field name="parent_id" ref="pgc_pymes_4400"/>
             <field name="type">receivable</field>
             <field name="name">Deudores (euros)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4404" model="account.account.template">
             <field name="code">4404</field>
@@ -4262,7 +4262,7 @@
             <field name="parent_id" ref="pgc_pymes_440"/>
             <field name="type">view</field>
             <field name="name">Deudores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4404_child" model="account.account.template">
             <field name="code">4404</field>
@@ -4270,7 +4270,7 @@
             <field name="parent_id" ref="pgc_pymes_4404"/>
             <field name="type">receivable</field>
             <field name="name">Deudores (moneda extranjera)</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4409" model="account.account.template">
             <field name="code">4409</field>
@@ -4278,7 +4278,7 @@
             <field name="parent_id" ref="pgc_pymes_440"/>
             <field name="type">view</field>
             <field name="name">Deudores, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4409_child" model="account.account.template">
             <field name="code">4409</field>
@@ -4286,7 +4286,7 @@
             <field name="parent_id" ref="pgc_pymes_4409"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, facturas pendientes de formalizar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_441" model="account.account.template">
             <field name="code">441</field>
@@ -4294,7 +4294,7 @@
             <field name="parent_id" ref="pgc_pymes_44"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales a cobrar</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4410" model="account.account.template">
             <field name="code">4410</field>
@@ -4302,7 +4302,7 @@
             <field name="parent_id" ref="pgc_pymes_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4410_child" model="account.account.template">
             <field name="code">4410</field>
@@ -4310,7 +4310,7 @@
             <field name="parent_id" ref="pgc_pymes_4410"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales en cartera</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4411" model="account.account.template">
             <field name="code">4411</field>
@@ -4318,7 +4318,7 @@
             <field name="parent_id" ref="pgc_pymes_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4411_child" model="account.account.template">
             <field name="code">4411</field>
@@ -4326,7 +4326,7 @@
             <field name="parent_id" ref="pgc_pymes_4411"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales descontados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4412" model="account.account.template">
             <field name="code">4412</field>
@@ -4334,7 +4334,7 @@
             <field name="parent_id" ref="pgc_pymes_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4412_child" model="account.account.template">
             <field name="code">4412</field>
@@ -4342,7 +4342,7 @@
             <field name="parent_id" ref="pgc_pymes_4412"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales en gestión de cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4415" model="account.account.template">
             <field name="code">4415</field>
@@ -4350,7 +4350,7 @@
             <field name="parent_id" ref="pgc_pymes_441"/>
             <field name="type">view</field>
             <field name="name">Deudores, efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_4415_child" model="account.account.template">
             <field name="code">4415</field>
@@ -4358,7 +4358,7 @@
             <field name="parent_id" ref="pgc_pymes_4415"/>
             <field name="type">receivable</field>
             <field name="name">Deudores, efectos comerciales impagados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_446" model="account.account.template">
             <field name="code">446</field>
@@ -4366,7 +4366,7 @@
             <field name="parent_id" ref="pgc_pymes_44"/>
             <field name="type">view</field>
             <field name="name">Deudores de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_446_child" model="account.account.template">
             <field name="code">446</field>
@@ -4374,7 +4374,7 @@
             <field name="parent_id" ref="pgc_pymes_446"/>
             <field name="type">other</field>
             <field name="name">Deudores de dudoso cobro</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_449" model="account.account.template">
             <field name="code">449</field>
@@ -4382,7 +4382,7 @@
             <field name="parent_id" ref="pgc_pymes_44"/>
             <field name="type">view</field>
             <field name="name">Deudores por operaciones en común</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_449_child" model="account.account.template">
             <field name="code">449</field>
@@ -4390,7 +4390,7 @@
             <field name="parent_id" ref="pgc_pymes_449"/>
             <field name="type">other</field>
             <field name="name">Deudores por operaciones en común</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_46" model="account.account.template">
             <field name="code">46</field>
@@ -4406,7 +4406,7 @@
             <field name="parent_id" ref="pgc_pymes_46"/>
             <field name="type">view</field>
             <field name="name">Anticipos de remuneraciones</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_460_child" model="account.account.template">
             <field name="code">460</field>
@@ -4414,7 +4414,7 @@
             <field name="parent_id" ref="pgc_pymes_460"/>
             <field name="type">other</field>
             <field name="name">Anticipos de remuneraciones</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_465" model="account.account.template">
             <field name="code">465</field>
@@ -4422,7 +4422,7 @@
             <field name="parent_id" ref="pgc_pymes_46"/>
             <field name="type">view</field>
             <field name="name">Remuneraciones pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_465_child" model="account.account.template">
             <field name="code">465</field>
@@ -4430,7 +4430,7 @@
             <field name="parent_id" ref="pgc_pymes_465"/>
             <field name="type">other</field>
             <field name="name">Remuneraciones pendientes de pago</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_47" model="account.account.template">
             <field name="code">47</field>
@@ -4710,7 +4710,7 @@
             <field name="parent_id" ref="pgc_pymes_48"/>
             <field name="type">view</field>
             <field name="name">Gastos anticipados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_480_child" model="account.account.template">
             <field name="code">480</field>
@@ -4718,7 +4718,7 @@
             <field name="parent_id" ref="pgc_pymes_480"/>
             <field name="type">other</field>
             <field name="name">Gastos anticipados</field>
-            <field name="user_type" ref="terceros - rec"/>
+            <field name="user_type" ref="terceros_-_rec"/>
         </record>
         <record id="pgc_pymes_485" model="account.account.template">
             <field name="code">485</field>
@@ -4726,7 +4726,7 @@
             <field name="parent_id" ref="pgc_pymes_48"/>
             <field name="type">view</field>
             <field name="name">Ingresos anticipados</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_485_child" model="account.account.template">
             <field name="code">485</field>
@@ -4734,7 +4734,7 @@
             <field name="parent_id" ref="pgc_pymes_485"/>
             <field name="type">other</field>
             <field name="name">Ingresos anticipados</field>
-            <field name="user_type" ref="terceros - pay"/>
+            <field name="user_type" ref="terceros_-_pay"/>
         </record>
         <record id="pgc_pymes_49" model="account.account.template">
             <field name="code">49</field>
diff --git a/addons/l10n_es/i18n/es.po b/addons/l10n_es/i18n/es.po
index a8368296c5b..440cd3605a6 100644
--- a/addons/l10n_es/i18n/es.po
+++ b/addons/l10n_es/i18n/es.po
@@ -7,13 +7,13 @@ 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-12-27 10:16+0000\n"
+"PO-Revision-Date: 2010-12-28 07:52+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_es
diff --git a/addons/l10n_es/i18n/l10n_es.pot b/addons/l10n_es/i18n/l10n_es.pot
index 3e5e90d0007..218bd78a35d 100644
--- a/addons/l10n_es/i18n/l10n_es.pot
+++ b/addons/l10n_es/i18n/l10n_es.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:50+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. 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 ""
+
 #. module: l10n_es
 #: model:account.fiscal.position.template,name:l10n_es.fp_extra
 #: model:account.fiscal.position.template,name:l10n_es.fp_pymes_extra
@@ -27,92 +33,12 @@ msgstr ""
 msgid "Retención IRPF 15%"
 msgstr ""
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. 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 ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros - rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
-msgid "Terceros"
-msgstr ""
-
 #. 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 ""
 
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros - pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. 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 ""
-
-#. 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 ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. 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 ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
-#. 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 ""
-
 #. module: l10n_es
 #: model:ir.module.module,description:l10n_es.module_meta_information
 msgid "Spanish Charts of Accounts (PGCE 2008)\n"
@@ -129,18 +55,27 @@ msgid "Spanish Charts of Accounts (PGCE 2008)\n"
 msgstr ""
 
 #. module: l10n_es
-#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
-msgid "Spanish Charts of Accounts (PGCE 2008)"
+#: 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 ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
+#: 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 ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
+#: 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 ""
+
+#. 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 ""
 
 #. module: l10n_es
@@ -156,7 +91,7 @@ msgid "Retención IRPF 2%"
 msgstr ""
 
 #. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
+msgid "Spanish Charts of Accounts (PGCE 2008)"
 msgstr ""
 
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index 512976833d3..93e6d51a4bc 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 10:47+0000\n"
+"PO-Revision-Date: 2010-12-28 09:12+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/l10n_fr.pot b/addons/l10n_fr/i18n/l10n_fr.pot
index a9665579cc6..37ef8a71197 100644
--- a/addons/l10n_fr/i18n/l10n_fr.pot
+++ b/addons/l10n_fr/i18n/l10n_fr.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:28+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:28+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:52+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,45 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_fr
-#: model:ir.module.module,description:l10n_fr.module_meta_information
-msgid "This is the module to manage the accounting chart for France in OpenERP.\n"
-"\n"
-"Credits: Sistheo Zeekom CrysaLEAD\n"
-""
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_immobilisations
-msgid "Immobilisations"
-msgstr ""
-
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
 msgid "France"
 msgstr ""
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_equity
-msgid "Equity"
-msgstr ""
-
 #. module: l10n_fr
 #: view:account.bilan.report:0
 #: view:account.cdr.report:0
@@ -66,8 +33,11 @@ msgid "Account Bilan Report"
 msgstr ""
 
 #. module: l10n_fr
-#: model:ir.model,name:l10n_fr.model_l10n_fr_report
-msgid "Report for l10n_fr"
+#: model:ir.module.module,description:l10n_fr.module_meta_information
+msgid "This is the module to manage the accounting chart for France in OpenERP.\n"
+"\n"
+"Credits: Sistheo Zeekom CrysaLEAD\n"
+""
 msgstr ""
 
 #. module: l10n_fr
@@ -75,34 +45,19 @@ msgstr ""
 msgid "Zone Euro"
 msgstr ""
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_expense
-msgid "Expense"
-msgstr ""
-
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_account_cdr_report
 msgid "Account CDR Report"
 msgstr ""
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_provision
-msgid "Provisions"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_payable
-msgid "Payable"
-msgstr ""
-
 #. module: l10n_fr
 #: view:account.cdr.report:0
 msgid "Compte de resultant"
 msgstr ""
 
 #. module: l10n_fr
-#: field:l10n.fr.line,report_id:0
-msgid "Report"
+#: sql_constraint:l10n.fr.report:0
+msgid "The code report must be unique !"
 msgstr ""
 
 #. module: l10n_fr
@@ -110,11 +65,6 @@ msgstr ""
 msgid "Hors Euro"
 msgstr ""
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_commitment
-msgid "Engagements"
-msgstr ""
-
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_l10n_fr_line
 msgid "Report Lines for l10n_fr"
@@ -141,29 +91,14 @@ msgstr ""
 msgid "Compte de resultat Report"
 msgstr ""
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_stock
-msgid "Stocks"
-msgstr ""
-
 #. module: l10n_fr
 #: field:l10n.fr.report,line_ids:0
 msgid "Lines"
 msgstr ""
 
 #. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_special
-msgid "Comptes spéciaux"
-msgstr ""
-
-#. module: l10n_fr
-#: sql_constraint:l10n.fr.report:0
-msgid "The code report must be unique !"
+#: field:l10n.fr.line,report_id:0
+msgid "Report"
 msgstr ""
 
 #. module: l10n_fr
@@ -173,18 +108,8 @@ msgid "Fiscal Year"
 msgstr ""
 
 #. module: l10n_fr
-#: field:l10n.fr.report,code:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_dettes
-msgid "Dettes long terme"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_view
-msgid "View"
+#: model:ir.model,name:l10n_fr.model_l10n_fr_report
+msgid "Report for l10n_fr"
 msgstr ""
 
 #. module: l10n_fr
@@ -193,8 +118,8 @@ msgid "The variable name must be unique !"
 msgstr ""
 
 #. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_stocks
-msgid "Actif circulant"
+#: field:l10n.fr.report,code:0
+msgid "Code"
 msgstr ""
 
 #. module: l10n_fr
@@ -213,11 +138,6 @@ msgstr ""
 msgid "France - Plan Comptable Général"
 msgstr ""
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_tax
-msgid "Tax"
-msgstr ""
-
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_3
 msgid "DOM-TOM"
@@ -229,11 +149,6 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_cloture
-msgid "Cloture"
-msgstr ""
-
 #. module: l10n_fr
 #: field:l10n.fr.line,code:0
 msgid "Variable Name"
diff --git a/addons/l10n_fr/test/l10n_fr_report.yml b/addons/l10n_fr/test/l10n_fr_report.yml
index 7cf9b161223..aadd2c97311 100644
--- a/addons/l10n_fr/test/l10n_fr_report.yml
+++ b/addons/l10n_fr/test/l10n_fr_report.yml
@@ -1,23 +1,9 @@
--
-  In order to test Generate Fiscalyear Opening Entries wizard of OpenERP I first create a fiscalyear "Fiscal Year 2011" to which the entries will move
--
-  !record {model: account.fiscalyear, id: account_fiscalyear_01}:
-    code: FY2011
-    company_id: base.main_company
-    date_start: '2012-01-01'
-    date_stop: '2012-12-31'
-    name: Fiscal Year 2012
--
-  I create the fiscal periods
--
-  !python {model: account.fiscalyear}:
-    self.create_period(cr, uid, [ref('account_fiscalyear_01'),])
 -
   In order to test the PDF reports defined on a l10n_fr, we will print an Account Move Line Report for l10n_fr
 -
   !python {model: account.move.line}: |
     import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_01')}}, {})
+    (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account.data_fiscalyear')}}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan_report.'+format), 'wb+').write(data)
 
diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml
index 133a816d0be..7179eb8a4eb 100644
--- a/addons/l10n_gr/account_tax.xml
+++ b/addons/l10n_gr/account_tax.xml
@@ -213,11 +213,11 @@
         <field name="ref_tax_code_id" ref="vat_code_input_S"/> -->
     </record>
 
-    <!-- *-* revise the ΦΠΑ.. -->
+    <!-- revise the tax.. -->
 
     <record id="ovat19" model="account.tax.template">
         <field name="chart_template_id" ref="l10n_gr_chart_template"/>
-        <field name="name">Εκροές 19</field>
+        <field name="name">Outputs 19</field>
         <field eval="0.19" name="amount"/>
         <field name="type">percent</field>
     	<field name="type_tax_use">purchase</field>
diff --git a/addons/l10n_gr/i18n/es.po b/addons/l10n_gr/i18n/es.po
index 2a1fe5325c2..802e2649216 100644
--- a/addons/l10n_gr/i18n/es.po
+++ b/addons/l10n_gr/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-27 10:51+0000\n"
+"PO-Revision-Date: 2010-12-28 09:07+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_gr
diff --git a/addons/l10n_gr/i18n/l10n_gr.pot b/addons/l10n_gr/i18n/l10n_gr.pot
index 5564bce48de..14ae239e816 100644
--- a/addons/l10n_gr/i18n/l10n_gr.pot
+++ b/addons/l10n_gr/i18n/l10n_gr.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:29+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:29+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,26 +15,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
 #. 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 ""
 
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_tax
-msgid "Tax"
-msgstr ""
-
 #. module: l10n_gr
 #: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
 msgid "Greece - minimal"
@@ -46,38 +31,3 @@ msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pa
 "	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
 msgstr ""
 
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_other
-msgid "Other"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_view
-msgid "View"
-msgstr ""
-
diff --git a/addons/l10n_gt/i18n/l10n_gt.pot b/addons/l10n_gt/i18n/l10n_gt.pot
index da81c7b11e4..034fd23f52d 100644
--- a/addons/l10n_gt/i18n/l10n_gt.pot
+++ b/addons/l10n_gt/i18n/l10n_gt.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,43 +16,8 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_vista
-msgid "Vista"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_cxp
-msgid "Cuentas por Pagar"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_cxc
-msgid "Cuentas por Cobrar"
-msgstr ""
-
-#. module: l10n_gt
-#: model:ir.module.module,description:l10n_gt.module_meta_information
-msgid "Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala.  It also includes taxes and the Quetzal currency"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_gastos
-msgid "Gastos"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_pasivo
-msgid "Pasivo"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_activo
-msgid "Activo"
+#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
+msgid "Guatemala - Plan contable general"
 msgstr ""
 
 #. module: l10n_gt
@@ -61,17 +26,7 @@ msgid "Generar la nomenclatura contable a partir de un modelo.  Deberá seleccio
 msgstr ""
 
 #. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_capital
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_gt
-#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
-msgid "Guatemala - Plan contable general"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_efectivo
-msgid "Efectivo"
+#: model:ir.module.module,description:l10n_gt.module_meta_information
+msgid "Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala.  It also includes taxes and the Quetzal currency"
 msgstr ""
 
diff --git a/addons/l10n_in/i18n/fr.po b/addons/l10n_in/i18n/fr.po
index ed415a3390b..c2a47f6ea1a 100644
--- a/addons/l10n_in/i18n/fr.po
+++ b/addons/l10n_in/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-11-25 15:28+0000\n"
-"PO-Revision-Date: 2010-12-19 09:47+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-28 15:38+0000\n"
+"Last-Translator: Aline (OpenERP) <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_in
@@ -36,7 +36,7 @@ msgstr "Erreur ! Vous ne pouvez pas créer de modèle de compte récursif."
 #. module: l10n_chart_in
 #: model:account.journal,name:l10n_chart_in.opening_journal
 msgid "Opening Journal"
-msgstr ""
+msgstr "Journal d'ouverture"
 
 #. module: l10n_chart_in
 #: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal
diff --git a/addons/l10n_in/i18n/fr_BE.po b/addons/l10n_in/i18n/fr_BE.po
deleted file mode 100644
index 1d4fe34679b..00000000000
--- a/addons/l10n_in/i18n/fr_BE.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* l10n_in
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 15:28:53+0000\n"
-"PO-Revision-Date: 2009-11-25 15:28:53+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_in
-#: model:ir.module.module,description:l10n_in.module_meta_information
-msgid "\n"
-"    Indian Accounting : chart of Account\n"
-"    "
-msgstr ""
-
-#. module: l10n_in
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_in
-#: model:account.journal,name:l10n_in.opening_journal
-msgid "Opening Journal"
-msgstr ""
-
-#. module: l10n_in
-#: model:ir.actions.todo,note:l10n_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"
-"	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_liability1
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_asset1
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_closed1
-msgid "Closed"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_income1
-msgid "Income"
-msgstr ""
-
-#. module: l10n_in
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense1
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_in
-#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
-msgid "Indian Chart of Account"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_root_ind1
-msgid "View"
-msgstr ""
-
diff --git a/addons/l10n_in/i18n/l10n_in.pot b/addons/l10n_in/i18n/l10n_in.pot
index 7ba3b01b31c..b702fb84a6b 100644
--- a/addons/l10n_in/i18n/l10n_in.pot
+++ b/addons/l10n_in/i18n/l10n_in.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,11 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_asset_view
-msgid "Asset View"
-msgstr ""
-
 #. module: l10n_in
 #: model:ir.module.module,description:l10n_in.module_meta_information
 msgid "\n"
@@ -28,13 +23,8 @@ msgid "\n"
 msgstr ""
 
 #. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense_view
-msgid "Expense View"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_income_view
-msgid "Income View"
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
+msgid "Indian Chart of Account"
 msgstr ""
 
 #. module: l10n_in
@@ -43,43 +33,3 @@ msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pa
 "	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
 msgstr ""
 
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_liability1
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_asset1
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_closed1
-msgid "Closed"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_income1
-msgid "Income"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_liability_view
-msgid "Liability View"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense1
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_in
-#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
-msgid "Indian Chart of Account"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_root_ind1
-msgid "View"
-msgstr ""
-
diff --git a/addons/l10n_it/libroIVA.py b/addons/l10n_it/libroIVA.py
index 1805cd108bf..a78c81ffdb3 100755
--- a/addons/l10n_it/libroIVA.py
+++ b/addons/l10n_it/libroIVA.py
@@ -40,14 +40,14 @@ class l10n_chart_it_report_libroIVA (osv.osv):
 
     _columns = {
         'name': fields.char('Fiscal year',size=64),
-	'company_id': fields.many2one('res.company', 'Company'),
+        'company_id': fields.many2one('res.company', 'Company'),
     }
 
     def init (self, cr) :
         cr.execute("""DROP VIEW IF EXISTS account_report_libroiva""")
-	cr.execute("""
-		CREATE VIEW account_report_libroiva AS (
-			SELECT  id, name, company_id FROM account_fiscalyear
+        cr.execute("""
+                CREATE VIEW account_report_libroiva AS (
+                        SELECT  id, name, company_id FROM account_fiscalyear
         )""")
 l10n_chart_it_report_libroIVA()
 
diff --git a/addons/l10n_lu/i18n/l10n_lu.pot b/addons/l10n_lu/i18n/l10n_lu.pot
index c1d6d6de6fd..9687635e7a8 100644
--- a/addons/l10n_lu/i18n/l10n_lu.pot
+++ b/addons/l10n_lu/i18n/l10n_lu.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:32+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:32+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,25 +20,14 @@ msgstr ""
 msgid "Print Tax Statements"
 msgstr ""
 
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
 #. module: l10n_lu
 #: field:vat.declaration.report,tax_code_id:0
 msgid "Company"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
 msgstr ""
 
 #. module: l10n_lu
@@ -57,12 +46,7 @@ msgid "\n"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
+#: code:addons/l10n_lu/wizard/print_vat.py:65
 #, python-format
 msgid "pdf not created !"
 msgstr ""
@@ -73,26 +57,11 @@ msgid "VAT Declaration"
 msgstr ""
 
 #. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
+#: code:addons/l10n_lu/wizard/print_vat.py:65
 #, python-format
 msgid "Please check if package pdftk is installed!"
 msgstr ""
 
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr ""
-
 #. module: l10n_lu
 #: view:vat.declaration.report:0
 msgid "Cancel"
@@ -104,17 +73,8 @@ msgid "Luxembourg - Plan Comptable Minimum Normalise"
 msgstr ""
 
 #. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_creances
-msgid "Créances"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
 msgstr ""
 
diff --git a/addons/l10n_ma/i18n/es.po b/addons/l10n_ma/i18n/es.po
index c79984c7171..f287b15ab65 100644
--- a/addons/l10n_ma/i18n/es.po
+++ b/addons/l10n_ma/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-27 11:04+0000\n"
+"PO-Revision-Date: 2010-12-28 09:09+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ma
diff --git a/addons/l10n_ma/i18n/fr_BE.po b/addons/l10n_ma/i18n/fr_BE.po
deleted file mode 100644
index 75e994bf4a5..00000000000
--- a/addons/l10n_ma/i18n/fr_BE.po
+++ /dev/null
@@ -1,98 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* l10n_ma
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 15:53:51+0000\n"
-"PO-Revision-Date: 2009-11-25 15:53:51+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_stocks
-msgid "stocks"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_dettes
-msgid "dettes long terme"
-msgstr ""
-
-#. module: l10n_ma
-#: constraint:account.account.template:0
-msgid "Error ! You can not create recursive account templates."
-msgstr ""
-
-#. module: l10n_ma
-#: model:ir.module.module,shortdesc:l10n_ma.module_meta_information
-msgid "Maroc Plan comptable général pour les sociétés"
-msgstr ""
-
-#. module: l10n_ma
-#: model:ir.module.module,description:l10n_ma.module_meta_information
-msgid "This is the module to manage the accounting chart for Morocco in Open ERP."
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_ma
-#: model:ir.actions.todo,note:l10n_ma.config_call_account_template_morocco
-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"
-"	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_immobilisations
-msgid "immobilisations"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_ma
-#: constraint:account.tax.code.template:0
-msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.account_type_view
-msgid "View"
-msgstr ""
-
diff --git a/addons/l10n_ma/i18n/l10n_ma.pot b/addons/l10n_ma/i18n/l10n_ma.pot
index 7913362a486..dd7643a0278 100644
--- a/addons/l10n_ma/i18n/l10n_ma.pot
+++ b/addons/l10n_ma/i18n/l10n_ma.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:33+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:33+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:55+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:55+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,48 +16,8 @@ msgstr ""
 "Plural-Forms: \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 ""
-
-#. 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"
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
 msgstr ""
 
 #. module: l10n_ma
@@ -66,8 +26,13 @@ msgid "Definition"
 msgstr ""
 
 #. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_dlt
-msgid "Dettes à long terme"
+#: 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 ""
 
 #. module: l10n_ma
@@ -77,13 +42,13 @@ msgid "Name"
 msgstr ""
 
 #. module: l10n_ma
-#: field:l10n.ma.report,line_ids:0
-msgid "Lines"
+#: 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_tax
-msgid "Taxes"
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
 msgstr ""
 
 #. module: l10n_ma
@@ -102,52 +67,12 @@ msgid "Maroc - Plan Comptable Général"
 msgstr ""
 
 #. module: l10n_ma
-#: sql_constraint:l10n.ma.line:0
-msgid "The variable name must be unique !"
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
 msgstr ""
 
 #. 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 ""
-
-#. 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"
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
 msgstr ""
 
diff --git a/addons/l10n_uk/i18n/es.po b/addons/l10n_uk/i18n/es.po
index 5379ec01688..19e37401892 100644
--- a/addons/l10n_uk/i18n/es.po
+++ b/addons/l10n_uk/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-27 10:50+0000\n"
+"PO-Revision-Date: 2010-12-28 09:06+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: 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-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_uk
diff --git a/addons/l10n_uk/i18n/l10n_uk.pot b/addons/l10n_uk/i18n/l10n_uk.pot
index 1c3372445c6..fe712bbc694 100644
--- a/addons/l10n_uk/i18n/l10n_uk.pot
+++ b/addons/l10n_uk/i18n/l10n_uk.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:36+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:36+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:58+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:58+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,57 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_asset_view
-msgid "Asset View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. 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 generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-"    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_income_view
-msgid "Income View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_liability
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_payable
-msgid "Payable"
-msgstr ""
-
 #. module: l10n_uk
 #: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
 msgid "United Kingdom - minimal"
@@ -77,27 +26,8 @@ msgid "This is the base module to manage the accounting chart for United Kingdom
 msgstr ""
 
 #. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_liability_view
-msgid "Liability View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_expense_view
-msgid "Expense View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_view
-msgid "View"
+#: 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 generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
+"    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
 msgstr ""
 
diff --git a/addons/lunch/i18n/de.po b/addons/lunch/i18n/de.po
index 9563229e032..2addfbf6641 100644
--- a/addons/lunch/i18n/de.po
+++ b/addons/lunch/i18n/de.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-16 09:11+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 10:22+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: lunch
@@ -68,6 +69,15 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    Dieses Modul ist ein einfaches Basismodul zur Verwaltung der täglichen "
+"Mitarbeiterverpflegung.\n"
+"\n"
+"    Die Anwendung verfolgt die Bestellungen von Mitarbeitern und prüft Ein- "
+"und Auszahlung aus der\n"
+"    Gemeinschaftskasse. Ausserdem können für den Zweck der Anwendung "
+"Produkte und Kategorien definiert werden.\n"
+"    "
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -84,7 +94,7 @@ msgstr "März"
 #. module: lunch
 #: report:lunch.order:0
 msgid "Total :"
-msgstr ""
+msgstr "Bruttobetrag:"
 
 #. module: lunch
 #: field:report.lunch.amount,day:0
@@ -180,7 +190,7 @@ msgstr "Datum Erstellung"
 #. module: lunch
 #: report:lunch.order:0
 msgid "Name/Date"
-msgstr ""
+msgstr "Name/Datum"
 
 #. module: lunch
 #: field:lunch.order,descript:0
diff --git a/addons/lunch/i18n/es.po b/addons/lunch/i18n/es.po
new file mode 100644
index 00000000000..5762d6456e3
--- /dev/null
+++ b/addons/lunch/i18n/es.po
@@ -0,0 +1,550 @@
+# 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-31 10:38+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: 2011-01-01 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Reset cashbox"
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
+msgid "Lunch Orders"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Are you sure you want to cancel this order ?"
+msgstr "¿Seguro que desea cancelar este pedido?"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
+msgid "Cash Moves"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_order_confirm
+msgid "confirm Order"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "    7 Days    "
+msgstr "    7 días    "
+
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage lunch\n"
+"\n"
+"    keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+"    Apply Different Category for the product.\n"
+"    "
+msgstr ""
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:lunch.order:0
+msgid "Today"
+msgstr "Hoy"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: lunch
+#: field:report.lunch.amount,day:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel_values
+#: model:ir.model,name:lunch.model_lunch_order_cancel
+#: view:lunch.order:0
+#: view:lunch.order.cancel:0
+msgid "Cancel Order"
+msgstr "Cancelar pedido"
+
+#. module: lunch
+#: field:lunch.cashmove,amount:0
+#: field:report.lunch.amount,amount:0
+msgid "Amount"
+msgstr "Importe"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
+#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
+#: view:lunch.product:0
+msgid "Products"
+msgstr "Productos"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_amount
+msgid "Amount available by user and box"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_report_lunch_order
+msgid "Lunch Orders Statistics"
+msgstr "Estadísticas de pedidos de almuerzo"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: field:lunch.order,cashmove:0
+msgid "CashMove"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.order:0
+#: selection:lunch.order,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: lunch
+#: model:ir.module.module,shortdesc:lunch.module_meta_information
+msgid "Lunch Module"
+msgstr "Módulo de almuerzos"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Search Lunch Order"
+msgstr "Buscar pedido de almuerzo"
+
+#. module: lunch
+#: field:lunch.order,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: lunch
+#: field:report.lunch.order,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Box Amount by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Name/Date"
+msgstr "Nombre/Fecha"
+
+#. module: lunch
+#: field:lunch.order,descript:0
+msgid "Description Order"
+msgstr "Descripción pedido"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
+#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm_values
+#: view:lunch.order:0
+#: view:lunch.order.confirm:0
+msgid "Confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.amount:0
+#: view:report.lunch.order:0
+msgid "Box"
+msgstr "Caja"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "  365 Days  "
+msgstr "  365 días  "
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: lunch
+#: field:report.lunch.amount,date:0
+msgid "Created Date"
+msgstr "Fecha de creación"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
+msgid " Product Categories "
+msgstr " Categorías de producto "
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Set to Zero"
+msgstr "Establecer a cero"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashmove
+msgid "Cash Move"
+msgstr ""
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: lunch
+#: field:report.lunch.amount,month:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: lunch
+#: field:lunch.order.confirm,confirm_cashbox:0
+msgid "Name of box"
+msgstr "Nombre de la caja"
+
+#. module: lunch
+#: view:lunch.order.cancel:0
+msgid "Yes"
+msgstr "Sí"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_category
+#: view:lunch.category:0
+#: view:lunch.order:0
+#: field:lunch.order,category:0
+#: field:lunch.product,category_id:0
+msgid "Category"
+msgstr "Categoría"
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
+msgid "Product Categories"
+msgstr "Categorías de producto"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+#: view:lunch.order.cancel:0
+msgid "No"
+msgstr "No"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Orders Confirmation"
+msgstr "Confirmación de pedido"
+
+#. module: lunch
+#: view:lunch.cashbox.clean:0
+msgid "Are you sure you want to reset this cashbox ?"
+msgstr ""
+
+#. module: lunch
+#: selection:lunch.order,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
+#: view:report.lunch.order:0
+msgid "Lunch Order Analysis"
+msgstr "Análisis pedidos almuerzo"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: lunch
+#: field:lunch.cashmove,user_cashmove:0
+#: field:lunch.order,user_id:0
+#: field:report.lunch.amount,user_id:0
+#: field:report.lunch.order,user_id:0
+msgid "User Name"
+msgstr "Nombre usuario"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "Sales Analysis"
+msgstr "Análisis ventas"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_category_root_configuration
+msgid "Lunch"
+msgstr "Almuerzo"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: view:report.lunch.order:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+#: field:lunch.order,date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox_clean
+msgid "clean cashbox"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,active:0
+#: field:lunch.product,active:0
+msgid "Active"
+msgstr "Activo"
+
+#. module: lunch
+#: field:report.lunch.order,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_cashbox
+msgid "Cashbox for Lunch "
+msgstr ""
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean_values
+msgid "Set CashBox to Zero"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashmove,box:0
+#: field:report.lunch.amount,box:0
+msgid "Box Name"
+msgstr "Nombre caja"
+
+#. module: lunch
+#: view:lunch.order.confirm:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
+msgid " Cashboxes "
+msgstr ""
+
+#. module: lunch
+#: report:lunch.order:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: lunch
+#: field:lunch.order,product:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: lunch
+#: field:lunch.cashmove,name:0
+#: report:lunch.order:0
+#: field:lunch.product,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: lunch
+#: field:lunch.order,price:0
+#: field:lunch.product,price:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Search CashMove"
+msgstr ""
+
+#. module: lunch
+#: view:report.lunch.amount:0
+msgid "Total box"
+msgstr "Total caja"
+
+#. module: lunch
+#: model:ir.model,name:lunch.model_lunch_product
+msgid "Lunch Product"
+msgstr "Producto almuerzo"
+
+#. module: lunch
+#: field:lunch.cashbox,sum_remain:0
+msgid "Total Remaining"
+msgstr "Total restante"
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "Total price"
+msgstr "Precio total"
+
+#. module: lunch
+#: selection:report.lunch.amount,month:0
+#: selection:report.lunch.order,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: lunch
+#: field:lunch.cashbox,name:0
+#: field:lunch.category,name:0
+#: field:lunch.product,name:0
+#: field:report.lunch.order,box_name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: lunch
+#: view:lunch.cashmove:0
+msgid "Total amount"
+msgstr "Importe total"
+
+#. module: lunch
+#: view:lunch.category:0
+msgid "Category related to Products"
+msgstr "Categoría relacionada a productos"
+
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
+#: view:lunch.cashbox:0
+msgid "Cashboxes"
+msgstr ""
+
+#. module: lunch
+#: view:lunch.category:0
+#: report:lunch.order:0
+#: view:lunch.order:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: lunch
+#: model:ir.actions.report.xml,name:lunch.report_lunch_order
+#: model:ir.model,name:lunch.model_lunch_order
+#: model:ir.ui.menu,name:lunch.menu_lunch
+#: report:lunch.order:0
+msgid "Lunch Order"
+msgstr "Pedido almuerzo"
+
+#. module: lunch
+#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
+#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
+msgid "Cash Position by User"
+msgstr ""
+
+#. module: lunch
+#: field:lunch.cashbox,manager:0
+msgid "Manager"
+msgstr "Gerente"
+
+#. module: lunch
+#: view:report.lunch.order:0
+msgid "   30 Days   "
+msgstr "   30 días   "
+
+#. module: lunch
+#: view:lunch.order:0
+msgid "To Confirm"
+msgstr "Para confirmar"
+
+#. module: lunch
+#: field:report.lunch.amount,year:0
+#: view:report.lunch.order:0
+#: field:report.lunch.order,year:0
+msgid "Year"
+msgstr "Año"
diff --git a/addons/lunch/i18n/fr.po b/addons/lunch/i18n/fr.po
index d9a8b8f9ab0..ee27a4b2d52 100644
--- a/addons/lunch/i18n/fr.po
+++ b/addons/lunch/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 02:13+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-29 13:17+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: lunch
@@ -69,6 +68,13 @@ msgid ""
 "    Apply Different Category for the product.\n"
 "    "
 msgstr ""
+"\n"
+"    Le module de base pour gérer l'organisation des repas\n"
+"\n"
+"    Suivre les commandes de repas, les mouvements d'argent, la caisse, les "
+"produits.\n"
+"    Appliquer différentes catégories de produits.\n"
+"    "
 
 #. module: lunch
 #: view:lunch.cashmove:0
diff --git a/addons/lunch/i18n/fr_BE.po b/addons/lunch/i18n/fr_BE.po
deleted file mode 100644
index 16f68d91f0a..00000000000
--- a/addons/lunch/i18n/fr_BE.po
+++ /dev/null
@@ -1,347 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* lunch
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-26 04:56:11+0000\n"
-"PO-Revision-Date: 2009-11-26 04:56:11+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: lunch
-#: model:ir.model,name:lunch.model_lunch_category
-#: view:lunch.category:0
-#: field:lunch.product,category_id:0
-msgid "Category"
-msgstr ""
-
-#. module: lunch
-#: wizard_view:lunch.cashbox.clean,init:0
-msgid "Reset cashbox"
-msgstr ""
-
-#. module: lunch
-#: selection:lunch.order,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: lunch
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: lunch
-#: model:ir.model,name:lunch.model_lunch_cashmove
-msgid "lunch.cashmove"
-msgstr ""
-
-#. module: lunch
-#: wizard_view:lunch.order.cancel,init:0
-msgid "Are you sure you want to cancel this order ?"
-msgstr ""
-
-#. module: lunch
-#: model:ir.module.module,shortdesc:lunch.module_meta_information
-msgid "Lunch Module"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
-msgid "Cash Moves"
-msgstr ""
-
-#. module: lunch
-#: rml:lunch.order:0
-msgid "Printed at :"
-msgstr ""
-
-#. module: lunch
-#: model:ir.model,name:lunch.model_lunch_product
-msgid "lunch.product"
-msgstr ""
-
-#. module: lunch
-#: wizard_view:lunch.cashbox.clean,init:0
-msgid "Are you sure you want to reset this cashbox ?"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.order,state:0
-msgid "State"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form
-#: view:lunch.cashbox:0
-msgid "CashBox"
-msgstr ""
-
-#. module: lunch
-#: selection:lunch.order,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: lunch
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: lunch
-#: field:lunch.cashmove,user_cashmove:0
-#: field:lunch.order,user_id:0
-#: field:report.lunch.amount,user_id:0
-msgid "User Name"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
-#: view:report.lunch.amount:0
-msgid "Box Amount by User"
-msgstr ""
-
-#. module: lunch
-#: view:report.lunch.amount:0
-msgid "Total box"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,name:lunch.action_lunch_product_form
-#: field:lunch.order,product:0
-msgid "Product"
-msgstr ""
-
-#. module: lunch
-#: rml:lunch.order:0
-#: field:lunch.product,description:0
-msgid "Description"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.order,price:0
-#: field:lunch.product,price:0
-msgid "Price"
-msgstr ""
-
-#. module: lunch
-#: wizard_button:lunch.order.cancel,init,end:0
-msgid "No"
-msgstr ""
-
-#. module: lunch
-#: view:lunch.category:0
-#: rml:lunch.order:0
-#: view:lunch.order:0
-msgid "Order"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.cashmove,create_date:0
-msgid "Created date"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch
-msgid "Lunch"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.order,descript:0
-msgid "Description Order"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.wizard,name:lunch.lunch_order_confirm
-#: wizard_button:lunch.order.confirm,init,go:0
-msgid "Confirm Order"
-msgstr ""
-
-#. module: lunch
-#: wizard_view:lunch.order.confirm,init:0
-msgid "Orders Confirmation"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.cashmove,active:0
-#: field:lunch.product,active:0
-msgid "Active"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,name:lunch.action_lunch_order_day_form
-msgid " Order of the day"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_category_root
-msgid "Configuration"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.wizard,name:lunch.wizard_id_cancel
-#: wizard_view:lunch.order.cancel,init:0
-msgid "Cancel Order"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
-msgid " CashBox "
-msgstr ""
-
-#. module: lunch
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
-msgid "Lunch amount"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.cashbox,name:0
-#: field:lunch.cashmove,name:0
-#: field:lunch.category,name:0
-#: rml:lunch.order:0
-#: field:lunch.product,name:0
-msgid "Name"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,name:lunch.action_lunch_category_form
-msgid " Category of product "
-msgstr ""
-
-#. module: lunch
-#: view:lunch.cashmove:0
-msgid "Total amount"
-msgstr ""
-
-#. module: lunch
-#: model:ir.model,name:lunch.model_lunch_cashbox
-msgid "lunch.cashbox"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.order,date:0
-msgid "Date"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.cashmove,amount:0
-#: field:report.lunch.amount,amount:0
-msgid "Amount"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_product_form
-#: view:lunch.product:0
-msgid "Products"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_category_form
-msgid "Category of product"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.report.xml,name:lunch.report_lunch_order
-msgid "Print Order"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_order_day_form
-msgid "Order of the day"
-msgstr ""
-
-#. module: lunch
-#: model:ir.model,name:lunch.model_report_lunch_amount
-msgid "Amount available by user and box"
-msgstr ""
-
-#. module: lunch
-#: view:lunch.category:0
-msgid "Category related to Products"
-msgstr ""
-
-#. module: lunch
-#: model:ir.model,name:lunch.model_lunch_order
-msgid "lunch.order"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.cashbox,sum_remain:0
-msgid "Remained Total"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,name:lunch.action_lunch_order_form
-#: model:ir.ui.menu,name:lunch.menu_lunch_order_form
-msgid "Make order"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.wizard,name:lunch.wizard_clean_cashbox
-msgid "Set CashBox to Zero"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.cashmove,box:0
-#: field:report.lunch.amount,box:0
-msgid "Box Name"
-msgstr ""
-
-#. module: lunch
-#: field:lunch.cashbox,manager:0
-msgid "Manager"
-msgstr ""
-
-#. module: lunch
-#: rml:lunch.order:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: lunch
-#: wizard_field:lunch.order.confirm,init,confirm_cashbox:0
-msgid "Name of box"
-msgstr ""
-
-#. module: lunch
-#: view:lunch.order:0
-msgid "Total price"
-msgstr ""
-
-#. module: lunch
-#: wizard_button:lunch.cashbox.clean,init,end:0
-#: wizard_button:lunch.order.confirm,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: lunch
-#: wizard_button:lunch.cashbox.clean,init,zero:0
-msgid "Set to Zero"
-msgstr ""
-
-#. module: lunch
-#: wizard_button:lunch.order.cancel,init,cancel:0
-msgid "Yes"
-msgstr ""
-
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_tools
-msgid "Tools"
-msgstr ""
-
-#. module: lunch
-#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
-#: view:lunch.cashmove:0
-#: field:lunch.order,cashmove:0
-msgid "CashMove"
-msgstr ""
-
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index f262558ff6b..157e540c611 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:59+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index 05a1b69c446..5bd5beafc15 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -164,7 +164,7 @@
         </blockTable>
       </section>
     </section>
-    <blockTable colWidths="421.0,44.0,63.0" style="Table2">
+    <blockTable colWidths="409.0,50.0,70.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -184,4 +184,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean.py b/addons/lunch/wizard/lunch_cashbox_clean.py
index 9c03173fd0e..e95d05870f9 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean.py
+++ b/addons/lunch/wizard/lunch_cashbox_clean.py
@@ -57,7 +57,7 @@ class lunch_cashbox_clean(osv.osv_memory):
          #       'box': box_id,
          #       'active': True,
          #   })
-         return {}
+         return {'type': 'ir.actions.act_window_close'}
 
 lunch_cashbox_clean()
 
diff --git a/addons/lunch/wizard/lunch_order_confirm.py b/addons/lunch/wizard/lunch_order_confirm.py
index 4a9ba66ce9f..6014f14f510 100644
--- a/addons/lunch/wizard/lunch_order_confirm.py
+++ b/addons/lunch/wizard/lunch_order_confirm.py
@@ -48,7 +48,7 @@ class lunch_order_confirm(osv.osv_memory):
 
         for confirm_obj in self.read(cr, uid, ids):
             order_ref.confirm(cr, uid, data, confirm_obj['confirm_cashbox'], context)
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
 
 lunch_order_confirm()
 
diff --git a/addons/mail_gateway/i18n/de.po b/addons/mail_gateway/i18n/de.po
index 088babdbd14..9ba36474cfe 100644
--- a/addons/mail_gateway/i18n/de.po
+++ b/addons/mail_gateway/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 16:20+0000\n"
+"PO-Revision-Date: 2010-12-29 10:38+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mail_gateway
@@ -74,7 +74,7 @@ msgstr "Gruppierung..."
 #. module: mail_gateway
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: mail_gateway
 #: help:mailgate.message,message_id:0
@@ -190,7 +190,7 @@ msgstr "Stufe"
 #: code:addons/mail_gateway/mail_gateway.py:0
 #, python-format
 msgid " added note on "
-msgstr ""
+msgstr " hinzugefügter Hinweis "
 
 #. module: mail_gateway
 #: help:mailgate.message,email_from:0
diff --git a/addons/mail_gateway/i18n/fr.po b/addons/mail_gateway/i18n/fr.po
index 6abfc8a2bb7..63ec51a5f78 100644
--- a/addons/mail_gateway/i18n/fr.po
+++ b/addons/mail_gateway/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 13:54+0000\n"
+"PO-Revision-Date: 2010-12-29 11:46+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mail_gateway
@@ -189,7 +189,7 @@ msgstr "Étape"
 #: code:addons/mail_gateway/mail_gateway.py:0
 #, python-format
 msgid " added note on "
-msgstr ""
+msgstr " note ajoutée "
 
 #. module: mail_gateway
 #: help:mailgate.message,email_from:0
diff --git a/addons/mail_gateway/i18n/mail_gateway.pot b/addons/mail_gateway/i18n/mail_gateway.pot
index 06ca7604705..46ebf92f2a7 100644
--- a/addons/mail_gateway/i18n/mail_gateway.pot
+++ b/addons/mail_gateway/i18n/mail_gateway.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:59+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,9 @@ msgid "Resource ID"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
 #, python-format
 msgid "Method is not implemented"
 msgstr ""
@@ -58,7 +60,7 @@ msgid "Mailgateway History"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:249
 #, python-format
 msgid "Note"
 msgstr ""
@@ -111,7 +113,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:242
 #, python-format
 msgid " wrote on "
 msgstr ""
@@ -164,7 +166,7 @@ msgid "Mailgateway Threads"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:247
 #, python-format
 msgid "Opportunity"
 msgstr ""
@@ -178,13 +180,13 @@ msgid "Emails"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:252
 #, python-format
 msgid "Stage"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:250
 #, python-format
 msgid " added note on "
 msgstr ""
@@ -216,7 +218,7 @@ msgid "User Responsible"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:248
 #, python-format
 msgid "Converted to Opportunity"
 msgstr ""
@@ -242,7 +244,7 @@ msgid "mailgate message"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:148
 #: view:mailgate.thread:0
 #: view:res.partner:0
 #, python-format
@@ -284,7 +286,7 @@ msgid "Cc"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:246
 #, python-format
 msgid " on "
 msgstr ""
@@ -300,7 +302,7 @@ msgid "Email Search"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:561
 #, python-format
 msgid "receive"
 msgstr ""
@@ -313,7 +315,7 @@ msgid "The generic email gateway system allows to send and receive emails\n"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:255
 #, python-format
 msgid "Changed Status to: "
 msgstr ""
@@ -329,7 +331,7 @@ msgid "Owner"
 msgstr ""
 
 #. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:253
 #, python-format
 msgid "Changed Stage to: "
 msgstr ""
diff --git a/addons/mail_gateway/i18n/pl.po b/addons/mail_gateway/i18n/pl.po
index baf531f2a04..2d46f0cb03d 100644
--- a/addons/mail_gateway/i18n/pl.po
+++ b/addons/mail_gateway/i18n/pl.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-27 14:33+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:18+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mail_gateway
diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
index 879d3d37029..204cb2d5d03 100644
--- a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
+++ b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
@@ -25,7 +25,6 @@ import logging
 import optparse
 import sys
 import xmlrpclib
-import email
 
 class rpc_proxy(object):
     def __init__(self, uid, passwd, host='localhost', port=8069, path='object', dbname='openerp'):
@@ -56,11 +55,10 @@ class email_parser(object):
             # pass message as bytes because we don't know its encoding until we parse its headers
             # and hence can't convert it to utf-8 for transport
             res_id = self.rpc('email.server.tools', 'process_email', self.model, xmlrpclib.Binary(message), custom_values)
-        except Exception, e:
+        except Exception:
             logger = logging.getLogger('mail-gateway')
             logger.warning('Failed to process incoming email. Source of the failed mail is available at debug level.', exc_info=True)
             logger.debug('Source of the mail that failed to parse:', message)
-            res_id = False
 
 if __name__ == '__main__':
     parser = optparse.OptionParser(usage='usage: %prog [options]', version='%prog v1.0')
diff --git a/addons/marketing/i18n/de.po b/addons/marketing/i18n/de.po
index bd83810678c..0ae53d662a4 100644
--- a/addons/marketing/i18n/de.po
+++ b/addons/marketing/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 14:55+0000\n"
+"PO-Revision-Date: 2010-12-29 12:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
@@ -54,7 +54,7 @@ msgstr "Bild"
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure Your Marketing Application"
-msgstr ""
+msgstr "Konfigurieren Sie die Marketing Anwendung"
 
 #. module: marketing
 #: help:marketing.installer,email_template:0
@@ -86,11 +86,13 @@ msgid ""
 "OpenERP provides Addons to better manage your sales and marketing processes. "
 "Select the ones you would be interested in."
 msgstr ""
+"OpenERP bietet weitere Funktionen für Vertrieb und Marketing. Treffen Sie "
+"eine Auswahl, der für Sie interessanten Erweiterungen."
 
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Marketing Application Configuration"
-msgstr ""
+msgstr "Konfiguration Marketing Anwendungen"
 
 #. module: marketing
 #: model:ir.actions.act_window,name:marketing.action_marketing_installer
@@ -114,7 +116,7 @@ msgstr ""
 #. module: marketing
 #: view:marketing.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter XML Quellcode für Ansicht!"
diff --git a/addons/marketing/i18n/marketing.pot b/addons/marketing/i18n/marketing.pot
index e54e8b7142d..92e7b675870 100644
--- a/addons/marketing/i18n/marketing.pot
+++ b/addons/marketing/i18n/marketing.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:59+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:59+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index ff3d4cde426..270334c7527 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:35+0000\n"
+"PO-Revision-Date: 2011-01-01 08:52+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -202,7 +202,7 @@ msgstr "Zurücksetzen"
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
 msgid "Choose the resource on which you want this campaign to be run"
-msgstr ""
+msgstr "Wählen Sie die Ressource auf die sich die Kampagne beziehen soll."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
@@ -620,7 +620,7 @@ msgstr "Kampagnen Analyse"
 #. module: marketing_campaign
 #: sql_constraint:marketing.campaign.transition:0
 msgid "The interval must be positive or zero"
-msgstr ""
+msgstr "Das Intervall sollte positiv oder mindestens Null sein."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
@@ -630,7 +630,7 @@ msgstr "Test in Echtzeit"
 #. module: marketing_campaign
 #: sql_constraint:email.template:0
 msgid "The template name must be unique !"
-msgstr ""
+msgstr "Die Vorlagenbezeichnung muss eindeutig sein !"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
@@ -645,7 +645,7 @@ msgstr "Verzeichnis"
 #. module: marketing_campaign
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -686,6 +686,35 @@ msgid ""
 "application as it depends on CRM Leads.\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung ermöglicht eine automatisierte Generierung neuer "
+"Vertriebskontakte durch die Anwendung von Kampagnen (Faktisch können "
+"Kampagnen für alle Ressourcen in OpenERP definiert werden, nicht nur für die "
+"CRM Leads Ressource).\n"
+"        Der Kampagnenablauf erfolgt dynamisch und kann dabei verschiedene "
+"Absatzkanäle gleichzeitig zu nutzen. Der Prozess einer Kampagne verläuft wie "
+"folgt:\n"
+"         * Erstellen Sie den Ablauf einer Marketing Kampagne, inklusive der "
+"Medien zu einzelnen Vorgangsschritten, wie z.B. EMailvorlagen, Briefvorlagen "
+"für EMail, Postversand u .a.\n"
+"        * Definieren Sie Auswahllisten für die Filterung der entsprechenden "
+"Kontakte als Zielgruppe der durchzuführenden Kampagne (z.B. die "
+"Kontaktadresse eines bestimmten Landes).\n"
+"        *  Simulieren Sie Ihre Kampagne zu Testzwecken in Echtzeit oder "
+"sofort in einem Zug und nehmen Sie letzte Feineinstellungen vor.\n"
+"        *  Sie können alternativ die tatsächliche Kampagne im manuellen "
+"Betriebsmodus starten, wodurch dann jede einzelne Aktion per Hand bestätigt "
+"werden müsste.\n"
+"      * Für den endgültigen Kampagnenstart öffnen Sie dann Ihre Kampagne und "
+"beobachten die Statistik, vor allem da alle Vorgänge der Kampagne "
+"automatisch erfolgen.\n"
+"     Während die Kampagne läuft, können Sie weiterhin problemlos die "
+"Parameter einer Kampagne justieren, z.B. Filtereinstellungen, Abfolge etc.\n"
+"\n"
+"    Hinweis: Wenn Sie Demo Daten benötigen, könnten Sie hierzu die Anwendung "
+"marketing_campaign_crm_demo installieren, wodurch dann auch die CRM "
+"Anwendung aufgrund seiner Abhängigkeiten installiert wird.\n"
+"    "
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
@@ -866,7 +895,7 @@ msgstr "Vorgang nicht unterstützt"
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates for Models"
-msgstr "EMail Vorlagen f. Modelle"
+msgstr "EMail Vorlagen"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index f37c21c3020..20d862fb6fb 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 22:57+0000\n"
+"PO-Revision-Date: 2010-12-28 08:32+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/fr.po b/addons/marketing_campaign/i18n/fr.po
index d7f178c54d1..a8ee551291f 100644
--- a/addons/marketing_campaign/i18n/fr.po
+++ b/addons/marketing_campaign/i18n/fr.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 13:32+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-29 13:17+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -206,7 +205,7 @@ msgstr "Réinitialiser"
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
 msgid "Choose the resource on which you want this campaign to be run"
-msgstr ""
+msgstr "Choisir la ressource sur laquelle lancer cette campagne"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
@@ -690,6 +689,29 @@ msgid ""
 "application as it depends on CRM Leads.\n"
 "    "
 msgstr ""
+"\n"
+"Ce module automatise les campagnes marketing (campagnes qui peuvent être "
+"définies pour toute ressource, pas seulement pour la CRM).\n"
+"         Les campagnes sont dynamiques et multi-canaux. Le processus est le "
+"suivant :\n"
+"          * Conception des campagnes de marketing comme des activités "
+"suivies, avec des modèles de courriel à envoyer, des rapports à imprimer et "
+"à envoyer par courriels, des actions adaptées, etc.\n"
+"          * Définition des segments pour choisir les éléments à mettre dans "
+"la campagne (ex : opportunités venant de certains pays, etc.)\n"
+"          * Lancer la campagne en mode simulation afin de la tester en "
+"accéléré ou en temps réel afin de l'optimiser\n"
+"          * La campagne peut être aussi lancée en mode manuel afin de "
+"valider chaque action\n"
+"          * Enfin, lancer la campagne et observer les statistiques produites "
+"automatiquement. \n"
+"          Pendant la campagne, vous pouvez bien-sûr continuer à optimiser "
+"son paramétrage, ses segments, le flux, etc.\n"
+"          \n"
+"          Note: Si vous en avez besoin, vous pouvez installer les données de "
+"démonstration grâce au module marketing_campaign_crm_demo, cependant, ce "
+"module installera également la CRM car il en dépend.\n"
+"    "
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index fa2b4e99a00..ba482b169c6 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:00+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:00+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Previous Activity"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:772
 #, python-format
 msgid "The current step for this item has no email or report to preview."
 msgstr ""
@@ -37,7 +37,7 @@ msgid "The To/From Activity of transition must be of the same Campaign "
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:144
 #, python-format
 msgid "The campaign cannot be started: it doesn't have any starting activity (or any activity with a signal and no previous activity)"
 msgstr ""
@@ -53,7 +53,7 @@ msgid "Custom Action"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:139
 #, python-format
 msgid "The campaign cannot be started: the email account is missing in email activity '%s'"
 msgstr ""
@@ -139,7 +139,7 @@ msgid "This Year"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:772
 #, python-format
 msgid "No preview"
 msgstr ""
@@ -182,7 +182,7 @@ msgid "Year(s)"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:209
 #, python-format
 msgid "Sorry, campaign duplication is not supported at the moment."
 msgstr ""
@@ -511,12 +511,6 @@ msgstr ""
 msgid "Campaign Statistics"
 msgstr ""
 
-#. module: marketing_campaign
-#: view:marketing.campaign.workitem:0
-#: field:marketing.campaign.workitem,res_id:0
-msgid "Resource ID"
-msgstr ""
-
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,server_action_id:0
 msgid "The action to perform when this activity is activated"
@@ -664,7 +658,7 @@ msgid "October"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:141
 #, python-format
 msgid "The campaign cannot be started: the email account is not approved in email activity '%s'"
 msgstr ""
@@ -701,7 +695,11 @@ msgid "This folder is used to store the generated reports"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#: code:addons/marketing_campaign/marketing_campaign.py:154
 #, python-format
 msgid "Error"
 msgstr ""
@@ -713,7 +711,7 @@ msgid "Action"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:488
 #, python-format
 msgid "Automatic transition"
 msgstr ""
@@ -735,7 +733,7 @@ msgid "Process"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:490
 #: selection:marketing.campaign.transition,trigger:0
 #, python-format
 msgid "Cosmetic"
@@ -746,6 +744,11 @@ msgstr ""
 msgid "How is the destination workitem triggered"
 msgstr ""
 
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid "A marketing campaign is an event or activity that will help you manage and reach your partners with specific messages. A campaign can have many activities that will be triggered from a specific situation. One action could be sending an email template that has previously been created in the system."
+msgstr ""
+
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: selection:campaign.analysis,state:0
@@ -756,7 +759,7 @@ msgid "Done"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:209
 #, python-format
 msgid "Operation not supported"
 msgstr ""
@@ -783,14 +786,15 @@ msgid "Synchronize Manually"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:154
 #, python-format
 msgid "The campaign cannot be marked as done before all segments are done"
 msgstr ""
 
 #. module: marketing_campaign
-#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
-msgid "A marketing campaign is an event or activity that will help you manage and reach your partners with specific messages. A campaign can have many activities that will be triggered based on a specific situation. One possible action could be sending an email template that has previously been created in the system."
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
 msgstr ""
 
 #. module: marketing_campaign
@@ -858,7 +862,7 @@ msgid "Running"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:489
 #, python-format
 msgid "After %(interval_nbr)d %(interval_type)s"
 msgstr ""
@@ -895,7 +899,7 @@ msgid "Fixed cost for running this campaign. You may also specify variable cost
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:746
 #, python-format
 msgid "Email Preview"
 msgstr ""
@@ -906,7 +910,7 @@ msgid "Signal"
 msgstr ""
 
 #. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:125
 #, python-format
 msgid "The campaign cannot be started: there are no activities in it"
 msgstr ""
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 91af27db4ad..2ca21a3031c 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -28,6 +28,7 @@ from traceback import format_exception
 from sys import exc_info
 from tools.safe_eval import safe_eval as eval
 import re
+from decimal_precision import decimal_precision as dp
 
 from osv import fields, osv
 import netsvc
@@ -108,7 +109,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor
                                    'State',),
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
-        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting."),
+        'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Purchase Price')),
     }
 
     _defaults = {
@@ -397,8 +398,8 @@ class marketing_campaign_activity(osv.osv):
         'from_ids': fields.one2many('marketing.campaign.transition',
                                             'activity_to_id',
                                             'Previous Activities'),
-        'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section"),
-        'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section"),
+        'variable_cost': fields.float('Variable Cost', help="Set a variable cost if you consider that every campaign item that has reached this point has entailed a certain cost. You can get cost statistics in the Reporting section", digits_compute=dp.get_precision('Purchase Price')),
+        'revenue': fields.float('Revenue', help="Set an expected revenue if you consider that every campaign item that has reached this point has generated a certain revenue. You can get revenue statistics in the Reporting section", digits_compute=dp.get_precision('Sale Price')),
         'signal': fields.char('Signal', size=128,
                               help='An activity with a signal can be called programmatically. Be careful, the workitem is always created when a signal is sent'),
         'keep_if_condition_not_met': fields.boolean("Don't delete workitems",
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index e65579c1df3..89b459b8896 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -143,7 +143,7 @@
                 </group>
                 <group colspan="2" col="2">
                     <separator string="Filter" colspan="4"/>
-                    <field name="ir_filter_id" domain="[('model_id', '=', object_id)]"/>
+                    <field name="ir_filter_id"/>
                 </group>
                 <newline/>
                 <group colspan="2" col="4">
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index a4dbb1c4769..ceab0eab519 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -20,6 +20,8 @@
 ##############################################################################
 import tools
 from osv import fields, osv
+from decimal_precision import decimal_precision as dp
+
 
 class campaign_analysis(osv.osv):
     _name = "campaign.analysis"
@@ -61,8 +63,8 @@ class campaign_analysis(osv.osv):
         'country_id': fields.related('partner_id','address', 'country_id',
                     type='many2one', relation='res.country',string='Country'),
         'total_cost' : fields.function(_total_cost, string='Cost', method=True,
-                                    type="float" ),
-        'revenue': fields.float('Revenue',digits=(16,2),readonly=True),
+                                    type="float", digits_compute=dp.get_precision('Purchase Price')),
+        'revenue': fields.float('Revenue', readonly=True, digits_compute=dp.get_precision('Sale Price')),
         'count' : fields.integer('# of Actions', readonly=True),
         'state': fields.selection([('todo', 'To Do'),
                                    ('exception', 'Exception'), ('done', 'Done'),
diff --git a/addons/marketing_campaign_crm_demo/i18n/es.po b/addons/marketing_campaign_crm_demo/i18n/es.po
new file mode 100644
index 00000000000..437e2918146
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/es.po
@@ -0,0 +1,168 @@
+# 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-31 10:59+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: 2011-01-01 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
+msgid "Marketing campaign demo report"
+msgstr "Informe de campaña de marketing de demostración"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_1
+msgid ""
+"Hello,Thanks for generous interest you have shown in the "
+"openERP.Regards,OpenERP Team,"
+msgstr ""
+"Hola, gracias por el generoso interés que ha mostrado en OpenERP. Saludos, "
+"el Equipo de OpenERP."
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
+msgstr "Datos demo para el módulos marketing_campaign."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Proponer subscribiese al OpenERP Discovery Day en mayo de 2010"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "Proponer formación de pago a los asociados Plata"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "Gracias por mostrar interes en OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr "Gracias por comprar el libro de OpenERP"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr "Proponer una formación técnica a asociados Oro"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Empresa :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "Compañía :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "Gracias por subscribirse a la formación técnica"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Gracias por subscribirse al OpenERP Discovery Day"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our gold partners,We are arranging free technical training "
+"on june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_3
+msgid ""
+"Hello,Thanks for showing intrest and for subscribing to the OpenERP "
+"Discovery Day.\n"
+"             If any further information required kindly revert back.\n"
+"             I really appreciate your co-operation on this.\n"
+"             Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "Acción de simulacro"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "Proponer asociación oro a asociados plata"
diff --git a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
index f58277884ca..800154bed63 100644
--- a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
+++ b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:01+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index e5dbcaba89e..e6e6d40fd03 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:49+0000\n"
+"PO-Revision-Date: 2010-12-29 10:17+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
@@ -379,6 +379,19 @@ msgid ""
 "invoice and send propositions for membership renewal.\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung ermöglicht die Durchführung sämtlicher Aktivitäten für eine "
+"Mitgliederverwaltung.\n"
+"Dabei werden verschiedene Mitgliedsgruppen getrennt:\n"
+"* Freiweilliges Mitglied\n"
+"* Verbundmitglied (z.B. eine Gruppe schreibt sich ein)\n"
+"* Zahlende Mitglieder,\n"
+"* Spezielle Anbieter mit besonderen Preisen\n"
+"\n"
+"Die Anwendung ist integriert mit Vertrieb und den Finanzen und ermöglicht "
+"eine automatische\n"
+"Rechnungserstellung sowie auch den Versand spezieller Aktionsangebote.\n"
+"    "
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
@@ -512,7 +525,7 @@ msgstr "Mitglied"
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: membership
 #: view:product.product:0
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 162f7f8664d..e65813787e0 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:01+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgid "Date from"
 msgstr ""
 
 #. module: membership
-#: code:addons/membership/membership.py:0
+#: code:addons/membership/membership.py:414
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
 msgstr ""
@@ -215,7 +215,8 @@ msgid "Start membership date"
 msgstr ""
 
 #. module: membership
-#: code:addons/membership/membership.py:0
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -386,7 +387,7 @@ msgid "Group by..."
 msgstr ""
 
 #. module: membership
-#: code:addons/membership/membership.py:0
+#: code:addons/membership/membership.py:411
 #, python-format
 msgid "Partner is a free Member."
 msgstr ""
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index f267764970a..b7a6466bbaf 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -34,7 +34,7 @@
     * Make to Stock / Make to Order (by line)
     * Multi-level BoMs, no limit
     * Multi-level routing, no limit
-    * Routing and workcenter integrated with analytic accounting
+    * Routing and work center integrated with analytic accounting
     * Scheduler computation periodically / Just In Time module
     * Multi-pos, multi-warehouse
     * Different reordering policies
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index fd992456fc1..9c728738c6e 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index 0222fc5fa4a..553247c5007 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -27,6 +27,11 @@ msgstr "Създадени движения"
 msgid "No. Of Cycles"
 msgstr "Бр. цикли"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index cfecb19f6de..18e0aafdba0 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index fa478c6ce57..4961f086fc9 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -27,6 +27,11 @@ msgstr "Moviments creats"
 msgid "No. Of Cycles"
 msgstr "Núm. de cicles"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -506,7 +511,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -558,7 +563,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -651,7 +656,7 @@ msgstr "Preparat"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Temps en hores per realitzar un cicle."
 
 #. module: mrp
@@ -1070,7 +1075,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1712,8 +1717,8 @@ msgstr "Consumició de productes produïts"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Descripció del centre de producció. Descriu aquí que és un cicle segons "
 "aquest centre de producció."
@@ -1798,9 +1803,9 @@ msgstr "Ordre de producció"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1833,7 +1838,7 @@ msgstr "Estructura LdM"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2271,9 +2276,9 @@ msgstr "Descripció"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -3117,9 +3122,9 @@ msgstr ""
 #~ "produir."
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "La llista d'operacions (llista de centres de producció) per produir el "
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index 205d0ec6770..6b49fe7dc1e 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index dcaad83b930..ca4ec0ebb5f 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:28+0000\n"
+"PO-Revision-Date: 2010-12-29 12:29+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -105,7 +105,7 @@ msgstr "Fertigungsablauf"
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Produkt Fertigungsstelle"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -128,6 +128,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Anzahl Wiederholungen, die an dieser Fertigungsstelle für einzelne "
+"Fertigungsvorgänge des Fertigungsablaufs erforderlich sind."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -234,6 +236,8 @@ msgid ""
 "Define specific property groups that can be assigned to the properties of "
 "your bills of materials."
 msgstr ""
+"Definition spezifischer Gruppen für Fertigungsmerkmale, die zu den "
+"Eigenschaften einer Stückliste zuordenbar sind."
 
 #. module: mrp
 #: help:mrp.workcenter,product_id:0
@@ -241,6 +245,8 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Tragen Sie ein Produkt ein, für den Zweck der einfachen Rückverfolgung von "
+"Fertigungskosten über Analytische Konten."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -332,6 +338,7 @@ msgstr "August"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
@@ -524,7 +531,7 @@ msgstr ""
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -617,7 +624,7 @@ msgstr "Vorbereitung"
 msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
-msgstr ""
+msgstr "Durch Deaktivierung können Sie den Arbeitsvorgang ausblenden."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
@@ -717,7 +724,7 @@ msgstr "Typ"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Total Cost of "
-msgstr ""
+msgstr "Gesamtkosten von "
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
@@ -746,6 +753,13 @@ msgid ""
 "properties and OpenERP will select automatically the BoM to use according "
 "the the needs."
 msgstr ""
+"Die Eigenschaften in OpenERP werden genutzt, um die richtige Stückliste für "
+"die Produktherstellung auszuwählen, vor allem wenn es verschiedene Verfahren "
+"für die Fertigung eines Produkts gibt. Sie können durchaus mehrere "
+"Eigenschaften zu einer Stückliste zuordnen. Wenn ein Verkaufsauftrag "
+"erstellt wird, kann durch den Vertrieb Bezug auf die definierten "
+"Eigenschaften genommen werden, damit OpenERP dann automatisch die richtige "
+"Stückliste für die Fertigung vorschlagen kann."
 
 #. module: mrp
 #: report:bom.structure:0
@@ -771,6 +785,7 @@ msgid ""
 "Add more functionalities to the core Manufacturing Application with the "
 "following addons."
 msgstr ""
+"Erweitern Sie die Anwendung für die Fertigung durch weitere Funktionen."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -838,6 +853,10 @@ msgid ""
 "master bills of materials. Use this menu to search in which BoM is used a "
 "specific component."
 msgstr ""
+"Bauteilestücklisten repräsentieren die Stücklisten von Baugruppen als "
+"Bestandteile von Endprodukten. Verwenden Sie diese Stücklisten zur Suche "
+"nach spezifischen Baugruppen als Bestandteil in verschiedenen "
+"Produktstücklisten."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
@@ -850,6 +869,8 @@ msgid ""
 "Time in hours for this work center to achieve the operation of the specified "
 "routing."
 msgstr ""
+"Zeit in Stunden für die Durchführung des Fertigungsvorgangs für den "
+"speziellen Fertigungsablauf."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -925,7 +946,7 @@ msgstr "Pinnwand"
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future Load"
-msgstr ""
+msgstr "Auslastungsvorschau Fertigungsstelle"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -1083,7 +1104,7 @@ msgstr "Bezeichnung"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "MRP Application Configuration"
-msgstr ""
+msgstr "Konfiguration Fertigungsanwendung"
 
 #. module: mrp
 #: help:mrp.installer,mrp_jit:0
@@ -1160,6 +1181,49 @@ msgid ""
 "    * List of procurement in exception\n"
 "    "
 msgstr ""
+"\n"
+"    Diese OpenERP Anwendung steuert Fertigungsaufträge.\n"
+"\n"
+"    Folgende Funktionalitäten werden angeboten:\n"
+"    * Disposition vom Lager / Disposition vom Auftrag\n"
+"    * Multidimensionale Stücklisten ohne Begrenzung der Dimensionen\n"
+"    * Multidimensionaler Fertigungsablauf ohne Begrenzung der Dimensionen\n"
+"    * Integration von Fertigungsabläufen und Fertigungsstellen mit "
+"Analytische Konten (Kostenstellen)\n"
+"    * Regelmässige Fertigungsterminplanung / Just In Time Fertigung\n"
+"    * Multiple Point-of-Sales, Multiple Läger\n"
+"    * Verschiedene Dispositionsverfahren für die Materialbeschaffung\n"
+"    * Kostenermittlung durch Durchschnittspreise oder Standardpreise\n"
+"    * Einfache Analyse von Engpassfaktoren bei Kapazität oder "
+"Materialverfügbarkeit\n"
+"    * Sehr flexible Anpassung\n"
+"    * Möglichkeit der multidimensionalen Navigation in mehrstufigen "
+"Stücklisten in einer Ansicht\n"
+"\n"
+"   durch die Anzeige von untergeordneten Bauteile- oder Phantomstücklisten.\n"
+"\n"
+"    Die Anwendung unterstützt eine vollständige Integration und Planung von "
+"Beständen der Lagerprodukte, \n"
+"    Verbrauchsprodukte oder Dienstleistungen. Dienstleistungen sind "
+"vollständig integriert in andere Anwendungen. \n"
+"    So können Sie zum Beispiel Dienstleistungen in Stücklisten der Fertigung "
+"integrieren, wodurch dann durch \n"
+"    einen Fertigungsauftrag entweder bei einem externen Dienstleister eine "
+"Leistung beauftragt wird oder eine Aufgabe \n"
+"    für das eigene Projektauftragsmanagement entsteht.\n"
+"\n"
+"    Folgende Auswertungen werden angeboten:\n"
+"    * Produktstruktur und Produktbestandteile einer Stückliste\n"
+"    * Auslastungsvorschau für Fertigungsstellen\n"
+"    * Ausgabe eines Fertigungsauftrags\n"
+"    * Vorschau von Lagerbeständen\n"
+"\n"
+"    Es existiert auch eine Pinnwand für die Fertigung:\n"
+"    * Arbeitsliste anstehender Fertigungsaufträge\n"
+"    * Arbeitsliste für den Versand / Auslieferung\n"
+"    * Grafische Übersicht der Auslastung\n"
+"    * Fehlerliste der Materialdisposition\n"
+"    "
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1176,6 +1240,14 @@ msgid ""
 "materials have been defined, OpenERP becomes capable of automatically "
 "deciding on the manufacturing route depending on the needs of the company."
 msgstr ""
+"Fertigungsaufträge beschreiben die einzelnen Vorgänge sowie die "
+"erforderlichen Materialien jeder einzelnen Stufe der\r\n"
+"Fertigungsabfolge. Stücklisten werden für die Ermittlung aller "
+"erforderlichen Materialien sowie der erforderlichen Fertigungsvorgänge "
+"eingesetzt. Sobald eine Stückliste definiert wurde, kann OpenERP bereits "
+"automatisch Arbeitsaufträge und damit die Fertigungskapazität sowie den "
+"Materialbedarf der Fertigung errechnen und sämtliche Auftragspositionen bis "
+"hin zur Auslieferung planen."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1335,7 +1407,7 @@ msgstr "Revisionen"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure Your Manufacturing Resource Planning Application"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre Fertigungsanwendung"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action
@@ -1346,6 +1418,12 @@ msgid ""
 "raw materials (stock decrease) and the production of the finished products "
 "(stock increase) when the order is processed."
 msgstr ""
+"Fertigungsaufträge werden in OpenERP normalerweise automatisch auf Basis von "
+"Stücklisten und Beschaffungsregeln vorgeschlagen. OpenERP steuert dabei dann "
+"automatisch den Verbrauch von Lagerprodukten (Bestandsminderung) sowie die "
+"\r\n"
+"Fertigstellung von Endprodukten (Bestandserhöhung) im Rahmen der "
+"Auftragsdurchführung."
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1445,6 +1523,9 @@ msgid ""
 "of one or several people and/or machines that can be considered as a unit "
 "for capacity and planning forecasting."
 msgstr ""
+"Fertigungsstellen ermöglichen die organisatorische Zusammenfassung von "
+"Mitarbeitern oder Maschinen als zentrale Ressource für die Planung der "
+"Kapazität und zur Überwachung der Auslastung."
 
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:0
@@ -1522,6 +1603,9 @@ msgid ""
 "You should install the mrp_subproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Alle Produktmengen müssen grösser als '0' sein !\n"
+"Sie sollten das mrp_subproduct Modul installieren, wenn Sie Subprodukte über "
+"eine Stückliste definieren wollen."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1558,7 +1642,7 @@ msgstr "Verkaufsauftrag"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Component Cost of "
-msgstr ""
+msgstr "Bauteilekosten von "
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1603,7 +1687,7 @@ msgstr "Fertigungsaufträge (Startbereit)"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
-msgstr ""
+msgstr "Fertigungsaufträge im Status %s können nicht gelöscht werden"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1694,7 +1778,7 @@ msgstr "Statistik Fertigungsaufträge"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Copy"
-msgstr ""
+msgstr "Duplizieren"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1942,6 +2026,9 @@ msgid ""
 "linked to manufacturing activities, receptions of products and delivery "
 "orders."
 msgstr ""
+"Die Bestandsauswertung nach Wochen ermöglicht die Rückverfolgung von "
+"Beständen aufgrund der Aktivitäten der Fertigung, sowie der Produktzu- und -"
+"abgänge der Lagerwirtschaft."
 
 #. module: mrp
 #: view:mrp.product.produce:0
@@ -1956,14 +2043,14 @@ msgstr "Effizienz Fertigung"
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: mrp
 #: help:mrp.bom,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the bills of "
 "material without removing it."
-msgstr ""
+msgstr "Durch Deaktivierung können Sie die Stückliste ausblenden."
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1982,6 +2069,8 @@ msgid ""
 "This reporting allows you to analyse your manufacturing activities and "
 "performance."
 msgstr ""
+"Diese Auswertung ermöglicht Ihnen eine Analyse der Produktivität Ihrer "
+"Fertigung."
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
@@ -2096,7 +2185,7 @@ msgstr "Fertigungsabfolge"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -2224,7 +2313,7 @@ msgstr "Fehler"
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Wähle Anzahl"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2268,7 +2357,7 @@ msgstr "Produktion"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Cost of "
-msgstr ""
+msgstr "Fertigungskosten von "
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
@@ -2279,6 +2368,12 @@ msgid ""
 "to products' needs. You can either create a bill of materials to define "
 "specific production steps or define a single multi-level bill of materials."
 msgstr ""
+"Produktstücklisten ermöglichen Ihnen die Verwaltung aller erforderlichen "
+"Produktbestandteile und Mengen für die Fertigung eines Endprodukts. OpenERP "
+"benutzt außerdem die Produktstücklisten zur Errechnung automatischer "
+"Beschaffungsvorschläge für den Materialbedarf. Sie können entweder jeweils "
+"eine Stückliste für jeden einzelnen Produktionsschritt oder eine Stückliste "
+"für sämtliche Produktionsschritte eines Produktes erstellen."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing
@@ -2306,7 +2401,7 @@ msgstr "Referenz zu Dokument, welches den Fertigungsauftrag ausgelöst hat."
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -2393,6 +2488,9 @@ msgid ""
 "specified period. It is expressed in number of hours and machine related "
 "cycles."
 msgstr ""
+"Die Auslastung von Fertigungsstellen zeigt die Kapazitätsauslastung über "
+"einen bestimmten Zeitraum. Die Anzeige erfolgt dabei in Stunden sowie in "
+"Anzahl Zyklen der jeweiligen Fertigungsvorgänge einer Fertigungsstelle."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
@@ -2473,6 +2571,9 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this quantity."
 msgstr ""
+"Definieren Sie die Anzahl zu produzierender oder einzukaufender Produkte. "
+"Die Auswertung zu den Fertigungskosten bezieht sich dann auf diese "
+"Mengenangaben."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 8064e84d120..db9b66be367 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -30,6 +30,11 @@ msgstr "Δημιουργημένες Κινήσεις"
 msgid "No. Of Cycles"
 msgstr "Αρ. Κύκλων"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -42,7 +47,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -509,7 +514,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -561,7 +566,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -654,7 +659,7 @@ msgstr "Έτοιμο"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Χρόνος ενός κύκλου σε ώρες"
 
 #. module: mrp
@@ -1073,7 +1078,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1715,8 +1720,8 @@ msgstr "Ανάλωση Παραγομένων Προϊόντων"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Περιγραφή κέντρου εργασίας. Εξηγείστε εδώ τι αποτελεί κύκλο για το κέντρο "
 "αυτό."
@@ -1801,9 +1806,9 @@ msgstr "Εντολή Παραγωγής"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1836,7 +1841,7 @@ msgstr "Δομή ΚΥ"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2274,9 +2279,9 @@ msgstr "Περιγραφή"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -3039,9 +3044,9 @@ msgstr ""
 #~ msgstr "plus"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "Η λίστα των λειτουργιών (λίστα κέντρων εργασίας) ποαραγωγής του "
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index a911033e9b3..a5e45586b9c 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 17:45+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 09:05+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -29,6 +28,10 @@ msgid "No. Of Cycles"
 msgstr "Núm. de ciclos"
 
 #. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Número de operaciones que este centro de producción puede realizar."
+
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
 msgstr "Ubicación donde el sistema buscará los componentes."
@@ -533,8 +536,8 @@ 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 el coste del centro de producción por hora."
+msgid "Specify Cost of Work center per hour."
+msgstr "Indica coste del centro de trabajo por hora."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -585,8 +588,8 @@ msgstr "Marzo"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
-msgstr "Indica el coste del centro de producción por ciclo."
+msgid "Specify Cost of Work center per cycle."
+msgstr "Especifique el coste por centro de prodcción"
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
@@ -679,7 +682,7 @@ msgstr "Preparado"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Tiempo en horas para realizar un ciclo."
 
 #. module: mrp
@@ -957,7 +960,7 @@ msgstr "Producto almacenable"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Center name"
-msgstr ""
+msgstr "Nombre del centro de producción"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -1133,7 +1136,7 @@ msgstr "]"
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 "Indica el orden de secuencia cuando se muestra una lista de rutas de centros "
 "de producción."
@@ -1849,8 +1852,8 @@ msgstr "Consumición de productos producidos"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Descripción del centro de producción. Describa aquí que es un ciclo según "
 "este centro de producción."
@@ -1944,9 +1947,9 @@ msgstr "Orden de producción"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 "La lista de las operaciones (lista de los centros de producción) para "
@@ -1984,7 +1987,7 @@ msgstr "Despiece de la LdM"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 "Número de operaciones que este centro de producción puede realizar en "
@@ -2454,9 +2457,9 @@ msgstr "Descripción"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 "La lista de las operaciones (lista de los centros de producción) para "
@@ -3352,9 +3355,9 @@ msgstr "Año"
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "La lista de operaciones (lista de centros de producción) para producir el "
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index c9cdf92b4df..679884415f6 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr "Orden de Producción"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index d01cfcec684..3a0a21dd1d2 100644
--- a/addons/mrp/i18n/es_EC.po
+++ b/addons/mrp/i18n/es_EC.po
@@ -27,6 +27,11 @@ msgstr "Movimientos creados"
 msgid "No. Of Cycles"
 msgstr "Núm. de ciclos"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -506,7 +511,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -558,7 +563,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -651,7 +656,7 @@ msgstr "Preparado"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Tiempo en horas para realizar un ciclo."
 
 #. module: mrp
@@ -1070,7 +1075,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1712,8 +1717,8 @@ msgstr "Consumición de productos producidos"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Descripción del centro de producción. Describa aquí que es un ciclo según "
 "este centro de producción."
@@ -1798,9 +1803,9 @@ msgstr "Orden de producción"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1833,7 +1838,7 @@ msgstr "Despiece de la LdM"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2271,9 +2276,9 @@ msgstr "Descripción"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index e5a6e8da9fa..dc6001bb3d1 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -6,14 +6,14 @@ msgid ""
 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"
+"POT-Creation-Date: 2010-12-15 15:05+0000\n"
 "PO-Revision-Date: 2010-10-30 09:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-17 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -27,6 +27,11 @@ msgstr "Liikumised loodud"
 msgid "No. Of Cycles"
 msgstr "Tsükklite No."
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -99,11 +104,6 @@ msgstr ""
 msgid "Routings"
 msgstr "Tarnimised"
 
-#. module: mrp
-#: field:mrp.workcenter,product_id:0
-msgid "Work Center Product"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
@@ -119,13 +119,6 @@ msgstr ""
 msgid "To Produce"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.routing.workcenter,cycle_nbr:0
-msgid ""
-"Number of iterations this work center has to do in the specified operation "
-"of the routing."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: field:mrp.bom,code:0
@@ -223,13 +216,6 @@ msgid ""
 "your bills of materials."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.workcenter,product_id:0
-msgid ""
-"Fill this product to track easily your production costs in the analytic "
-"accounting."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
@@ -500,7 +486,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -550,9 +536,14 @@ msgstr ""
 msgid "March"
 msgstr ""
 
+#. module: mrp
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
+msgid "Workcenter Load"
+msgstr "Töökeskkonna Koormus"
+
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -567,6 +558,13 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid ""
+"Specify quantity of products to produce or buy. Report of Cost structure "
+"will be displayed base on this qunatity."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -611,7 +609,6 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
-#: model:ir.model,name:mrp.model_mrp_workcenter_load
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
 msgstr ""
@@ -639,13 +636,14 @@ msgid "Planning"
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
-msgid "Ready"
-msgstr "Valmis"
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
 
 #. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Aeg tundides mis kulub ühes tsükklis."
 
 #. module: mrp
@@ -809,13 +807,6 @@ msgstr ""
 msgid "Procurement of raw material"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.routing.workcenter,hour_nbr:0
-msgid ""
-"Time in hours for this work center to achieve the operation of the specified "
-"routing."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,cycle_total:0
@@ -1064,7 +1055,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1072,45 +1063,6 @@ msgstr ""
 msgid "Order quantity cannot be negative or zero !"
 msgstr ""
 
-#. module: mrp
-#: model:ir.module.module,description:mrp.module_meta_information
-msgid ""
-"\n"
-"    This is the base module to manage the manufacturing process in OpenERP.\n"
-"\n"
-"    Features:\n"
-"    * Make to Stock / Make to Order (by line)\n"
-"    * Multi-level BoMs, no limit\n"
-"    * Multi-level routing, no limit\n"
-"    * Routing and workcenter integrated with analytic accounting\n"
-"    * Scheduler computation periodically / Just In Time module\n"
-"    * Multi-pos, multi-warehouse\n"
-"    * Different reordering policies\n"
-"    * Cost method by product: standard price, average price\n"
-"    * Easy analysis of troubles or needs\n"
-"    * Very flexible\n"
-"    * Allows to browse Bill of Materials in complete structure\n"
-"        that include child and phantom BoMs\n"
-"    It supports complete integration and planification of stockable goods,\n"
-"    consumable of services. Services are completely integrated with the "
-"rest\n"
-"    of the software. For instance, you can set up a sub-contracting service\n"
-"    in a BoM to automatically purchase on order the assembly of your "
-"production.\n"
-"\n"
-"    Reports provided by this module:\n"
-"    * Bill of Material structure and components\n"
-"    * Load forecast on workcenters\n"
-"    * Print a production order\n"
-"    * Stock forecasts\n"
-"    Dashboard provided by this module::\n"
-"    * List of next production orders\n"
-"    * List of deliveries (out picking)\n"
-"    * Graph of work center load\n"
-"    * List of procurement in exception\n"
-"    "
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
@@ -1627,12 +1579,6 @@ msgstr ""
 msgid "Production Analysis"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#, python-format
-msgid "Copy"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production.lot.line:0
 msgid "Production Products"
@@ -1705,8 +1651,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Töökeskonna kirjeldus. selgita siin mis tsükklid kuuluvad sellele "
 "töökeskonnale."
@@ -1791,9 +1737,9 @@ msgstr "Tootmiskorraldus"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1826,7 +1772,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -1972,11 +1918,6 @@ msgstr ""
 msgid "Number of Hours"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.workcenter:0
-msgid "Costing Information"
-msgstr ""
-
 #. module: mrp
 #: model:process.node,name:mrp.process_node_purchaseprocure0
 msgid "Procurement Orders"
@@ -2054,6 +1995,7 @@ msgid "BoM Revisions"
 msgstr ""
 
 #. module: mrp
+#: view:mrp.production:0
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Draft"
@@ -2264,9 +2206,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -2351,13 +2293,6 @@ msgid ""
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
 
-#. module: mrp
-#: help:mrp.product_price,number:0
-msgid ""
-"Specify quantity of products to produce or buy. Report of Cost structure "
-"will be displayed base on this quantity."
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "On Stock"
@@ -2413,14 +2348,6 @@ msgstr ""
 #~ msgid "Origin"
 #~ msgstr "Allikas"
 
-#, python-format
-#~ msgid "No supplier defined for this product !"
-#~ msgstr "Sellele tootele pole defineeritud tarnijat !"
-
-#, python-format
-#~ msgid "Product name"
-#~ msgstr "Toote nimi"
-
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Vigane XML vaate arhitektuurile!"
 
@@ -2442,10 +2369,6 @@ msgstr ""
 #~ msgid "Do nothing"
 #~ msgstr "Ära tee midagi"
 
-#, python-format
-#~ msgid "products"
-#~ msgstr "tooted"
-
 #~ msgid "Internal Ref."
 #~ msgstr "Sisemine viide"
 
@@ -2455,27 +2378,15 @@ msgstr ""
 #~ msgid "Stockable Production Order"
 #~ msgstr "Tootmiskorraldus lattu"
 
-#, python-format
-#~ msgid "Workcenter name"
-#~ msgstr "Töökeskkonna nimi"
-
 #~ msgid "Production Orders"
 #~ msgstr "Tootmiskorraldused"
 
-#, python-format
-#~ msgid "Product Quantity"
-#~ msgstr "Tootekogus"
-
 #~ msgid "Procurements"
 #~ msgstr "Hanked"
 
 #~ msgid "Details"
 #~ msgstr "Üksikasjad"
 
-#, python-format
-#~ msgid "Product Standard Price"
-#~ msgstr "Toote standardhind"
-
 #~ msgid "product"
 #~ msgstr "toode"
 
@@ -2491,6 +2402,9 @@ msgstr ""
 #~ msgid "Latest error"
 #~ msgstr "Viimane viga"
 
+#~ msgid "Ready"
+#~ msgstr "Valmis"
+
 #~ msgid "Production Orders Planning"
 #~ msgstr "Tootmiskorralduste Planeerimine"
 
@@ -2509,10 +2423,6 @@ msgstr ""
 #~ msgid "If Product type is service"
 #~ msgstr "kui Toote tüüp on teenus"
 
-#, python-format
-#~ msgid "SUBTOTAL"
-#~ msgstr "VAHESUMMA"
-
 #~ msgid "Security Days"
 #~ msgstr "Turvalised Päevad"
 
@@ -2537,13 +2447,6 @@ msgstr ""
 #~ msgid "on order"
 #~ msgstr "tellimisel"
 
-#~ msgid "Create Procurement"
-#~ msgstr "Loo hange"
-
-#, python-format
-#~ msgid "Product uom"
-#~ msgstr "Toote mõõtühik"
-
 #~ msgid "Number of Cycle"
 #~ msgstr "Tsükkli number"
 
@@ -2674,9 +2577,6 @@ msgstr ""
 #~ msgid "Workcenters load"
 #~ msgstr "Töökeskkonna koormus"
 
-#~ msgid "Workcenter Load"
-#~ msgstr "Töökeskkonna Koormus"
-
 #~ msgid "MRP Management - Reporting"
 #~ msgstr "TVP haldus - Aruandlus"
 
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index 37774f19cf7..1ff6b7b8452 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -28,6 +28,11 @@ msgstr "Luodut siirrot"
 msgid "No. Of Cycles"
 msgstr "Kiertojen määrä"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -506,7 +511,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -558,7 +563,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -651,7 +656,7 @@ msgstr "Valmis"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Yhden kierron kesto tunneissa."
 
 #. module: mrp
@@ -1070,7 +1075,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1713,8 +1718,8 @@ msgstr "Tuotannon tuotteiden kulutus"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Työpisteen kuvaus. Selitä tässä mitä kierros tarkoittaa tässä työpisteessä."
 
@@ -1798,9 +1803,9 @@ msgstr "Tuotantotilaus"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1833,7 +1838,7 @@ msgstr "Osaluettelon rakenne"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2271,9 +2276,9 @@ msgstr "Kuvaus"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -2991,9 +2996,9 @@ msgstr ""
 #~ msgstr "Varastoitava tuote prosessi"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "Lista toiminnoista (työpisteistä) jotka tuotteen valmistaminen vaatii. "
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index a6997ded81c..aed4bfa13ca 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -44,6 +44,11 @@ msgstr "Mouvements créés"
 msgid "No. Of Cycles"
 msgstr "Nombre de Cycles"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Nombre d'opérations simultanées du poste de charge"
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -454,7 +459,7 @@ msgstr "Date planifiée"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Bill Of Material"
-msgstr "Nomenclature des Matériaux"
+msgstr "Nomenclature"
 
 #. module: mrp
 #: help:mrp.routing,location_id:0
@@ -475,7 +480,7 @@ msgstr "Variation de la valeur de stock"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
 msgid "Bill of Materials Structure"
-msgstr "Structure de la nomenclature"
+msgstr "Structure des nomenclatures"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
@@ -540,7 +545,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr "Précisez le coût horaire du centre de charge"
 
 #. module: mrp
@@ -572,7 +577,7 @@ msgstr "Valeur du stock"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Structure de la Nomenclature des Produits"
+msgstr "Structure des nomenclatures"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -592,7 +597,7 @@ msgstr "Mars"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr "Précisez le coût par cycle du poste de charge"
 
 #. module: mrp
@@ -685,7 +690,7 @@ msgstr "Prêt"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Temps nécessaire à la réalisation d'un cycle"
 
 #. module: mrp
@@ -1772,8 +1777,8 @@ msgstr "Consommation en production de produit"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Description du centre de travail. Expliquez ici ce qu'est le cycle d'après "
 "le centre de travail."
@@ -1862,9 +1867,9 @@ msgstr "Ordre de Production"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 "La liste des opérations (liste des postes de charge) pour fabriquer le "
@@ -1901,7 +1906,7 @@ msgstr "Structure de la Nomenclature"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 "Nombre d'opérations que ce poste de charge peut réaliser en parallèle. Si ce "
@@ -2223,7 +2228,7 @@ msgstr "Sélectionner quantité"
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action
 #: field:product.product,bom_ids:0
 msgid "Bill of Materials"
-msgstr "Nomenclature"
+msgstr "Nomenclatures"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0
@@ -2352,9 +2357,9 @@ msgstr "Description"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 "La liste des opérations (liste des postes de charge) pour fabriquer le "
@@ -3159,9 +3164,9 @@ msgstr ""
 #~ msgstr "Ordres de production en cours"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "La liste des opérations pour fabriquer le produit fini. La gammeest "
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index b8eba16b420..f7856ec0047 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -28,6 +28,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -646,7 +651,7 @@ msgstr "तैयार"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1825,7 +1830,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2263,9 +2268,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index af544d5fb2f..7893f000c79 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 137f199dc2e..9578293d704 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2009-09-08 16:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-01-01 21:49+0000\n"
+"Last-Translator: Tamás Dénes <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: 2011-01-02 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -358,7 +358,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #, python-format
 msgid "Quantity"
-msgstr ""
+msgstr "Mennyiség"
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
@@ -1034,7 +1034,7 @@ msgstr ""
 #: field:mrp.routing,name:0
 #: field:mrp.routing.workcenter,name:0
 msgid "Name"
-msgstr ""
+msgstr "Név"
 
 #. module: mrp
 #: view:mrp.installer:0
@@ -1426,7 +1426,7 @@ msgstr ""
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktív"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_procureproducts0
@@ -1567,7 +1567,7 @@ msgstr ""
 #: field:mrp.production.order,product_id:0
 #: field:mrp.production.product.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Termék"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1590,7 +1590,7 @@ msgstr ""
 #: field:mrp.bom,product_uos:0
 #: field:mrp.production.product.line,product_uos:0
 msgid "Product UOS"
-msgstr ""
+msgstr "Termék EE"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -1612,7 +1612,7 @@ msgstr ""
 #: field:mrp.production.order,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr ""
+msgstr "Termék ME"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
@@ -2294,7 +2294,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
 msgid "Manufacturing"
-msgstr ""
+msgstr "Gyártás"
 
 #. module: mrp
 #: view:board.board:0
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index 686a95f7f1b..548406b5ca2 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index 2386e0ca010..3210fa1e43d 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -27,6 +27,11 @@ msgstr "Movimentazioni generate"
 msgid "No. Of Cycles"
 msgstr "N. Cicli di Lavoro"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Numero di operazioni che questo centro di lavoro può fare."
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -516,7 +521,7 @@ msgstr "Errore: codice EAN non valido"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr "Specificare il costo orario per il centro di lavoro."
 
 #. module: mrp
@@ -568,7 +573,7 @@ msgstr "Marzo"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr "Specificare il costo per ciclo per il centro di lavoro."
 
 #. module: mrp
@@ -661,7 +666,7 @@ msgstr "Pronto"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Tempo in ore per completare un ciclo."
 
 #. module: mrp
@@ -1083,7 +1088,7 @@ msgstr "]"
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1726,8 +1731,8 @@ msgstr "Utilizzo Prodotti in Produzione"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1810,9 +1815,9 @@ msgstr "Ordine di Produzione"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1845,7 +1850,7 @@ msgstr "Struttura Distinta Base"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 "Numero di operazioni che questo centro di lavoro può fare in parallelo. Se "
@@ -2292,9 +2297,9 @@ msgstr "Descrizione"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -2662,9 +2667,9 @@ msgstr "Anno"
 #~ msgstr "Ciclo di lavoro del materiale"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "La lista delle lavorazioni (lista dei centri di lavoro) per ottenere il "
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index c3e286954ea..b789ccde189 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -28,6 +28,11 @@ msgstr "생성된 무브"
 msgid "No. Of Cycles"
 msgstr "싸이클 횟수"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -503,7 +508,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -555,7 +560,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -648,7 +653,7 @@ msgstr "준비"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "한 사이클을 수행하는 시간"
 
 #. module: mrp
@@ -1067,7 +1072,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1708,8 +1713,8 @@ msgstr "생산 상품 소비"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr "워크센터 설명. 이 워크센터에 기초하여 사이클을 설명하십시오."
 
 #. module: mrp
@@ -1792,9 +1797,9 @@ msgstr "생산 주문"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1827,7 +1832,7 @@ msgstr "BOM 구조"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2265,9 +2270,9 @@ msgstr "설명"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -2872,9 +2877,9 @@ msgstr ""
 #~ msgstr "견적 요청이 생성되어 공급자에게 전송됩니다."
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "완제품 생산을 위한 오퍼레이션 리스트 (워크센터 리스트). 이 라우팅은 주로 오퍼레이션 중의 워크센터 원가 계산과 생산 계획에 기초한 "
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index d79f5abb856..63e69a2e684 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -28,6 +28,11 @@ msgstr "Sukurta perdavimų"
 msgid "No. Of Cycles"
 msgstr "Ciklų skaičius"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -506,7 +511,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -558,7 +563,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -651,7 +656,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Vieno ciklo laikas valandomis."
 
 #. module: mrp
@@ -1070,7 +1075,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1712,8 +1717,8 @@ msgstr "Gamybos produktų vartojimas"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr "Darbo centro parašymas. Nurodomas koks yra šio darbo centro ciklas."
 
 #. module: mrp
@@ -1796,9 +1801,9 @@ msgstr "Gamybos užsakymas"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1831,7 +1836,7 @@ msgstr "KS struktūra"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2269,9 +2274,9 @@ msgstr "Aprašymas"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -2955,9 +2960,9 @@ msgstr ""
 #~ msgstr "plius"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "Tai yra darbų sąrašas (sąrašas darbo centrų) pagaminti pabaigtus produktus. "
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index fd09e5a8e1f..86edff02694 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:03+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,8 +22,8 @@ msgid "Moves Created"
 msgstr ""
 
 #. module: mrp
-#: report:mrp.production.order:0
-msgid "No. Of Cycles"
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid "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."
 msgstr ""
 
 #. module: mrp
@@ -36,11 +36,6 @@ msgstr ""
 msgid "Work Centers Utilisation"
 msgstr ""
 
-#. module: mrp
-#: view:report.workcenter.load:0
-msgid "Work Centers load"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Work Centers"
@@ -51,6 +46,11 @@ msgstr ""
 msgid "Manufacturing Resource Planning"
 msgstr ""
 
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycles"
@@ -68,13 +68,13 @@ msgid "Picking list"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Hourly Cost"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Cost Price per Uom"
 msgstr ""
@@ -134,11 +134,6 @@ msgstr ""
 msgid "Finished Products"
 msgstr ""
 
-#. module: mrp
-#: selection:mrp.production.order,month:0
-msgid "May"
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
@@ -160,11 +155,6 @@ msgstr ""
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_routing_action
-msgid "Routings allows you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
@@ -204,8 +194,13 @@ msgid "UOM"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid "Define specific property groups that can be assigned to the properties of your bills of materials."
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
 msgstr ""
 
 #. module: mrp
@@ -234,7 +229,7 @@ msgid "Cycle Account"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Work Cost"
 msgstr ""
@@ -269,6 +264,11 @@ msgstr ""
 msgid "Master Data"
 msgstr ""
 
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+msgid "The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
@@ -324,6 +324,12 @@ msgstr ""
 msgid "October"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:177
+#, python-format
+msgid "Components Cost of "
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
@@ -335,7 +341,7 @@ msgid "Default UOM"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:130
 #: report:bom.structure:0
 #: field:mrp.product_price,number:0
 #: report:mrp.production.order:0
@@ -420,6 +426,11 @@ msgstr ""
 msgid "Product type is service"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid "Define specific property groups that can be assigned to the properties of your bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
@@ -452,12 +463,6 @@ msgstr ""
 msgid "Request for Quotation."
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Component suppliers"
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
 msgid "The Bill of Material is linked to a routing, i.e. the succession of work centers."
@@ -468,11 +473,6 @@ msgstr ""
 msgid "Error: Invalid ean code"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
-msgstr ""
-
 #. module: mrp
 #: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
@@ -510,7 +510,7 @@ msgid "Search Production"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Supplier Price per Uom"
 msgstr ""
@@ -520,11 +520,6 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
@@ -537,6 +532,11 @@ msgstr ""
 msgid "Produce"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work center per cycle."
+msgstr ""
+
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -585,7 +585,7 @@ msgid "Work Center Load"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:0
+#: code:addons/mrp/procurement.py:45
 #, python-format
 msgid "No BoM defined for this product !"
 msgstr ""
@@ -611,6 +611,11 @@ msgstr ""
 msgid "Ready"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
@@ -622,6 +627,7 @@ msgid "BOM Ref"
 msgstr ""
 
 #. module: mrp
+#: view:mrp.production:0
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
@@ -651,7 +657,8 @@ msgid "Type"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:150
+#: code:addons/mrp/report/price.py:201
 #, python-format
 msgid "Total Cost of "
 msgstr ""
@@ -667,24 +674,20 @@ msgid "Per month"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:0
-#: code:addons/mrp/wizard/change_production_qty.py:0
+#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
 msgid "Couldn't find bill of material for product"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid "The Properties in OpenERP are used to select the right bill of material in order to manufacture a product, when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will select automatically the BoM to use according the the needs."
-msgstr ""
-
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:491
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -715,6 +718,11 @@ msgstr ""
 msgid "Procurement rule"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work center per hour."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production:0
 msgid "Partial"
@@ -751,11 +759,6 @@ msgstr ""
 msgid "Manufacturing Order"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
-msgid "Bills of materials Components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM is used a specific component."
-msgstr ""
-
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
@@ -802,7 +805,7 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/procurement.py:0
+#: code:addons/mrp/procurement.py:47
 #, python-format
 msgid "Procurement '%s' has an exception: 'No BoM defined for this product !'"
 msgstr ""
@@ -847,7 +850,7 @@ msgid "Stockable Product"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Work Center name"
 msgstr ""
@@ -908,6 +911,11 @@ msgstr ""
 msgid "Split in production lots"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid "Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
 msgid "If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance."
@@ -928,6 +936,11 @@ msgstr ""
 msgid "Make to stock"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid "Gives the sequence order when displaying a list of routing work centers."
+msgstr ""
+
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
@@ -944,12 +957,6 @@ msgstr ""
 msgid "Production Dashboard"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Component"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
@@ -1002,8 +1009,13 @@ msgid "]"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.routing.workcenter,sequence:0
-msgid "Gives the sequence order when displaying a list of routing workcenters."
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid "Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each production stage. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route depending on the needs of the company."
 msgstr ""
 
 #. module: mrp
@@ -1011,6 +1023,11 @@ msgstr ""
 msgid "Order quantity cannot be negative or zero !"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr ""
+
 #. module: mrp
 #: model:ir.module.module,description:mrp.module_meta_information
 msgid "\n"
@@ -1020,7 +1037,7 @@ msgid "\n"
 "    * Make to Stock / Make to Order (by line)\n"
 "    * Multi-level BoMs, no limit\n"
 "    * Multi-level routing, no limit\n"
-"    * Routing and workcenter integrated with analytic accounting\n"
+"    * Routing and work center integrated with analytic accounting\n"
 "    * Scheduler computation periodically / Just In Time module\n"
 "    * Multi-pos, multi-warehouse\n"
 "    * Different reordering policies\n"
@@ -1047,16 +1064,6 @@ msgid "\n"
 "    "
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action3
-msgid "Manufacturing Orders in Progress"
-msgstr ""
-
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
-msgid "Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each stage of production. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company."
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
 msgid "Manufacturing Orders Waiting Products"
@@ -1073,7 +1080,7 @@ msgid "Group By..."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
 #, python-format
 msgid "Cycles Cost"
 msgstr ""
@@ -1113,18 +1120,8 @@ msgid "Per week"
 msgstr ""
 
 #. module: mrp
-#: model:process.transition,note:mrp.process_transition_stockmts0
-msgid "The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."
-msgstr ""
-
-#. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid "Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."
 msgstr ""
 
 #. module: mrp
@@ -1201,11 +1198,6 @@ msgstr ""
 msgid "Configure Your Manufacturing Resource Planning Application"
 msgstr ""
 
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_production_action
-msgid "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 consumation of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed."
-msgstr ""
-
 #. module: mrp
 #: field:mrp.production,priority:0
 #: field:mrp.production.order,priority:0
@@ -1223,7 +1215,7 @@ msgid "Month -1"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:914
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
 msgstr ""
@@ -1234,7 +1226,7 @@ msgid "Production Order N° :"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:630
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
 msgstr ""
@@ -1261,6 +1253,11 @@ msgstr ""
 msgid "July"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid "Master Bills of Materials allow you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoMs to automatically propose manufacturing orders according to product needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockrfq0
 msgid "In case the Supply method of the product is Buy, the system creates a purchase order."
@@ -1277,6 +1274,12 @@ msgstr ""
 msgid "Product Cost Structure"
 msgstr ""
 
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Components suppliers"
+msgstr ""
+
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_installer
 msgid "mrp.installer"
@@ -1294,12 +1297,7 @@ msgid "Month"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
-msgid "Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/wizard/change_production_qty.py:0
+#: code:addons/mrp/wizard/change_production_qty.py:62
 #, python-format
 msgid "Active Id is not found"
 msgstr ""
@@ -1335,6 +1333,11 @@ msgstr ""
 msgid "Product Consumed"
 msgstr ""
 
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr ""
+
 #. module: mrp
 #: field:mrp.bom,active:0
 #: field:mrp.routing,active:0
@@ -1348,6 +1351,7 @@ msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: view:report.workcenter.load:0
 msgid "Work Center Loads"
 msgstr ""
 
@@ -1363,8 +1367,8 @@ msgid "Properties"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.production,date_planned:0
-msgid "Scheduled date"
+#: help:mrp.production,origin:0
+msgid "Reference of the document that generated this production order request."
 msgstr ""
 
 #. module: mrp
@@ -1389,7 +1393,6 @@ msgid "Drives the procurement orders for raw material."
 msgstr ""
 
 #. module: mrp
-#: view:mrp.production:0
 #: view:mrp.production.order:0
 msgid "Current"
 msgstr ""
@@ -1404,12 +1407,6 @@ msgstr ""
 msgid "SO Number"
 msgstr ""
 
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Component Cost of "
-msgstr ""
-
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
@@ -1446,7 +1443,7 @@ msgid "Manufacturing Orders To Start"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:491
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
 msgstr ""
@@ -1502,12 +1499,8 @@ msgid "Product UOS"
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-#: view:mrp.production:0
-msgid "Manufacturing Orders"
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid "Work Centers allow you to create and manage manufacturing units consisting of one or more persons and/or machines that can be considered as a unit for capacity and planning forecasting."
 msgstr ""
 
 #. module: mrp
@@ -1537,7 +1530,7 @@ msgid "Production Analysis"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:345
 #, python-format
 msgid "Copy"
 msgstr ""
@@ -1580,6 +1573,11 @@ msgstr ""
 msgid "Very Urgent"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."
+msgstr ""
+
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
@@ -1612,8 +1610,12 @@ msgid "Production Products Consommation"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.workcenter,note:0
-msgid "Description of the workcenter. Explain here what's a cycle according to this workcenter."
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
 msgstr ""
 
 #. module: mrp
@@ -1685,11 +1687,6 @@ msgstr ""
 msgid "Production Order"
 msgstr ""
 
-#. module: mrp
-#: help:mrp.production,routing_id:0
-msgid "The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
 msgid "Automatic procurement rule"
@@ -1706,7 +1703,9 @@ msgid "Product UoS Qty"
 msgstr ""
 
 #. module: mrp
+#: code:addons/mrp/report/price.py:130
 #: view:mrp.bom:0
+#, python-format
 msgid "Components"
 msgstr ""
 
@@ -1717,8 +1716,8 @@ msgid "BOM Structure"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.workcenter,capacity_per_cycle:0
-msgid "Number of operations this workcenter can do in parallel. If this workcenter represents a team of 5 workers, the capacity per cycle is 5."
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
 msgstr ""
 
 #. module: mrp
@@ -1742,11 +1741,6 @@ msgstr ""
 msgid "Product UOS Qty"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom,date_stop:0
-msgid "Valid Until"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation enables you to track the stock value evolution linked to manufacturing activities, receptions of products and delivery orders."
@@ -1959,7 +1953,7 @@ msgid "Manufacturing Steps."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:136
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
@@ -1981,8 +1975,8 @@ msgid "Parent BoM"
 msgstr ""
 
 #. module: mrp
-#: field:mrp.workcenter.load,measure_unit:0
-msgid "Amount measuring unit"
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid "Bills of materials components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM a specific component is used."
 msgstr ""
 
 #. module: mrp
@@ -1996,8 +1990,9 @@ msgid "Product type is Stockable or Consumable."
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/mrp.py:0
-#: code:addons/mrp/wizard/change_production_qty.py:0
+#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2037,14 +2032,14 @@ msgid "Productions"
 msgstr ""
 
 #. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:194
 #, python-format
 msgid "Work Cost of "
 msgstr ""
 
 #. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
-msgid "Master Bill of Materials allows you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoM in order to propose automatically manufacturing orders according to products' needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials."
+#: help:mrp.workcenter,note:0
+msgid "Description of the work center. Explain here what's a cycle according to this work center."
 msgstr ""
 
 #. module: mrp
@@ -2065,8 +2060,8 @@ msgid "Manufacturing Operations"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.production,origin:0
-msgid "Reference of the document that generated this production order request."
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
 msgstr ""
 
 #. module: mrp
@@ -2074,6 +2069,11 @@ msgstr ""
 msgid "You must assign a production lot for this product"
 msgstr ""
 
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid "The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the the needs."
+msgstr ""
+
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:stock.move,production_id:0
@@ -2130,8 +2130,8 @@ msgid "Description"
 msgstr ""
 
 #. module: mrp
-#: help:mrp.bom,routing_id:0
-msgid "The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production planning."
+#: selection:mrp.production.order,month:0
+msgid "May"
 msgstr ""
 
 #. module: mrp
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index a55a23a4244..3824d520de2 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -27,6 +27,11 @@ msgstr "Gegenereerde boekingen"
 msgid "No. Of Cycles"
 msgstr "Aantal cycli"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -505,7 +510,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -557,7 +562,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -650,7 +655,7 @@ msgstr "Gereed"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Tijd in uren voor één productiecyclus."
 
 #. module: mrp
@@ -1069,7 +1074,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1712,8 +1717,8 @@ msgstr "Productie verbruiksartikelen"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Omschrijving van de werkplaats. Leg uit wat een cyclus is vanuit het "
 "gezichtspunt van deze werkplaats."
@@ -1798,9 +1803,9 @@ msgstr "Productieorder"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1833,7 +1838,7 @@ msgstr "Materiaallijststructuur"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2271,9 +2276,9 @@ msgstr "Beschrijving"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -2642,9 +2647,9 @@ msgstr ""
 #~ msgstr "Wacht op beschikbare producten ter reservering"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "De lijst van handelingen (lijst van werkplaatsen) voor het produceren van "
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index d1719be2c3e..49dff3e758c 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 7a591e6e6bd..cc0d8e387d8 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-12-27 15:12+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 08:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -104,7 +104,7 @@ msgstr "Marszruty"
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
 msgid "Work Center Product"
-msgstr ""
+msgstr "Produkt centrum roboczego"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -127,6 +127,8 @@ msgid ""
 "Number of iterations this work center has to do in the specified operation "
 "of the routing."
 msgstr ""
+"Liczba iteracji, które to centrum musi wykonać dla danej operacji w "
+"marszrucie."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -236,6 +238,7 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Wprowadź produkt do wyliczania kosztów produkcji na koncie analitycznym."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
@@ -326,7 +329,7 @@ msgstr "Sierpień"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Próbujesz powiązać z numerem partii z innego produktu"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
@@ -514,7 +517,7 @@ msgstr ""
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Błąd: Niedozwolony kod EAN"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -1505,12 +1508,12 @@ msgstr "Dodatkowe informacje"
 #. module: mrp
 #: model:ir.model,name:mrp.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Zmień ilość produktów"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Sporządza zapotrzebowania na materiały do produkcji."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1565,6 +1568,8 @@ msgid ""
 "This will change the price of parent products also according to the BoM "
 "structure specified for the product."
 msgstr ""
+"To zmieni cenę produktów nadrzędnych w zależności od struktury zestawienia "
+"materiałowego przypisanego do tego produktu."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
@@ -1575,7 +1580,7 @@ msgstr "Zamówienia produkcji do rozpoczęcia"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Cannot delete Production Order(s) which are in %s State!"
-msgstr ""
+msgstr "Nie można usuwać zamówień produkcji, które są w stanie %s !"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1666,7 +1671,7 @@ msgstr "Analiza produkcji"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Copy"
-msgstr ""
+msgstr "Kopiuj"
 
 #. module: mrp
 #: view:mrp.production.lot.line:0
@@ -1721,7 +1726,7 @@ msgstr "Kategorie właściwości"
 #. module: mrp
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
-msgstr ""
+msgstr "Określa kolejność wyświetlania operacji w listach."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1878,7 +1883,7 @@ msgstr "Zwykłe zestawienie materiałowe"
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Czas wyprodukowania"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
@@ -1907,12 +1912,12 @@ msgstr "Potwierdź"
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr ""
+msgstr "Efektywność produkcji"
 
 #. module: mrp
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
 
 #. module: mrp
 #: help:mrp.bom,active:0
@@ -1930,7 +1935,7 @@ msgstr "Zaokrąglenie ilości"
 #: model:ir.model,name:mrp.model_mrp_production_workcenter_line
 #: field:mrp.production.workcenter.line,name:0
 msgid "Work Order"
-msgstr ""
+msgstr "Operacja"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_mrp_production_order
@@ -1942,7 +1947,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume Only"
-msgstr ""
+msgstr "Tylko rozchód"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -2025,7 +2030,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Przypisanie z Produkcji lub z Zamówienia zakupu"
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -2035,7 +2040,7 @@ msgstr "Nadrzędna marszruta"
 #. module: mrp
 #: view:mrp.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguruj"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -2045,12 +2050,12 @@ msgstr "Czas dla tego kroku w godzinach"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: mrp
 #: field:mrp.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obraz"
 
 #. module: mrp
 #: field:mrp.bom.revision,bom_id:0
@@ -2103,7 +2108,7 @@ msgstr "Tydzień"
 #. module: mrp
 #: field:mrp.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Postęp konfiguracji"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -2114,24 +2119,24 @@ msgstr "Normalne"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "Kroki produkcji."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #: model:ir.actions.report.xml,name:mrp.report_cost_structure
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Struktura kosztów"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Rozchód i Przychód"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: mrp
 #: field:mrp.bom,bom_id:0
@@ -2146,7 +2151,7 @@ msgstr "Jednostka miary wielkości"
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
@@ -2163,7 +2168,7 @@ msgstr "Błąd"
 #. module: mrp
 #: field:mrp.product.produce,product_qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Wybierz ilość"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_mrp_bom
@@ -2228,7 +2233,7 @@ msgstr "Marszruta"
 #. module: mrp
 #: field:mrp.installer,mrp_operations:0
 msgid "Manufacturing Operations"
-msgstr ""
+msgstr "Operacje produkcyjne"
 
 #. module: mrp
 #: help:mrp.production,origin:0
@@ -2239,7 +2244,7 @@ msgstr ""
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Musisz podać nr partii dla tego produktu"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -2250,7 +2255,7 @@ msgstr "Produkcja"
 #. module: mrp
 #: view:board.board:0
 msgid "Procurements in Exception"
-msgstr ""
+msgstr "Zapotrzebowania w wyjątkach"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
@@ -2260,7 +2265,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_price
 msgid "Product Price"
-msgstr ""
+msgstr "Cena produktu"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
@@ -2270,12 +2275,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Podziel na partie produkcyjne"
 
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Change Quantity"
-msgstr ""
+msgstr "Zmień ilość"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -2308,12 +2313,12 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "Konsola produkcji"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
 msgid "Scheduled End Date"
-msgstr ""
+msgstr "zaplanowana data zakończenia"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.action_report_workcenter_load_tree
@@ -2326,7 +2331,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "Sposób zależności zapotrzebowania od typu produktu"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2341,7 +2346,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_group_action
@@ -2352,7 +2357,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procurestockableproduct0
@@ -2369,7 +2374,7 @@ msgstr "Czas czyszczenia w godzinach"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "Automatyczne zapytanie ofertowe"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
@@ -2409,7 +2414,7 @@ msgstr "Numeracja"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Niebecności zasobu"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
@@ -2422,13 +2427,13 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,products_to_consume:0
 msgid "Products to Consume"
-msgstr ""
+msgstr "Produkty do zużycia"
 
 #. module: mrp
 #: view:mrp.production.order:0
 #: field:mrp.production.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 9d7ba0a1852..64507331115 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -27,6 +27,11 @@ msgstr "Movimentos criados"
 msgid "No. Of Cycles"
 msgstr "Núm. de ciclos"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr "Número de operacões que este centro de produção pode realizar."
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -519,7 +524,7 @@ msgstr "Erro: Código EAN inválido"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr "Indica o custo do centro de trabalho por hora."
 
 #. module: mrp
@@ -571,7 +576,7 @@ msgstr "Março"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr "Especifique o custe do centro de trabalho por ciclo"
 
 #. module: mrp
@@ -664,7 +669,7 @@ msgstr "Pronto"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Tempo em horas por fazer um ciclo."
 
 #. module: mrp
@@ -1083,7 +1088,7 @@ msgstr "]"
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1724,8 +1729,8 @@ msgstr "Consumo de produtos de produção"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Descrição do centro de trabalho. Explicar aqui o que é um ciclo de acordo "
 "para este centro de trabalho."
@@ -1810,9 +1815,9 @@ msgstr "Ordem de produção"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1845,7 +1850,7 @@ msgstr "Estructura BoM"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2283,9 +2288,9 @@ msgstr "Descrição"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 9b73821968f..534e492ac45 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -27,6 +27,11 @@ msgstr "Movimentações Criadas"
 msgid "No. Of Cycles"
 msgstr "Núm. de ciclos"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -503,7 +508,7 @@ msgstr "Erro: Código EAN inválido"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -555,7 +560,7 @@ msgstr "Março"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -648,7 +653,7 @@ msgstr "Pronto"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Tempo em hora para fazer um ciclo."
 
 #. module: mrp
@@ -1067,7 +1072,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1710,8 +1715,8 @@ msgstr "Produção de Bens de Consumo"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Descrição do centro de trabalho. Explique aqui o que é um ciclo de acordo "
 "com este centro de trabalho."
@@ -1796,9 +1801,9 @@ msgstr "Ordem de Produção"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1831,7 +1836,7 @@ msgstr "Estrutura da BoM"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2269,9 +2274,9 @@ msgstr "Descrição"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index 6ac472d9d89..ce29311c0f9 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr "Nr de cicluri"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 44aa10a6d9d..3d105709d9a 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -27,6 +27,11 @@ msgstr "Перемещение создано"
 msgid "No. Of Cycles"
 msgstr "Кол-во циклов"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr "Готово"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Время в часах на выполнение одного цикла"
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 "Описание участка обработка. Укажите здесь, что соответствует циклу участка."
 
@@ -1790,9 +1795,9 @@ msgstr "Заказ на производство"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1825,7 +1830,7 @@ msgstr "Структура спецификации"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2263,9 +2268,9 @@ msgstr "Описание"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -2688,9 +2693,9 @@ msgstr ""
 #~ msgstr "Заявка выслана поставщику"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "Список операций и участков обработки для производства готового изделия. "
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index 12076c50989..c4633f77368 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -28,6 +28,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -646,7 +651,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1825,7 +1830,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2263,9 +2268,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index c8939d2538e..d666b0eb4c0 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr "Pripravljen"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr "Opis"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index 41d0f380f13..e40beaf43d9 100644
--- a/addons/mrp/i18n/sq.po
+++ b/addons/mrp/i18n/sq.po
@@ -28,6 +28,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -646,7 +651,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1825,7 +1830,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2263,9 +2268,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 9d30a29b085..30028732a6e 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -27,6 +27,11 @@ msgstr "Moves Created"
 msgid "No. Of Cycles"
 msgstr "No. Of Cycles"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -505,7 +510,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -557,7 +562,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -650,7 +655,7 @@ msgstr "Klar"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "Time in hours for doing one cycle."
 
 #. module: mrp
@@ -1069,7 +1074,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1710,11 +1715,11 @@ msgstr "Production Products Consommation"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 
 #. module: mrp
 #: help:mrp.product.produce,mode:0
@@ -1796,9 +1801,9 @@ msgstr "Tillverkningsorder"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1831,7 +1836,7 @@ msgstr "BOM Structure"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2269,9 +2274,9 @@ msgstr "Beskrivning"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -3098,14 +3103,14 @@ msgstr ""
 #~ msgstr "Product quantity"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 
 #~ msgid "Stockable Product Process"
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index bba5f31e89b..90d56600d2d 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -27,6 +27,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index 3de31d3a78c..56eb40bf975 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -27,6 +27,11 @@ msgstr "Oluşan Hareketler"
 msgid "No. Of Cycles"
 msgstr "Çevrim Sayısı"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr "Hazır"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr "Üretim Ürünleri Consommation"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr "Üretim Emri"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr "BOM YAPISI"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr "Açıklama"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -2715,9 +2720,9 @@ msgstr ""
 #~ msgstr "İptal Edildi"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr ""
 #~ "Operasyon Listesi (iş merkezi listesi) Bitmiş ürünleri üretmek için. The "
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index 4fb0fdf5fc4..d8ab0d477a1 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -27,6 +27,11 @@ msgstr "Створені переміщення"
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr "Видаток продуктів виробництва"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr "Заявка на виробництво"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr "Структура СВ"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr "Опис"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 621a36a862c..927d3b0a809 100644
--- a/addons/mrp/i18n/vi.po
+++ b/addons/mrp/i18n/vi.po
@@ -28,6 +28,11 @@ msgstr ""
 msgid "No. Of Cycles"
 msgstr ""
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -646,7 +651,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr ""
 
 #. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr ""
 
 #. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1825,7 +1830,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2263,9 +2268,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 17f6f4a27e9..7a19a38ff95 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -27,6 +27,11 @@ msgstr "创建调拨"
 msgid "No. Of Cycles"
 msgstr "周期"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr "准备好"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "一个周期的工作小时数"
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr "生产产品消耗"
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr "根据中工作中心说明在什么循环"
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr "生产单"
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr "物料清单结构"
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr "说明"
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
@@ -2722,7 +2727,7 @@ msgstr ""
 #~ "    * Make to Stock / Make to Order (by line)\n"
 #~ "    * Multi-level BoMs, no limit\n"
 #~ "    * Multi-level routing, no limit\n"
-#~ "    * Routing and workcenter integrated with analytic accounting\n"
+#~ "    * Routing and work center integrated with analytic accounting\n"
 #~ "    * Scheduler computation periodically / Just In Time module\n"
 #~ "    * Multi-pos, multi-warehouse\n"
 #~ "    * Different reordering policies\n"
@@ -3065,9 +3070,9 @@ msgstr ""
 #~ msgstr "正"
 
 #~ msgid ""
-#~ "The list of operations (list of workcenters) to produce the finished "
-#~ "product. The routing is mainly used to compute workcenter costs during "
-#~ "operations and to plan futur loads on workcenters based on production "
+#~ "The list of operations (list of work centers) to produce the finished "
+#~ "product. The routing is mainly used to compute work center costs during "
+#~ "operations and to plan futur loads on work centers based on production "
 #~ "plannification."
 #~ msgstr "这生产成品的运作列表(工作中心列表)工艺路线主要是用于计算这生产计划的工作中心的成本和计划未来的工作中心的未来负荷"
 
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index d476b2177fd..14b8b5e22b4 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -28,6 +28,11 @@ msgstr "成功創建調撥"
 msgid "No. Of Cycles"
 msgstr "週期數"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -40,7 +45,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -501,7 +506,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -553,7 +558,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -646,7 +651,7 @@ msgstr "就緒"
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "一個循環所須的小時數"
 
 #. module: mrp
@@ -1065,7 +1070,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1706,8 +1711,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr "工作中心之描述。在此說明此工作中心是依據那個週期。"
 
 #. module: mrp
@@ -1790,9 +1795,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1825,7 +1830,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2263,9 +2268,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index a374cea05cc..f8ee29c605b 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -27,6 +27,11 @@ msgstr "調撥已創建"
 msgid "No. Of Cycles"
 msgstr "週期數"
 
+#. module: mrp
+#: help:mrp.routing.workcenter,cycle_nbr:0
+msgid "Number of iterations this work center has to do in the specified operation of the routing."
+msgstr ""
+
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
@@ -39,7 +44,7 @@ msgstr ""
 
 #. module: mrp
 #: view:report.workcenter.load:0
-msgid "Work Centers load"
+msgid "Work Center Loads"
 msgstr ""
 
 #. module: mrp
@@ -500,7 +505,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Workcenter per hour."
+msgid "Specify Cost of Work center per hour."
 msgstr ""
 
 #. module: mrp
@@ -552,7 +557,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Workcenter per cycle."
+msgid "Specify Cost of Work center per cycle."
 msgstr ""
 
 #. module: mrp
@@ -645,7 +650,7 @@ msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for doing one cycle."
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
 msgstr "一個循環所須的小時數"
 
 #. module: mrp
@@ -1064,7 +1069,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
-"Gives the sequence order when displaying a list of routing workcenters."
+"Gives the sequence order when displaying a list of routing work centers."
 msgstr ""
 
 #. module: mrp
@@ -1705,8 +1710,8 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,note:0
 msgid ""
-"Description of the workcenter. Explain here what's a cycle according to this "
-"workcenter."
+"Description of the work center. Explain here what's a cycle according to this "
+"work center."
 msgstr "工作中心之描述。在此說明此工作中心是依據那個週期。"
 
 #. module: mrp
@@ -1789,9 +1794,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "plannification."
 msgstr ""
 
@@ -1824,7 +1829,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
 msgid ""
-"Number of operations this workcenter can do in parallel. If this workcenter "
+"Number of operations this work center can do in parallel. If this work center "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
 
@@ -2262,9 +2267,9 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,routing_id:0
 msgid ""
-"The list of operations (list of workcenters) to produce the finished "
-"product. The routing is mainly used to compute workcenter costs during "
-"operations and to plan future loads on workcenters based on production "
+"The list of operations (list of work centers) to produce the finished "
+"product. The routing is mainly used to compute work center costs during "
+"operations and to plan future loads on work centers based on production "
 "planning."
 msgstr ""
 
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index d5bc8f39e6c..a57b76bf2ce 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -39,15 +39,15 @@ class mrp_workcenter(osv.osv):
     _description = 'Work Center'
     _inherits = {'resource.resource':"resource_id"}
     _columns = {
-        'note': fields.text('Description', help="Description of the workcenter. Explain here what's a cycle according to this workcenter."),
-        'capacity_per_cycle': fields.float('Capacity per Cycle', help="Number of operations this workcenter can do in parallel. If this workcenter represents a team of 5 workers, the capacity per cycle is 5."),
+        'note': fields.text('Description', help="Description of the work center. Explain here what's a cycle according to this work center."),
+        'capacity_per_cycle': fields.float('Capacity per Cycle', help="Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."),
         'time_cycle': fields.float('Time for 1 cycle (hour)', help="Time in hours for doing one cycle."),
         'time_start': fields.float('Time before prod.', help="Time in hours for the setup."),
         'time_stop': fields.float('Time after prod.', help="Time in hours for the cleaning."),
-        'costs_hour': fields.float('Cost per hour', help="Specify Cost of Workcenter per hour."),
+        'costs_hour': fields.float('Cost per hour', help="Specify Cost of Work center per hour."),
         'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')],
             help="Complete this only if you want automatic analytic accounting entries on production orders."),
-        'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Workcenter per cycle."),
+        'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Work center per cycle."),
         'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','<>','view')],
             help="Complete this only if you want automatic analytic accounting entries on production orders."),
         'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
@@ -109,7 +109,7 @@ class mrp_routing_workcenter(osv.osv):
     _columns = {
         'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
         'name': fields.char('Name', size=64, required=True),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing workcenters."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing work centers."),
         'cycle_nbr': fields.float('Number of Cycles', required=True,
             help="Number of iterations this work center has to do in the specified operation of the routing."),
         'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for this work center to achieve the operation of the specified routing."),
@@ -211,7 +211,7 @@ class mrp_bom(osv.osv):
         'product_efficiency': fields.float('Manufacturing Efficiency', required=True, help="A factor of 0.9 means a loss of 10% within the production process."),
         'bom_lines': fields.one2many('mrp.bom', 'bom_id', 'BoM Lines'),
         'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
-        'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production planning."),
+        'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."),
         'property_ids': fields.many2many('mrp.property', 'mrp_bom_property_rel', 'bom_id','property_id', 'Properties'),
         'revision_ids': fields.one2many('mrp.bom.revision', 'bom_id', 'BoM Revisions'),
         'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
@@ -335,7 +335,7 @@ class mrp_bom(osv.osv):
                 result = result + res[0]
                 result2 = result2 + res[1]
         return result, result2
-    
+
     def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
@@ -442,7 +442,7 @@ class mrp_production(osv.osv):
         'date_finished': fields.datetime('End Date'),
 
         'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)]),
-        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of workcenters) to produce the finished product. The routing is mainly used to compute workcenter costs during operations and to plan future loads on workcenters based on production plannification."),
+        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
 
         'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
             help="This is the internal picking list that brings the finished product to the production plan"),
@@ -709,7 +709,8 @@ class mrp_production(osv.osv):
             # To produce remaining qty of final product
             vals = {'state':'confirmed'}
             final_product_todo = [x.id for x in production.move_created_ids]
-            stock_mov_obj.write(cr, uid, final_product_todo, vals)
+            #stock_mov_obj.write(cr, uid, final_product_todo, vals)
+            stock_mov_obj.action_confirm(cr, uid, final_product_todo, context)
             produced_products = {}
             for produced_product in production.move_created_ids2:
                 if produced_product.scrapped:
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 9bbb6a97cee..000ae6cbcf2 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -114,6 +114,7 @@
             parent="menu_mrp_property"/>
         <menuitem
             action="mrp_property_group_action"
+            parent="menu_mrp_property"
             id="menu_mrp_property_group_action"/>
 
         <!--
@@ -560,19 +561,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Manufacturing Orders">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="7">
                         <field name="name" string="Reference"/>
                         <field name="date_planned"/>
                         <field name="origin"/>
+                        <newline/>
                         <field name="product_id" on_change="product_id_change(product_id)"/>
                         <field name="product_qty"/>
-                        <group colspan="2" col="4">
                         <field name="product_uom"/>
                         <button type="action"
                             icon="terp-accessories-archiver+"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" />
-                        </group>
                         <label string="" colspan="2"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
                         <field name="product_uos" groups="product.group_uos"/>
@@ -598,6 +598,11 @@
                                         string="Consume Products" type="action"
                                         icon="gtk-go-forward" context="{'consume': True}"
                                         states="draft,waiting,confirmed,assigned" />
+                                    <button
+                                           name="%(stock.track_line)d"
+                                           string="Split in production lots"
+                                           type="action" icon="gtk-justify-fill"
+                                           states="draft,waiting,confirmed,assigned" />
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
@@ -615,11 +620,6 @@
                                        <field name="prodlot_id" context="{'product_id': product_id}"/>
                                        <field name="state" invisible="1"/>
                                        <field name="scrapped" invisible="1"/>
-                                       <button
-                                           name="%(stock.track_line)d"
-                                           string="Split in production lots"
-                                           type="action" icon="gtk-justify-fill"
-                                           states="done,cancel" />
                                        <button
                                            name="%(stock.move_scrap)d"
                                            string="Scrap Products" type="action"
@@ -726,12 +726,15 @@
             <field name="arch" type="xml">
                 <search string="Search Production">
                    <group col='9' colspan='4'>
-                       <filter icon="terp-camera_test" string="Ready"
+                       <filter icon="terp-gtk-media-pause" string="Pending" name="pending"
+                           domain="[('state','=','confirmed')]"
+                           help="Manufacturing Orders which are waiting for raw materials."/>
+                       <filter icon="terp-camera_test" string="Ready" name="ready"
                            domain="[('state','=','ready')]"
-                           help="Non confirmed manufacturing orders"/>
-                       <filter icon="terp-check" string="Current" name="current"
-                           domain="[('state','in',('confirmed','ready','exception','in_production'))]"
-                           help="Manufacturing Orders which are waiting for raw materials, confirmed, ready to start or currently in production."/>
+                           help="Manufacturing Orders which are ready to start production."/>
+                       <filter icon="terp-check" string="In Production" name="inprogress"
+                           domain="[('state','=','in_production')]"
+                           help="Manufacturing Orders which are currently in production."/>
                        <separator orientation="vertical"/>
                        <filter icon="terp-gnome-cpu-frequency-applet+" string="Late"
                            domain="['&amp;', ('date_planned::date','&lt;', current_date), ('state', 'in', ('draft', 'confirmed', 'ready'))]"
@@ -763,7 +766,7 @@
             <field name="view_mode">tree,form,calendar,graph,gantt</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_mrp_production_filter"/>
-            <field name="context">{'search_default_current':1}</field>
+            <field name="context">{'search_default_ready':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"
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index a1e3f7174bd..09e15ebf39f 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -7,7 +7,7 @@
             <field name="model">report.workcenter.load</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Work Centers load">
+                <tree string="Work Center Loads">
                     <field name="name"/>
                     <field name="workcenter_id"/>
                     <field name="cycle"/>
@@ -29,7 +29,7 @@
                 </graph>
             </field>
         </record>
-        
+
         <record id="view_workcenter_load_search" model="ir.ui.view">
             <field name="name">report.workcenter.load.search</field>
             <field name="model">report.workcenter.load</field>
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 53063bd7ad6..85063c1a335 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -18,11 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
-import ir
+
 import pooler
 from report.interface import report_rml
-from report.interface import toxml
+#from report.interface import toxml
 from tools import to_xml
 from report import report_sxw
 from datetime import datetime
@@ -52,7 +51,6 @@ class report_custom(report_rml):
             prod_name = bom['name']
             prod_qtty = factor * bom['product_qty']
             product_uom = product_uom_pool.browse(cr, uid, bom['product_uom'], context=context)
-            level = 1
             main_sp_price, main_sp_name , main_strd_price = '','',''
             sellers, sellers_price = '',''
 
@@ -129,7 +127,7 @@ class report_custom(report_rml):
                     <col t='yes'>%s</col>
                     <col t='yes'>%s</col>
                 </row>
-        """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom'))
+        """ % (_('Components'), _('Components suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom'))
 
         purchase_price_digits = rml_obj.get_digits(dp='Purchase Price')
 
@@ -176,7 +174,7 @@ class report_custom(report_rml):
 
                 xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                 xml += """<lines style='sub_total'> <row>
-                    <col> """ + _('Component Cost of ')  + str(number) +' '+ product.uom_id.name + """: </col>
+                    <col> """ + _('Components Cost of ')  + str(number) +' '+ product.uom_id.name + """: </col>
                     <col/>
                     <col t='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 7c8c9d9e575..95331d6fdf0 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -21,7 +21,6 @@
 
 from report.render import render
 from report.interface import report_int
-from pychart import *
 import time
 from datetime import date, datetime, timedelta
 from dateutil.relativedelta import relativedelta
@@ -31,6 +30,8 @@ from report.misc import choice_colors
 import random
 import StringIO
 
+from pychart import *
+
 
 theme.use_color = 1
 random.seed(0)
@@ -124,7 +125,7 @@ class report_custom(report_int):
             x_index.append((dates[date]['name'], date))
         pdf_string = StringIO.StringIO()
         can = canvas.init(fname=pdf_string, format='pdf')
-        can.set_title("Work Centers Load")
+        can.set_title("Work Center Loads")
         chart_object.set_defaults(line_plot.T, line_style=None)
         if datas['form']['measure_unit'] == 'cycles':
             y_label = "Load (Cycles)"
@@ -132,7 +133,7 @@ class report_custom(report_int):
             y_label = "Load (Hours)"
 
         # For add the report header on the top of the report.
-        tb = text_box.T(loc=(300, 500), text="/hL/15/bWork Centers Load", line_style=None)
+        tb = text_box.T(loc=(300, 500), text="/hL/15/bWork Center Loads", line_style=None)
         tb.draw()
         ar = area.T(legend = legend.T(),
                     x_grid_style = line_style.gray70_dash1,
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index b001c722fef..21897629117 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -92,5 +92,3 @@
 "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/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml
index 08a0bc31c86..6aa0d7cb17a 100644
--- a/addons/mrp/test/mrp_phantom_bom.yml
+++ b/addons/mrp/test/mrp_phantom_bom.yml
@@ -71,6 +71,7 @@
     seller_ids:
       - delay: 1
         name: base.res_partner_agrolait
+        product_uom: product_uom_litre0
         min_qty: 2.0
     supply_method: buy
     type: consu
@@ -229,7 +230,7 @@
     assert purch_ids, _('No Purchase Orders were made!')
     wf_service = netsvc.LocalService("workflow")
     for p_id in purch_ids:
-    	wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
+        wf_service.trg_validate(uid, 'purchase.order', p_id, 'purchase_confirm', cr)
 -
   I see two incoming pickings for Orange and Sugar.
 -
diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml
index 9286bc7df42..47085904c35 100644
--- a/addons/mrp/test/mrp_procurement.yml
+++ b/addons/mrp/test/mrp_procurement.yml
@@ -42,6 +42,7 @@
     seller_ids:
       - delay: 1
         name: base.res_partner_maxtor
+        product_uom: product.product_uom_unit
         min_qty: 300.0
     standard_price: 1.0
     supply_method: buy
@@ -68,6 +69,7 @@
     seller_ids:
       - delay: 1
         name: base.res_partner_asus
+        product_uom: product.product_uom_kgm
         min_qty: 100.0
     standard_price: 1.0
     supply_method: buy
diff --git a/addons/mrp/test/mrp_report.yml b/addons/mrp/test/mrp_report.yml
index db9a83d495b..48126b5edcd 100644
--- a/addons/mrp/test/mrp_report.yml
+++ b/addons/mrp/test/mrp_report.yml
@@ -17,19 +17,22 @@
         file(os.path.join(tools.config['test_report_directory'], 'mrp-production_order_report.'+format), 'wb+').write(data)
 
 -
-  In order to test the PDF reports defined on a MRP, we will print Product Price Report
+  Print Product Price Report through the wizard
 -
   !python {model: product.product}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.product.price').create(cr, uid, [1,2,3,5], {'model':'product.product', 'form':{'number': 1}}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp-product_price_report.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'product.product','active_ids': [1,2,3,5]})
+    data_dict = {'number': 1}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_view_mrp_product_price_wizard',wiz_data=data_dict, context=ctx, our_module='mrp')
 
 -
-  In order to test the PDF reports defined on a MRP, we will print Workcenter Load Report
+  Print  Work Center Load Report through the wizard
 -
   !python {model: mrp.workcenter}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.mrp.workcenter.load').create(cr, uid, [ref('mrp_workcenter_0'),ref('mrp_workcenter_1')], {'model':'mrp.workcenter', 'form':{'time_unit': 'day', 'measure_unit': 'hours'}}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'mrp-workcenter_load_report.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'mrp.workcenter','active_ids': [ref('mrp_workcenter_0'),ref('mrp_workcenter_1')]})
+    data_dict = {'time_unit': 'day', 'measure_unit': 'hours'}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_mrp_workcenter_load_wizard',wiz_data=data_dict, context=ctx, our_module='mrp')
+
diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
index 4b883abf98c..9a99cb68c04 100644
--- a/addons/mrp/wizard/mrp_track_prod.py
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -121,7 +121,7 @@ class mrp_track_move(osv.osv_memory):
                     new_prodlot = prodlot_obj.create(cr, uid, {'name': 'PRODUCTION:%d:LOT:%d' % (record_id, idx+1), 'product_id': move.product_id.id})
                     update_val['prodlot_id'] = new_prodlot
                     move_obj.write(cr, uid, [current_move], update_val)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 mrp_track_move()
 
diff --git a/addons/mrp_jit/i18n/de.po b/addons/mrp_jit/i18n/de.po
index c76d190c493..2e78f76da2b 100644
--- a/addons/mrp_jit/i18n/de.po
+++ b/addons/mrp_jit/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 07:17+0000\n"
+"PO-Revision-Date: 2010-12-29 13:17+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
@@ -47,6 +47,31 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung ermöglicht Just-in-Time Kalkulation von "
+"Beschaffungsaufträgen.\n"
+"\n"
+"    Durch die Installation dieser Anwendung müssen Sie nicht mehr manuell in "
+"regelmässigen Abständen\n"
+"    den Assistenten \"Starte Beschaffungsvorschlag\" anwenden (außer Sie "
+"möchten trotzdem weiterhin\n"
+"    die Materialdisposition für die Meldebestandregeln von Lagerprodukten "
+"zum Beispiel einmal täglich \n"
+"    manuell starten).\n"
+"    Alle Beschaffungsaufträge werden unmittelbar generiert, welches in "
+"manchen Anwendungen einen geringen\n"
+"    Performanceverlust zur Folge haben dürfte.\n"
+"\n"
+"    Ausserdem könnte durch dieses Modul der durchschnittliche Lagerbestand "
+"per se etwas höher sein, da\n"
+"    zum einen durch die Logik so früh wie möglich Bestände durch das System "
+"reserviert werden und zum anderen \n"
+"    auch die zeitliche Begrenzung für den Beschaffungszeitraum nicht mehr "
+"berücksichtigt wird. In diesem Fall können\n"
+"    Sie desweiteren auch keine Prioritäten für Lieferungen anwenden.\n"
+"    \n"
+"    \n"
+"    "
 
 #~ msgid "The name of the module must be unique !"
 #~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
diff --git a/addons/mrp_jit/i18n/es.po b/addons/mrp_jit/i18n/es.po
index e3071e46506..83b015c0913 100644
--- a/addons/mrp_jit/i18n/es.po
+++ b/addons/mrp_jit/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 12:46+0000\n"
+"PO-Revision-Date: 2010-12-28 09:09+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "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:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/mrp_jit.pot b/addons/mrp_jit/i18n/mrp_jit.pot
index da0621d10dc..8f45a01e70f 100644
--- a/addons/mrp_jit/i18n/mrp_jit.pot
+++ b/addons/mrp_jit/i18n/mrp_jit.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:03+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index 9e820e1ca47..0e6256d88ce 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:30+0000\n"
+"PO-Revision-Date: 2010-12-29 09:37+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -457,6 +457,35 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Diese Anwendung erweitert die Fertigungsaufträge um Status, Start Datum "
+"und Ende Datum für Fertigungsvorgänge\n"
+"     (im Aktenreiter Arbeitsaufträge)\n"
+"      Status: Entwurf, Bestätigt, Fertig, Abgebrochen\n"
+"      Bei Klick auf Beendigen, Bestätigen oder  Abbrechen wird zunächst auch "
+"der Status geändert.\n"
+"      Erstellte Menüs:\n"
+"      Fertigung/Fertigung/Arbeitsaufträge\n"
+"      Fertigung/Fertigungsterminierung/Arbeitsaufträge\n"
+"\n"
+"      Im Formular eines Fertigungsauftrags wurden beim Aktenreiter "
+"\"Arbeitsaufträge\" folgende Buttons für den\n"
+"      Workflow ergänzt:\n"
+"      * Start (setze Status auf Bestätigen),\n"
+"      * Erledigt (setze Status auf Beenden),\n"
+"      * Setze auf Entwurf (Setze Status auf Entwurf)\n"
+"      * Abbrechen Statusänderung\n"
+"\n"
+"Zum Zeitpunkt, zu dem der Fertigungsauftrag \"Startbereit fü sitr die "
+"Fertigung\", wurden scheinbar alle\n"
+"Vorgänge bestätigt. Wenn der Produktionsauftrag erledigt wurde, mussten alle "
+"Vorgänge erledigt sein.\n"
+"\n"
+"Das Feld \"Zeitverzug\" ist der Verzug (Stop Datum - Ende Datum).\n"
+"Somit können wir den theoretischen Verzug und den tatsächlichen V ertug "
+"geändert.\n"
+"\n"
+"    "
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -646,7 +675,7 @@ msgstr "Barcode Fertigungsstelle"
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -817,12 +846,13 @@ msgstr "Dauer"
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Bestellmengen können nicht negativ oder '0' sein !"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index 913209db02c..fb3f8043f89 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/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-27 17:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:07+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index e2426cf3684..4e2372d335b 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:04+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgid "mrp_operations.operation.code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:133
 #, python-format
 msgid "Production Order Cannot start in [%s] state"
 msgstr ""
@@ -116,7 +116,7 @@ msgid "Creation of the work order"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:461
 #, python-format
 msgid "You cannot Pause the Operation other then Start/Resume state !"
 msgstr ""
@@ -134,7 +134,11 @@ msgid "The work orders are created on the basis of the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:133
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:480
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -214,7 +218,7 @@ msgid "* When a work order is created it is set in 'Draft' state.\n"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:470
 #, python-format
 msgid "You cannot finish the operation without Starting/Resuming it !"
 msgstr ""
@@ -225,7 +229,7 @@ msgid "Planned Date"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:477
 #, python-format
 msgid "There is no Operation to be cancelled !"
 msgstr ""
@@ -251,6 +255,11 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
+msgid "To manufacture or assemble products, and use raw materials and finished products you must also handle manufacturing operations. Manufacturing operations are often called Work Orders. The various operations will have different impacts on the costs of manufacturing and planning depending on the available workload."
+msgstr ""
+
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
 msgid "Order Date"
@@ -262,7 +271,7 @@ msgid "Future Work Orders"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:457
 #, python-format
 msgid "Operation has already started !You  can either Pause /Finish/Cancel the operation"
 msgstr ""
@@ -376,7 +385,7 @@ msgid "Production Operation Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:465
 #, python-format
 msgid " You cannot Resume the operation other then Pause state !"
 msgstr ""
@@ -426,7 +435,7 @@ msgid "June"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:480
 #, python-format
 msgid "Operation is already finished !"
 msgstr ""
@@ -483,7 +492,7 @@ msgid "Finish the operation."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:450
 #, python-format
 msgid "Operation is not started yet !"
 msgstr ""
@@ -494,7 +503,10 @@ msgid "Information from the production order."
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:473
 #, python-format
 msgid "Sorry!"
 msgstr ""
@@ -511,16 +523,11 @@ msgid "Code"
 msgstr ""
 
 #. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:473
 #, python-format
 msgid "Operation is Already Cancelled  !"
 msgstr ""
 
-#. module: mrp_operations
-#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
-msgid "To manufacture or assemble products, as well as using raw materials and finished product you must also handle manufacturing operations. Manufacturing operations are often called work orders. The different operations will have different impacts on the costs of manufacture and planning depending on the available workload."
-msgstr ""
-
 #. module: mrp_operations
 #: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
 msgid "Work Center Production start end workflow"
diff --git a/addons/mrp_operations/test/mrp_operations.yml b/addons/mrp_operations/test/mrp_operations.yml
index 299269cbb44..afa3fa55d74 100644
--- a/addons/mrp_operations/test/mrp_operations.yml
+++ b/addons/mrp_operations/test/mrp_operations.yml
@@ -13,10 +13,10 @@
     product_id: product.product_product_pc1
     product_qty: 5.0
     product_uom: product.product_uom_unit
-    product_uos_qty: 0.0
-- 
+    product_uos_qty: 5.0
+-
   I am computing the data.
-- 
+-
   !python {model: mrp.production}: |
     self.action_compute(cr, uid, [ref("mrp_production_mo0")], {"lang": "en_US", "tz":
       False, "search_default_current": 1, "active_model": "ir.ui.menu", "active_ids":
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index 22840e8dc28..d205e34f4dd 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:39+0000\n"
+"PO-Revision-Date: 2010-12-29 12:21+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -161,6 +161,18 @@ msgid ""
 "           * Repair quotation report\n"
 "           * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"           Der Zweck der Anwendung ist die Abbildung aller Vorgänge zur "
+"Reparatur von Produkten. Folgende Anforderungen werden dabei abgebildet:\n"
+"              * Ersatz/Ausbau von Produkten im Kontext des "
+"Reparaturvorgangs\n"
+"              * Berücksichtigung der Bestandsänderung durch Ersatz und "
+"Ausbau\n"
+"              * Abrechnung von Reparaturen\n"
+"              * Berücksichtigung von Garantiezeiten\n"
+"              * Angebotserstellung für kostenpflichtige Reparaturen\n"
+"              * Benachrichtigungen für den technischen Kundendienst und den "
+"Kunden\n"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index 93fac0ebce3..fac90dcdf8d 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-16 17:42+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 10:33+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-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -160,6 +160,15 @@ msgid ""
 "           * Repair quotation report\n"
 "           * Notes for the technician and for the final customer\n"
 msgstr ""
+"\n"
+"           El objetivo es tener un módulo completo para gestionar todas las "
+"reparaciones de productos. Este módulo cubre los siguientes asuntos:\n"
+"           * Añadir/quitar productos en la reparación.\n"
+"           * Impacto en stocks.\n"
+"           * Facturación (productos y/o servicios).\n"
+"           * Concepto de garantía.\n"
+"           * Informe de presupuesto de reparación.\n"
+"           * Notas para el técnico y el cliente final.\n"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
@@ -320,6 +329,14 @@ msgid ""
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
 msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando crea una orden "
+"de reparación.                         \n"
+"* El estado 'Confirmado' se establece automáticamente cuando se confirma la "
+"orden de reparación.                         \n"
+"* El estado 'Hecho' se establece automáticamente cuando se completa la orden "
+"de reparación.                        \n"
+"* El estado 'Cancelado' se establece automáticamente cuando el usuario "
+"cancela la orden de reparación."
 
 #. module: mrp_repair
 #: report:repair.order:0
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 33809832e15..90a6cd5dd8f 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:05+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -35,6 +35,11 @@ msgstr ""
 msgid "Inventory Move"
 msgstr ""
 
+#. module: mrp_repair
+#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
+msgid "Repair orders allow you to organize your product repairs. In a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if whether the repair should be invoiced to the customer or not."
+msgstr ""
+
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
@@ -73,7 +78,7 @@ msgid "Group by partner invoice address"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:427
 #, python-format
 msgid "No product defined on Fees!"
 msgstr ""
@@ -147,7 +152,7 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:427
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -168,7 +173,7 @@ msgid "Move"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:362
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
@@ -201,7 +206,7 @@ msgid "Draft"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:376
 #, python-format
 msgid "No account defined for partner \"%s\"."
 msgstr ""
@@ -218,11 +223,6 @@ msgstr ""
 msgid "Repairs order"
 msgstr ""
 
-#. module: mrp_repair
-#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
-msgid "Repair orders allows you to organize your reparations on the products. On a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if you have to invoice the reparation to the customer or not."
-msgstr ""
-
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Repair Order N° :"
@@ -260,7 +260,9 @@ msgid "Shipping address :"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:405
+#: code:addons/mrp_repair/mrp_repair.py:434
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -300,7 +302,7 @@ msgid "Quotation Notes"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:0
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -487,7 +489,8 @@ msgid "End Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:405
+#: code:addons/mrp_repair/mrp_repair.py:434
 #, python-format
 msgid "No account defined for product \"%s\"."
 msgstr ""
@@ -645,13 +648,13 @@ msgid "Untaxed amount"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:0
+#: code:addons/mrp_repair/wizard/cancel_repair.py:41
 #, python-format
 msgid "Active ID is not Found"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:0
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Repair order is not invoiced."
 msgstr ""
@@ -729,7 +732,7 @@ msgid "Ready to Repair"
 msgstr ""
 
 #. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:362
 #, python-format
 msgid "No partner !"
 msgstr ""
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index b0f197a2f1d..b72f3d7a130 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -306,7 +306,7 @@
     <para style="P29">Operation Line(s)</para>
     <section>
       <para style="P30"><font color="white">[[ repeatIn(o.operations,'line') ]] </font></para>
-      <para style="P30"><font color="white">[[ line or removeParentNode('section')]]</font></para>
+      <para style="P29">[[ (not line) and removeParentNode('section') ]]</para>
       <blockTable colWidths="254.0,100.0,60.0,60.0,60.0" style="Table5">[[ (line.to_invoice==True) or removeParentNode('blockTable') ]]
         <tr>
           <td>
@@ -332,7 +332,7 @@
     <para style="P29">Fees Line(s) [[ (o.fees_lines ==[] and  removeParentNode('para') )  ]]</para>
     <section>
     <para style="P30"><font color="white">[[ repeatIn(o.fees_lines,'fees') ]]</font></para>
-    <para style="P30"><font color="white">[[ fees or removeParentNode('section')]]</font></para>
+    <para style="P29">[[ (not fees) and removeParentNode('section') ]]</para>
 
     <blockTable colWidths="254.0,100.0,60.0,60.0,60.0" style="Table6">[[ (fees.to_invoice==True) or removeParentNode('blockTable') ]]
       <tr>
@@ -365,7 +365,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="P26">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Sale Price'))]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
 
       </tr>
@@ -379,7 +379,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="P26">[[ formatLang(o.amount_tax, digits=get_digits(dp='Account'))]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="P26">[[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -392,7 +392,7 @@
           <para style="terp_tblheader_Details">Total :</para>
         </td>
         <td>
-          <para style="terp_default_right_bold_9">[[ formatLang(total(o), digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index e7ef69c2dcc..21d4948096e 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -48,7 +48,7 @@ class repair_cancel(osv.osv_memory):
         else:
             raise osv.except_osv(_('Warning!'),_('Repair order is not invoiced.'))
         
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """ Changes the view dynamically
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index 2cb6409348e..61f82a3d57c 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -27,7 +27,7 @@ class make_invoice(osv.osv_memory):
     _description = 'Make Invoice'
 
     _columns = {
-	   'group': fields.boolean('Group by partner invoice address'),
+           'group': fields.boolean('Group by partner invoice address'),
     }
 
     def make_invoices(self, cr, uid, ids, context=None):
diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_subproduct/i18n/de.po
index f0951d198ca..c20599c61dc 100644
--- a/addons/mrp_subproduct/i18n/de.po
+++ b/addons/mrp_subproduct/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:31+0000\n"
+"PO-Revision-Date: 2010-12-29 09:34+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
@@ -82,6 +82,15 @@ msgid ""
 "    A + B + C -> D + E\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ermöglicht die Produktion weiterer Subprodukte über einen "
+"Fertigungsauftrag.\n"
+"Sie können Subprodukte in der Stückliste definieren.\n"
+"Ohne diese Anwendung gilt:\n"
+"    A + B + C -> D\n"
+"Durch diese Anwendung gilt:\n"
+"    A + B + C -> D + E\n"
+"    "
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_uom:0
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index 9f90b152daa..367c9eab9a8 100644
--- a/addons/mrp_subproduct/i18n/es.po
+++ b/addons/mrp_subproduct/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 12:06+0000\n"
+"PO-Revision-Date: 2010-12-28 08:01+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
index e9b03c3ab69..2ea0ac88a17 100644
--- a/addons/mrp_subproduct/i18n/mrp_subproduct.pot
+++ b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:05+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/multi_company/i18n/de.po b/addons/multi_company/i18n/de.po
index a06cdae219f..ec68fca65d7 100644
--- a/addons/multi_company/i18n/de.po
+++ b/addons/multi_company/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 09:34+0000\n"
+"PO-Revision-Date: 2010-12-29 10:15+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
@@ -107,6 +107,12 @@ msgid ""
 "    This module is the base module for other multicompany modules.\n"
 "    "
 msgstr ""
+"\n"
+"    Das Multicompany Modul ermöglicht die Abbildung von Multicompany "
+"Anwendungsszenarien.\n"
+"    Dieses Modul bietet dabei die Grundlage für erweiterte Multicompany "
+"Anwendungen.\n"
+"    "
 
 #~ msgid "Default Company"
 #~ msgstr "Standard Mandant"
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index f30a95cbc83..3a3a9901ac9 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 12:13+0000\n"
+"PO-Revision-Date: 2010-12-28 09:13+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/multi_company.pot b/addons/multi_company/i18n/multi_company.pot
index 4cf8b28cfd1..dc22c0c15b2 100644
--- a/addons/multi_company/i18n/multi_company.pot
+++ b/addons/multi_company/i18n/multi_company.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:05+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/outlook/i18n/de.po b/addons/outlook/i18n/de.po
index 0a3209232a0..0d0e094fb51 100644
--- a/addons/outlook/i18n/de.po
+++ b/addons/outlook/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 08:17+0000\n"
+"PO-Revision-Date: 2010-12-29 11:37+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
@@ -80,6 +80,18 @@ msgid ""
 "\n"
 "      "
 msgstr ""
+"\n"
+"      Diese Anwendung ermöglicht die Nutzung des Outlook Plugins. \n"
+"\n"
+"      Das Outlook Plugin ermöglicht die Auswahl eines Objektes aus OpenERP "
+"zu dem Sie eine\n"
+"      Email mit oder ohne Dateianhang aus Outlook zuordnen möchten. Sie "
+"können zu diesem Zweck\n"
+"      einem Partner, einer Aufgabe, einem Projekt, einem analytischen Konto "
+"oder jedem andere verfügbaren Objekt\n"
+"      aus OpenERP eine Email mit oder ohne Anhang zuordnen.\n"
+"\n"
+"      "
 
 #. module: outlook
 #: help:outlook.installer,doc_file:0
@@ -112,6 +124,10 @@ msgid ""
 "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
+"Das Plugin ermöglicht die Verlinkung einer EMail aus Outlook mit beliebigen "
+"OpenERP Belegen. Sie können hierzu entweder\r\n"
+"die EMail zu vorhandenen Objekten abspeichern oder wahlweise neue Objekte "
+"durch eine Outlook Email in OpenERP erstellen."
 
 #. module: outlook
 #: view:outlook.installer:0
diff --git a/addons/outlook/i18n/es.po b/addons/outlook/i18n/es.po
index 102c5e311c8..e0aa82e3bde 100644
--- a/addons/outlook/i18n/es.po
+++ b/addons/outlook/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-27 18:48+0000\n"
+"PO-Revision-Date: 2010-12-28 08:17+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
diff --git a/addons/outlook/i18n/it.po b/addons/outlook/i18n/it.po
index 7d4f871ec50..df63380be27 100644
--- a/addons/outlook/i18n/it.po
+++ b/addons/outlook/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 20:56+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 22:11+0000\n"
+"Last-Translator: Roberto Onnis <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
@@ -30,7 +30,7 @@ msgstr "Manuale d'installazione"
 #. module: outlook
 #: view:outlook.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: outlook
 #: field:outlook.installer,description:0
@@ -79,6 +79,18 @@ msgid ""
 "\n"
 "      "
 msgstr ""
+"\n"
+"      Questo modulo fornisce il plug in per Outlook. \n"
+"\n"
+"      Il plug in per Outlook permette di selezionare un oggetto che vorreste "
+"aggiungere\n"
+"      alle vostra email e al suo allegato da MS Outlook. E' possibile "
+"selezionare un partner, un'attività.\n"
+"      un progetto, un conto analitico, o altri oggetti ed archiviare le mail "
+"selezionate\n"
+"      nel gestore mail come messaggi ed allegati.\n"
+"\n"
+"      "
 
 #. module: outlook
 #: help:outlook.installer,doc_file:0
@@ -98,6 +110,8 @@ msgid ""
 "Allows you to select an object that you’d like to add to your email and its "
 "attachments."
 msgstr ""
+"Permette di selezionare un oggetto che vorrete aggiungere alla email e il "
+"suoi allegati."
 
 #. module: outlook
 #: model:ir.model,name:outlook.model_outlook_installer
@@ -110,16 +124,18 @@ 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 ""
+"Il plug in permette di collegare le e-mail ai documenti di OpenERP. E' "
+"possibile allegarli ad ogni esistente di OpenERP o crearne di nuovi"
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Tralascia"
 
 #. module: outlook
 #: view:outlook.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Chiudi"
 
 #. module: outlook
 #: view:outlook.installer:0
@@ -142,4 +158,4 @@ msgstr ""
 #. module: outlook
 #: field:outlook.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Avanzamento configurazione"
diff --git a/addons/outlook/i18n/outlook.pot b/addons/outlook/i18n/outlook.pot
index 1111fc6218e..88138e5bcaa 100644
--- a/addons/outlook/i18n/outlook.pot
+++ b/addons/outlook/i18n/outlook.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:06+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,19 +15,14 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: outlook
-#: field:outlook.installer,plugin_file:0
-msgid "Outlook Plug-in"
-msgstr ""
-
 #. module: outlook
 #: field:outlook.installer,doc_file:0
 msgid "Installation Manual"
 msgstr ""
 
 #. module: outlook
-#: view:outlook.installer:0
-msgid "Configure"
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
 msgstr ""
 
 #. module: outlook
@@ -43,7 +38,7 @@ msgstr ""
 
 #. module: outlook
 #: view:outlook.installer:0
-msgid "title"
+msgid "Skip"
 msgstr ""
 
 #. module: outlook
@@ -80,6 +75,11 @@ msgstr ""
 msgid "The documentation file :- how to install Outlook Plug-in."
 msgstr ""
 
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
 #. module: outlook
 #: model:ir.actions.act_window,name:outlook.action_outlook_installer
 #: model:ir.actions.act_window,name:outlook.action_outlook_wizard
@@ -88,13 +88,8 @@ msgid "Outlook Plug-In Configuration"
 msgstr ""
 
 #. 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"
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
 #. module: outlook
@@ -102,9 +97,14 @@ msgstr ""
 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
+#: help:outlook.installer,outlook:0
+msgid "Allows you to select an object that you would like to add to your email and its attachments."
+msgstr ""
+
 #. module: outlook
 #: view:outlook.installer:0
-msgid "Skip"
+msgid "title"
 msgstr ""
 
 #. module: outlook
@@ -128,7 +128,7 @@ msgid "outlook plug-in file. Save as this file and install this plug-in in outlo
 msgstr ""
 
 #. module: outlook
-#: field:outlook.installer,progress:0
-msgid "Configuration Progress"
+#: view:outlook.installer:0
+msgid "Configure"
 msgstr ""
 
diff --git a/addons/outlook/i18n/pl.po b/addons/outlook/i18n/pl.po
index 2861404831d..57da11f3c85 100644
--- a/addons/outlook/i18n/pl.po
+++ b/addons/outlook/i18n/pl.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-27 14:11+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:11+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat
old mode 100755
new mode 100644
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index 7861beb9442..72d515c46a8 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -705,17 +705,12 @@ def GetSearchText(txtProcessor,*args):
     b = check()
     if not b:
         return
-    # Get the selected mail and set the default value for search_text_control to mail.SenderEmailAddress
-    ex = txtProcessor.window.manager.outlook.ActiveExplorer()
-    assert ex.Selection.Count == 1
-    mail = ex.Selection.Item(1)
     try:
         global objects_with_match
         list_hwnd = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
         objects_with_match = NewConn.SearchPartners()
         setList(list_hwnd)
     except Exception,e:
-        msg=getMessage(e)
         win32ui.MessageBox('Document can not be loaded.\n'+str(e), "Push", flag_error)
     txtProcessor.init_done=True
 
@@ -1382,12 +1377,11 @@ def OpenPartnerForm(txtProcessor,*args):
     try:
     	partner_text = ustr(mail.SenderName).encode('iso-8859-1')
         sender_mail = ustr(mail.SenderEmailAddress).encode('iso-8859-1')
-
     except Exception:
     	win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Error in reading email.>")
     	pass
     vals = NewConn.SearchPartner(sender_mail)
-    if vals == True:
+    if vals:
         win32gui.SendMessage(partner_link, win32con.WM_SETTEXT, 0, "< Their is contact related to "+str(partner_text)+"  email address, but no partner is linked to contact>")
         txtProcessor.init_done=True
         return
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/outlookaddin.iss b/addons/outlook/plugin/openerp-outlook-plugin/setup.iss
similarity index 94%
rename from addons/outlook/plugin/openerp-outlook-plugin/outlookaddin.iss
rename to addons/outlook/plugin/openerp-outlook-plugin/setup.iss
index b47f87c60d0..d19cc66f556 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/outlookaddin.iss
+++ b/addons/outlook/plugin/openerp-outlook-plugin/setup.iss
@@ -24,8 +24,6 @@ UninstallDisplayIcon={app}\*
 VersionInfoVersion=1.0
 VersionInfoCompany=OpenERP
 VersionInfoDescription=OpenERP Outlook Addin
-VersionInfoProductName=OpenERP
-VersionInfoProductVersion=1.0
 ChangesAssociations=true
 
 [Languages]
@@ -52,7 +50,7 @@ Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"
 Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"
 
 [Files]
-Source: "C:\workspace\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "C:\openerp-outlook-plugin\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Messages]
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 7c9af5d28b2..0ab5d08a6ec 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -104,19 +104,19 @@ class XMLRpcConn(object):
         return db_list
 
     def login(self,dbname, user, pwd):
-    	self._dbname = dbname
-    	self._uname = user
-    	self._pwd = pwd
-    	conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
-    	uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
-    	return uid
+        self._dbname = dbname
+        self._uname = user
+        self._pwd = pwd
+        conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
+        uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
+        return uid
 
     def GetAllObjects(self):
-    	conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
-    	ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
-    	objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
-    	obj_list = [item['model'] for item in objects]
-    	return obj_list
+        conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+        ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
+        objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
+        obj_list = [item['model'] for item in objects]
+        return obj_list
 
     def GetObjList(self):
     	self._obj_list=list(self._obj_list)
@@ -284,8 +284,8 @@ class XMLRpcConn(object):
             headers = {}
             strheader = strheader.replace("\n ", " ").splitlines()
             for line in strheader:
-            	split_here = line.find(":")
-            	headers[line[:split_here]] = line[split_here:]
+                split_here = line.find(":")
+                headers[line[:split_here]] = line[split_here:]
             temp1 = headers.get('Message-ID')
             temp2 = headers.get('Message-Id')
             if temp1 == None:    message_id = temp2
diff --git a/addons/pad/i18n/de.po b/addons/pad/i18n/de.po
index 2bebd000e7a..2eefd8199ea 100644
--- a/addons/pad/i18n/de.po
+++ b/addons/pad/i18n/de.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-16 09:08+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 11:13+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: pad
@@ -42,7 +43,7 @@ msgstr "Unternehmen"
 #. module: pad
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: pad
 #: model:ir.module.module,description:pad.module_meta_information
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index e00bb0d770c..963c5d8ece2 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:06+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: pad
-#: code:addons/pad/web/editors.py:0
+#: code:addons/pad/web/editors.py:32
 #, python-format
 msgid "Ok"
 msgstr ""
 
 #. module: pad
-#: code:addons/pad/web/editors.py:0
+#: code:addons/pad/web/editors.py:29
 #, python-format
 msgid "Name"
 msgstr ""
@@ -42,6 +42,12 @@ msgstr ""
 msgid "Error! You can not create recursive companies."
 msgstr ""
 
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr ""
+
 #. module: pad
 #: model:ir.module.module,description:pad.module_meta_information
 msgid "\n"
@@ -57,9 +63,7 @@ msgid "Pad root URL"
 msgstr ""
 
 #. module: pad
-#: code:addons/pad/web/editors.py:0
 #: view:res.company:0
-#, python-format
 msgid "Pad"
 msgstr ""
 
diff --git a/addons/pad/web/editors.py b/addons/pad/web/editors.py
index 689ec48ed1a..e303dc4b3d7 100644
--- a/addons/pad/web/editors.py
+++ b/addons/pad/web/editors.py
@@ -13,9 +13,8 @@ class SidebarTemplateEditor(openobject.templating.TemplateEditor):
                 '\n',
                 output.index(self.ADD_ATTACHMENT_BUTTON)) + 1
         output = output[:form_opener_insertion] + \
-                 '''<a href="#" id="add-pad" class="button-a"
-                       style="float: right; line-height: 13px; margin-right: 3px;"
-                       >${_("Pad")}</a>\n''' + \
+                 '''<a href="#" id="add-pad" class="button-a
+                 attachment-button">${_("Write")}</a>\n''' + \
                  output[form_opener_insertion:]
         return output
 
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 89b5a14cbfe..eca019f11d2 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-14 21:01+0000\n"
+"PO-Revision-Date: 2010-12-29 10:44+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -327,6 +327,8 @@ msgid ""
 "You can not open a Cashbox for \"%s\".\n"
 "Please close its related cash register."
 msgstr ""
+"Sie können keine Barkasse für das Konto \"%s\" eröffnen.\n"
+"Bitte beenden Sie zuerst das zugehörige Kassenkonto."
 
 #. module: point_of_sale
 #: help:pos.order,user_salesman_id:0
@@ -560,7 +562,7 @@ msgstr "Barkassen sind bereits abgeschlossen."
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
@@ -801,6 +803,8 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"Der Betrag des Zahlungsbelegs sollte mit dem Betrag der Position auf dem "
+"Bankauszug übereinstimmen."
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -1200,6 +1204,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"Hauptfunktionen der Point-of-Sale Anwendung sind folgende:\n"
+"- Schnellerfassung von Verkäufen\n"
+"- Möglichkeit der Auswahl eines Bezahlungsmodus (Schnellauswahl) oder einer "
+"Aufsplittung in verschiedene Zahlungsarten.\n"
+"- Berechnung des restlichen Wechselgeldes bei Bargeldzahlung.\n"
+"- Automatische Erstellung und Bestätigung eines Lieferauftrags.\n"
+"- Möglichkeit zur automatischen Erstellung einer Rechnung.\n"
+"- Möglichkeit zur Rückgabe vorheriger Verkäufe.\n"
+"\n"
+"    "
 
 #. module: point_of_sale
 #: field:pos.order,price_type:0
@@ -1432,6 +1447,8 @@ msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
 msgstr ""
+"Verantwortlicher Mitarbeiter für das Kassenregister. Dieses könnte eine "
+"Aushilfe, Student oder ein befristeter Mitarbeiter sein."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
@@ -1586,11 +1603,14 @@ msgstr "Ja"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
+"Es ist kein Erlöskonto für das folgende Produkt definiert:: \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "The cash register must be opened to be able to execute a payment."
 msgstr ""
+"Das Kassenkonto muss zuerst geöffnet werden, um  aktuell eine Zahlung "
+"vorzunehmen."
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1628,7 +1648,7 @@ msgstr "Verkäufe nach Benutzer"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
 msgid "Open Cash Register"
-msgstr ""
+msgstr "Öffne Barkasse"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1690,6 +1710,9 @@ msgid ""
 "Couldn't find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"Konnte keine Preisliste passend zu Produkt und Menge finden.\n"
+"\n"
+"Sie können nun entweder das Produkt, die Menge oder die Preisliste ändern."
 
 #. module: point_of_sale
 #: field:pos.order.line,serial_number:0
@@ -1782,7 +1805,7 @@ msgstr "Hinzuf. Rabatt"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
 msgid "Close Cash Register"
-msgstr ""
+msgstr "Beende Kasse"
 
 #. module: point_of_sale
 #: field:pos.order.line,qty_rfd:0
@@ -1835,7 +1858,7 @@ msgstr "Verkäufe"
 #. module: point_of_sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: point_of_sale
 #: field:pos.discount,discount:0
@@ -1882,6 +1905,8 @@ msgstr "Kassenausgabe"
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
 msgstr ""
+"Die Journalkurzbezeichnung sollte innerhalb eines Unternehmens eindeutig "
+"sein !"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -1978,7 +2003,7 @@ msgstr "Berechnet"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Must be after setLang()"
-msgstr ""
+msgstr "Sollte nach setLang() folgen"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -2035,6 +2060,7 @@ msgstr "Bitte Partner für Verkauf definieren"
 msgid ""
 "There is no receivable account defined for this journal: \"%s\" (id:%d)"
 msgstr ""
+"Es existiert kein Konto für Verbindlichkeiten dieses Journals \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: field:pos.order,user_salesman_id:0
@@ -2119,7 +2145,7 @@ msgstr "Bestelldatum"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_close_statement
 msgid "Close Cash Registers"
-msgstr ""
+msgstr "Beenden Barkasse"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -2155,7 +2181,7 @@ msgstr "Zwischensumme w/o Steuer"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Add product"
-msgstr ""
+msgstr "Produkt hinzufügen"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index c57c5287692..e75e2e104bd 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/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-27 23:05+0000\n"
+"PO-Revision-Date: 2010-12-29 08: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-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -1332,7 +1332,7 @@ msgstr "Active ID no encontrado"
 #. module: point_of_sale
 #: field:account.bank.statement.line,is_acc:0
 msgid "Is accompte"
-msgstr ""
+msgstr "Anticipo"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index c1f0dad4910..e4dcfccbe50 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:47+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:47+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:08+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -61,11 +61,6 @@ msgstr ""
 msgid "Add product :"
 msgstr ""
 
-#. module: point_of_sale
-#: report:pos.lines:0
-msgid "Net Total"
-msgstr ""
-
 #. module: point_of_sale
 #: view:all.closed.cashbox.of.the.day:0
 msgid "All Cashboxes Of the day :"
@@ -146,6 +141,11 @@ msgstr ""
 msgid "VAT"
 msgstr ""
 
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr ""
+
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Tax"
@@ -249,7 +249,7 @@ msgid "Sales Report"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_discount.py:0
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
 #, python-format
 msgid "No Order Lines"
 msgstr ""
@@ -281,7 +281,8 @@ msgid "Cash register management"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
 #, python-format
 msgid "No valid pricelist line found !"
 msgstr ""
@@ -318,7 +319,7 @@ msgid "Sales by user monthly"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
 #, python-format
 msgid "You can not open a Cashbox for \"%s\".\n"
 "Please close its related cash register."
@@ -475,14 +476,15 @@ msgid "Unit Price"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
 #, python-format
 msgid "Please check that income account is set to %s"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_add_product.py:0
-#: code:addons/point_of_sale/wizard/pos_return.py:0
+#: code:addons/point_of_sale/wizard/pos_add_product.py:56
+#: code:addons/point_of_sale/wizard/pos_return.py:166
+#: code:addons/point_of_sale/wizard/pos_return.py:327
 #: model:ir.actions.act_window,name:point_of_sale.action_add_product
 #: model:ir.model,name:point_of_sale.model_pos_add_product
 #, python-format
@@ -537,13 +539,19 @@ msgid "Sale by Date and User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Cannot delete a point of sale which is closed or contains confirmed cashboxes!"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
 #, python-format
 msgid "Cash registers are already closed."
 msgstr ""
@@ -605,7 +613,8 @@ msgid "User's Product"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
 #, python-format
 msgid "You have to select a pricelist in the sale form !\n"
 "Please set one before choosing a product."
@@ -617,11 +626,6 @@ msgstr ""
 msgid "Subtotal"
 msgstr ""
 
-#. module: point_of_sale
-#: report:pos.invoice:0
-msgid "Partner Ref."
-msgstr ""
-
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
@@ -718,7 +722,7 @@ msgid "Total :"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
 #, python-format
 msgid "Create line failed !"
 msgstr ""
@@ -730,7 +734,7 @@ msgid "Product Name"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -815,6 +819,11 @@ msgstr ""
 msgid "Opening Date"
 msgstr ""
 
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr ""
+
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
 msgid "Disc."
@@ -868,7 +877,7 @@ msgid "transaction for the pos"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "UserError "
 msgstr ""
@@ -879,7 +888,7 @@ msgid "Pos Box Entries"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
 #, python-format
 msgid "You can't modify this order. It has already been paid"
 msgstr ""
@@ -890,6 +899,11 @@ msgstr ""
 msgid "Date End"
 msgstr ""
 
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Your Reference"
+msgstr ""
+
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
 msgid "Number of Transaction"
@@ -1054,11 +1068,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: point_of_sale
-#: report:pos.invoice:0
-msgid "Document"
-msgstr ""
-
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
@@ -1070,7 +1079,8 @@ msgid "All Closed CashBox"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -1114,7 +1124,6 @@ msgstr ""
 
 #. module: point_of_sale
 #: report:pos.invoice:0
-#: report:pos.lines:0
 #: field:pos.order,amount_tax:0
 msgid "Taxes"
 msgstr ""
@@ -1225,10 +1234,15 @@ msgid "Sale by User"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1255,7 +1269,7 @@ msgid "July"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:544
 #, python-format
 msgid "Please provide an account for the product: %s"
 msgstr ""
@@ -1292,7 +1306,7 @@ msgid "Discount(Amount)"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_add_product.py:0
+#: code:addons/point_of_sale/wizard/pos_add_product.py:51
 #, python-format
 msgid "Active ID is not found"
 msgstr ""
@@ -1340,7 +1354,7 @@ msgid "Point of sale receipt"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_payment.py:0
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
 #, python-format
 msgid "No order lines defined for this sale "
 msgstr ""
@@ -1356,7 +1370,7 @@ msgid "Customer Note"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr ""
@@ -1563,7 +1577,7 @@ msgid "Yes"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:743
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1574,9 +1588,8 @@ msgid "The cash register must be opened to be able to execute a payment."
 msgstr ""
 
 #. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
-msgid "Mode of Taxes"
+#: report:pos.lines:0
+msgid "Net Total :"
 msgstr ""
 
 #. module: point_of_sale
@@ -1665,7 +1678,8 @@ msgid "Invoice Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
 #, python-format
 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."
@@ -1682,9 +1696,9 @@ msgid "Reprint"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
 #, python-format
 msgid "You have to open at least one cashbox"
 msgstr ""
@@ -1700,8 +1714,8 @@ msgid "Pos order"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_discount.py:0
-#: code:addons/point_of_sale/wizard/pos_payment.py:0
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -1828,7 +1842,7 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Modify line failed !"
 msgstr ""
@@ -1880,7 +1894,8 @@ msgid "Validation Date"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
 #, python-format
 msgid "You don't have enough access to validate this sale!"
 msgstr ""
@@ -1919,8 +1934,8 @@ msgid "Control for Output Operations"
 msgstr ""
 
 #. 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
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
 #, python-format
 msgid "Message"
 msgstr ""
@@ -1955,11 +1970,6 @@ msgstr ""
 msgid "Invoiced"
 msgstr ""
 
-#. module: point_of_sale
-#: report:pos.invoice:0
-msgid "Must be after setLang()"
-msgstr ""
-
 #. module: point_of_sale
 #: view:pos.close.statement:0
 #: view:pos.confirm:0
@@ -2004,13 +2014,13 @@ msgid "PRO-FORMA"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
 #, python-format
 msgid "Please provide a partner for the sale."
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:852
 #, python-format
 msgid "There is no receivable account defined for this journal: \"%s\" (id:%d)"
 msgstr ""
@@ -2067,7 +2077,13 @@ msgid "POS Orders lines"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
 #, python-format
 msgid "Error"
 msgstr ""
@@ -2083,7 +2099,7 @@ msgid "Refund"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr ""
@@ -2163,7 +2179,7 @@ msgid "Please fill these fields for entries to the box:"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
 #, python-format
 msgid "please check that account is set to %s"
 msgstr ""
@@ -2243,7 +2259,7 @@ msgid "    Today    "
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
 #, python-format
 msgid "The maximum value you can still withdraw is exceeded. \n"
 " Remaining value is equal to %d "
@@ -2300,8 +2316,8 @@ msgid "Account Entry"
 msgstr ""
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_add_product.py:0
-#: code:addons/point_of_sale/wizard/pos_return.py:0
+#: code:addons/point_of_sale/wizard/pos_add_product.py:84
+#: code:addons/point_of_sale/wizard/pos_return.py:407
 #: view:pos.make.payment:0
 #: view:pos.order:0
 #, python-format
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index 0476fb03b31..f359b8208d7 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -33,6 +33,7 @@ class pos_config_journal(osv.osv):
     """ Point of Sale journal configuration"""
     _name = 'pos.config.journal'
     _description = "Journal Configuration"
+    
     _columns = {
         'name': fields.char('Description', size=64),
         'code': fields.char('Code', size=64),
@@ -41,9 +42,11 @@ class pos_config_journal(osv.osv):
 
 pos_config_journal()
 
+
 class pos_company_discount(osv.osv):
     """ Company Discount and Cashboxes """
     _inherit = 'res.company'
+    
     _columns = {
         'company_discount': fields.float('Max Discount(%)', digits_compute=dp.get_precision('Point Of Sale')),
         'max_diff': fields.float('Max Difference for Cashboxes', digits_compute=dp.get_precision('Point Of Sale Discount')),
@@ -173,21 +176,23 @@ class pos_order(osv.osv):
                             (1-(line.discount or 0.0)/100.0), line.qty),
                             res[order.id]['amount_tax'])
                 elif line.qty != 0.0:
-                    for c in tax_obj.compute_all(cr, uid, line.product_id.taxes_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.qty,  line.product_id, line.order_id.partner_id)['taxes']:
+                    for c in tax_obj.compute_all(cr, uid, line.product_id.taxes_id, \
+                                                 line.price_unit * (1-(line.discount or 0.0)/100.0), \
+                                                 line.qty,  line.product_id, line.order_id.partner_id)['taxes']:
                         val += c.get('amount', 0.0)
             res[order.id]['amount_tax'] = cur_obj.round(cr, uid, cur, val)
             res[order.id]['amount_total'] = res[order.id]['amount_tax'] + cur_obj.round(cr, uid, cur, val1)
         return res
 
     def _sale_journal_get(self, cr, uid, context=None):
-        """ To get  sale journal for this order"
+        """ To get  sale journal for this order
         @return: journal  """
         journal_obj = self.pool.get('account.journal')
         res = journal_obj.search(cr, uid, [('type', '=', 'sale')], limit=1)
         return res and res[0] or False
 
     def _shop_get(self, cr, uid, context=None):
-        """ To get  Shop  for this order"
+        """ To get  Shop  for this order
         @return: Shop id  """
         res = self.pool.get('sale.shop').search(cr, uid, [])
         return res and res[0] or False
@@ -207,7 +212,7 @@ class pos_order(osv.osv):
         })
         return super(pos_order, self).copy(cr, uid, id, default, context=context)
 
-    def _get_v( self, cr, uid, ids, *a):
+    def _get_v( self, cr, uid, ids, *args):
         """ Changed the Validation state of order
         @return: State  """
         res_obj = self.pool.get('res.users')
@@ -243,8 +248,13 @@ class pos_order(osv.osv):
         'shop_id': fields.many2one('sale.shop', 'Shop', required=True,
             states={'draft': [('readonly', False)]}, readonly=True),
         'date_order': fields.datetime('Date Ordered', readonly=True),
-        'date_validation': fields.function(_get_date_payment, method=True, string='Validation Date', type='date', store=True),
-        'date_payment': fields.function(_get_date_payment2, method=True, string='Payment Date', type='date', store=True),
+        'date_validation': fields.function(_get_date_payment,
+                                           method=True,
+                                           string='Validation Date',
+                                           type='date', store=True),
+        'date_payment': fields.function(_get_date_payment2, method=True,
+                                        string='Payment Date',
+                                        type='date', store=True),
         'date_validity': fields.date('Validity Date', required=True),
         'user_id': fields.many2one('res.users', 'Connected Salesman', help="Person who uses the the cash register. It could be a reliever, a student or an interim employee."),
         'user_salesman_id': fields.many2one('res.users', 'Cashier', required=True, help="User who is logged into the system."),
@@ -285,7 +295,7 @@ class pos_order(osv.osv):
     }
 
     def _select_pricelist(self, cr, uid, context=None):
-        """ To get default pricelist for the order"
+        """ To get default pricelist for the order
         @param name: Names of fields.
         @return: pricelist ID
         """
@@ -293,7 +303,7 @@ class pos_order(osv.osv):
         return pricelist and pricelist[0] or False
 
     def _journal_default(self, cr, uid, context=None):
-        """ To get default pricelist for the order"
+        """ To get default pricelist for the order
         @param name: Names of fields.
         @return: journal ID
         """
@@ -319,7 +329,7 @@ class pos_order(osv.osv):
 
 
     def test_order_lines(self, cr, uid, order, context=None):
-        """ Test order line is created or not for the order "
+        """ Test order line is created or not for the order 
         @param name: Names of fields.
         @return: True
         """
@@ -452,7 +462,7 @@ class pos_order(osv.osv):
                         location_id, stock_dest_id = stock_dest_id, location_id
 
                     move_obj.create(cr, uid, {
-                            'name': 'Stock move (POS %d)' % (order.id, ),
+                            'name': '(POS %d)' % (order.id, ),
                             'product_uom': line.product_id.uom_id.id,
                             'product_uos': line.product_id.uom_id.id,
                             'picking_id': picking_id,
@@ -506,7 +516,7 @@ class pos_order(osv.osv):
 
     def add_payment(self, cr, uid, order_id, data, context=None):
         """Create a new payment for the order"""
-        statement_obj= self.pool.get('account.bank.statement')
+        statement_obj = self.pool.get('account.bank.statement')
         statement_line_obj = self.pool.get('account.bank.statement.line')
         prod_obj = self.pool.get('product.product')
         property_obj = self.pool.get('ir.property')
@@ -524,12 +534,15 @@ class pos_order(osv.osv):
         if 'payment_name' in data.keys():
             args['name'] = data['payment_name'] + ' ' + order.name
         account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
-        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
+        args['account_id'] = order.partner_id and order.partner_id.property_account_receivable \
+                             and order.partner_id.property_account_receivable.id or account_def.id or curr_c.account_receivable.id
         if data.get('is_acc', False):
             args['is_acc'] = data['is_acc']
-            args['account_id'] = prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income and prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income.id
+            args['account_id'] = prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income \
+                                 and prod_obj.browse(cr, uid, data['product_id'], context=context).property_account_income.id
             if not args['account_id']:
-                raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')%(prod_obj.browse(cr, uid, data['product_id'], context=context).name))
+                raise osv.except_osv(_('Error'), _('Please provide an account for the product: %s')% \
+                                     (prod_obj.browse(cr, uid, data['product_id'], context=context).name))
         args['partner_id'] = order.partner_id and order.partner_id.id or None
         args['ref'] = order.contract_number or None
 
@@ -545,6 +558,8 @@ class pos_order(osv.osv):
         args['statement_id'] = statement_id
         args['pos_statement_id'] = order_id
         args['journal_id'] = data['journal']
+        args['type'] = 'customer'
+        args['ref'] = order.name
         statement_line_obj.create(cr, uid, args, context=context)
         ids_new.append(statement_id)
 
@@ -555,7 +570,9 @@ class pos_order(osv.osv):
         return statement_id
 
     def add_product(self, cr, uid, order_id, product_id, qty, context=None):
+        
         """Create a new order line the order"""
+        
         line_obj = self.pool.get('pos.order.line')
         values = self.read(cr, uid, order_id, ['partner_id', 'pricelist_id'])
 
@@ -576,7 +593,9 @@ class pos_order(osv.osv):
         return order_line_id, price
 
     def refund(self, cr, uid, ids, context=None):
+        
         """Create a copy of order  for refund order"""
+        
         clone_list = []
         line_obj = self.pool.get('pos.order.line')
 
@@ -601,7 +620,9 @@ class pos_order(osv.osv):
         return clone_list
 
     def action_invoice(self, cr, uid, ids, context=None):
+        
         """Create a invoice of order  """
+        
         inv_ref = self.pool.get('account.invoice')
         inv_line_ref = self.pool.get('account.invoice.line')
         product_obj = self.pool.get('product.product')
@@ -644,7 +665,8 @@ class pos_order(osv.osv):
                 inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
                                                                line.product_id.id,
                                                                line.product_id.uom_id.id,
-                                                               line.qty, partner_id = order.partner_id.id, fposition_id=order.partner_id.property_account_position.id)['value'])
+                                                               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['name'] = inv_name
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index c61d0347d84..33c6c62cd6e 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -214,10 +214,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time=True)]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start)]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real)]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -250,7 +250,7 @@
               <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(line_ids.amount) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account') ]] [[ company.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -267,7 +267,7 @@
           <para style="terp_tblheader_Details">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account') ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -282,4 +282,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index ae9d7252984..7aa2c3a8ea0 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -238,13 +238,13 @@
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ formatLang(line_ids['discount']) ]]</para>
+            <para style="terp_default_Centre_9">[[ formatLang(line_ids['discount'], dp='Sale Price') ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ getinvoice(line_ids['invoice_id'],user) or removeParentNode('font') ]]</para>
@@ -306,7 +306,7 @@
             <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -335,7 +335,7 @@
           <para style="terp_default_Bold_9">Sales total(Revenue)</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(data['form'],user), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -351,7 +351,7 @@
           <para style="terp_default_Bold_9">Total invoiced</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form'],user), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -359,7 +359,7 @@
           <para style="terp_default_Bold_9">Total discount</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(data['form'],user), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -367,7 +367,7 @@
           <para style="terp_default_Bold_9">Total paid</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(data['form'],user)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(data['form'],user), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -375,7 +375,7 @@
           <para style="terp_default_Bold_9">Total of the day</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form'])) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index b0a2e606897..22ff18e0231 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -199,7 +199,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Net Total </para>
+          <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
@@ -212,7 +212,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_9">Taxes</para>
+          <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
@@ -236,4 +236,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index b8f86233319..ba7764fed28 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -155,13 +155,13 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount']) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['discount'], dp='Sale Price') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -177,7 +177,7 @@
           <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_date_total(data['form'])) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_date_total(data['form']), dp='Sale Price') or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -185,4 +185,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/point_of_sale/report/pos_receipt_with_remboursment.py b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
index 9b3dc529646..c600a9e2754 100644
--- a/addons/point_of_sale/report/pos_receipt_with_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_with_remboursment.py
@@ -63,14 +63,19 @@ class order(report_sxw.rml_parse):
                     WHERE absl.pos_statement_id = %d"""%(order_id.id)
         self.cr.execute(sql)
         res = self.cr.fetchone()
-        lst.append(res[0])
+        if not res:
+            return ['', 0.0]
+        lst.append(res[0]) # todo: improve
         sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
                     LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
                     LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
                     where aj.name = '%s' """%(res[0])
         self.cr.execute(sql2)
         res1 = self.cr.fetchone()
-        lst.append(res1[0])
+        if res1:
+            lst.append(res1[0])
+        else:
+            lst.append(0.0)
         return lst
 
 report_sxw.report_sxw('report.pos.receipt.with.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_with_remboursment.rml', parser=order, header=False)
diff --git a/addons/point_of_sale/report/pos_receipt_without_remboursment.py b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
index 72d227fbd52..d2fe0f1d542 100644
--- a/addons/point_of_sale/report/pos_receipt_without_remboursment.py
+++ b/addons/point_of_sale/report/pos_receipt_without_remboursment.py
@@ -63,14 +63,19 @@ class order(report_sxw.rml_parse):
                     WHERE absl.pos_statement_id = %d"""%(order_id.id)
         self.cr.execute(sql)
         res = self.cr.fetchone()
-        lst.append(res[0])
+        if not res:
+            return ['', 0.0]
+        lst.append(res[0]) # todo: improve
         sql2 = """ select sum(absl.amount) as amt from account_bank_statement as abs
                     LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
                     LEFT JOIN account_journal as aj ON aj.id = abs.journal_id
                     where aj.name = '%s' """%(res[0])
         self.cr.execute(sql2)
         res1 = self.cr.fetchone()
-        lst.append(res1[0])
+        if res1:
+            lst.append(res1[0])
+        else:
+            lst.append(0.0)
         return lst
 
 report_sxw.report_sxw('report.pos.receipt.without.remboursment', 'pos.order', 'addons/point_of_sale/report/pos_receipt_without_remboursment.rml', parser=order, header=False)
diff --git a/addons/point_of_sale/test/point_of_sale_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml
index d058c8fd691..1a77e8f30d4 100644
--- a/addons/point_of_sale/test/point_of_sale_report.yml
+++ b/addons/point_of_sale/test/point_of_sale_report.yml
@@ -51,22 +51,29 @@
     (data, format) = netsvc.LocalService('report.pos.receipt.without.remboursment').create(cr, uid, [ref('point_of_sale.order_pos1'), ref('point_of_sale.order_pos2')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'point_of_sale-receipt without reimbursement report'+format), 'wb+').write(data)
+
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Payment Report
+ Print the POS Payment Report through the wizard
 -
   !python {model: ir.ui.menu}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.payment.report.date').create(cr, uid, [1], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [ref('base.user_root')] }}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos sales lines report'+format), 'wb+').write(data)
+    import time
+    ctx={}
+    ctx.update({'model': 'ir.ui.menu','active_ids': []})
+    data_dict = {'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d'), 'user_id': [(6,0,[ref('base.user_root')])] }
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_report_pos_payment_repport_date',wiz_data=data_dict, context=ctx, our_module='point_of_sale')
+
 -
-  In order to test the PDF reports defined on a Point Of Sale, we will print a POS Details Report
+ Print the POS Details Report through the wizard
 -
   !python {model: ir.ui.menu}: |
-    import netsvc, tools, os, time
-    (data, format) = netsvc.LocalService('report.pos.details').create(cr, uid, [], {'model':'ir.ui.menu', 'form':{'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d') }}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'point_of_sale- pos details report'+format), 'wb+').write(data)
+    import time
+    ctx={}
+    ctx.update({'model': 'ir.ui.menu','active_ids': []})
+    data_dict = {'date_start': time.strftime('%Y-%m-%d'), 'date_end': time.strftime('%Y-%m-%d')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_report_pos_details',wiz_data=data_dict, context=ctx, our_module='point_of_sale')
+
 -
   I create a cash journal.
 -
diff --git a/addons/point_of_sale/wizard/pos_details.py b/addons/point_of_sale/wizard/pos_details.py
index 8a63ae97dbd..c6793b7b437 100644
--- a/addons/point_of_sale/wizard/pos_details.py
+++ b/addons/point_of_sale/wizard/pos_details.py
@@ -51,6 +51,8 @@ class pos_details(osv.osv_memory):
         res = self.read(cr, uid, ids, ['date_start', 'date_end'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
+        if res.get('id',False):
+            datas['ids']=[res['id']]
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'pos.details',
diff --git a/addons/point_of_sale/wizard/pos_payment_report_date.py b/addons/point_of_sale/wizard/pos_payment_report_date.py
index 49e21c01c05..e498eef6697 100644
--- a/addons/point_of_sale/wizard/pos_payment_report_date.py
+++ b/addons/point_of_sale/wizard/pos_payment_report_date.py
@@ -44,7 +44,8 @@ class pos_payment_report_date(osv.osv_memory):
         res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
-
+        if res.get('id',False):
+            datas['ids']=[res['id']]
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'pos.payment.report.date',
diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py
index 33c9dc8f3fc..94d84647a7c 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_today.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
 
 
 class pos_sales_user_today(osv.osv_memory):
@@ -47,7 +46,6 @@ class pos_sales_user_today(osv.osv_memory):
         res = self.read(cr, uid, ids, ['user_id'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
-
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'pos.sales.user.today',
diff --git a/addons/point_of_sale/wizard/pos_scan_product.py b/addons/point_of_sale/wizard/pos_scan_product.py
index 49cd32eba4d..8e1e4aace86 100644
--- a/addons/point_of_sale/wizard/pos_scan_product.py
+++ b/addons/point_of_sale/wizard/pos_scan_product.py
@@ -20,14 +20,16 @@
 ##############################################################################
 
 from osv import osv,fields
-from tools.translate import _
+
 
 class pos_scan_product(osv.osv_memory):
     _name = 'pos.scan.product'
     _description = 'Scan product'
+    
     _columns = {
-        'gencod': fields.char('Barcode',size=13,required= True)
+        'gencod': fields.char('Barcode', size=13, required=True)
     }
+    
     def scan(self, cr, uid, ids, context=None):
         """ 
          To get the gencod and scan product         
@@ -40,9 +42,10 @@ class pos_scan_product(osv.osv_memory):
         if context is None:
             context = {}
         data=self.read(cr, uid, ids)[0]
-        record_id = context and context.get('active_id',False)
-        result =self. pool.get('pos.order.line')._scan_product(cr, uid, data['gencod'], 1, record_id)
+        record_id = context and context.get('active_id', False)
+        self. pool.get('pos.order.line')._scan_product(cr, uid, data['gencod'], 1, record_id)
         return {'gencod': False}
+
 pos_scan_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/process/i18n/de.po b/addons/process/i18n/de.po
index af12b23b608..692fd382219 100644
--- a/addons/process/i18n/de.po
+++ b/addons/process/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 08:44+0000\n"
+"PO-Revision-Date: 2010-12-29 10: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:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
@@ -29,7 +29,7 @@ msgstr "Prozessknoten"
 msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
-msgstr ""
+msgstr "Bei Deaktivierung können Sie die Anzeige dieses Prozess verbergen."
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -232,6 +232,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"     Dieses Anwendung zeigt die grundlegenden Prozesse in den ausgewählten "
+"Modulen \n"
+"     sowie die Reihenfolge in der die Prozesse auftreten.\n"
+"\n"
+"     Hinweis: Die Anwendung erfolgt bei Modulen die xml Dateien nach dem "
+"Muster \n"
+"     modulename_process_name beinhalten, z.B. "
+"product/process/product_process_xml\n"
+"\n"
+"    "
 
 #. module: process
 #: field:process.condition,model_states:0
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index b21ace7968f..27866b2d41b 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 12:08+0000\n"
+"PO-Revision-Date: 2010-12-28 08:42+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/process.pot b/addons/process/i18n/process.pot
index 61e77ec57ab..203e9d3e316 100644
--- a/addons/process/i18n/process.pot
+++ b/addons/process/i18n/process.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:49+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:49+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:09+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:09+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index e44906d3c55..40966dc4c57 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-03-20 09:11+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-12-31 10:31+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@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: 2011-01-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
@@ -28,7 +28,7 @@ msgstr "处理节点"
 msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
-msgstr ""
+msgstr "此字段设为 False 将隐藏流程而不是删除它。"
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -44,7 +44,7 @@ msgstr "按钮"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组于"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -54,7 +54,7 @@ msgstr "状态"
 #. module: process
 #: view:process.node:0
 msgid "Kind Of Node"
-msgstr ""
+msgstr "节点种类"
 
 #. module: process
 #: field:process.node,help_url:0
@@ -85,7 +85,7 @@ msgstr "条件"
 #. module: process
 #: view:process.transition:0
 msgid "Search Process Transition"
-msgstr ""
+msgstr "搜索流程转换"
 
 #. module: process
 #: field:process.condition,node_id:0
@@ -152,7 +152,7 @@ msgstr "哑元"
 #: model:ir.actions.act_window,name:process.action_process_form
 #: model:ir.ui.menu,name:process.menu_process_form
 msgid "Processes"
-msgstr ""
+msgstr "流程列表"
 
 #. module: process
 #: field:process.condition,name:0
@@ -185,7 +185,7 @@ msgstr "转换"
 #. module: process
 #: view:process.process:0
 msgid "Search Process"
-msgstr ""
+msgstr "搜索流程"
 
 #. module: process
 #: selection:process.node,kind:0
@@ -201,7 +201,7 @@ msgstr "生效"
 #. module: process
 #: view:process.transition:0
 msgid "Associated Groups"
-msgstr ""
+msgstr "关联的用户组"
 
 #. module: process
 #: field:process.node,model_states:0
@@ -240,13 +240,13 @@ msgstr "表达"
 #. module: process
 #: field:process.transition,group_ids:0
 msgid "Required Groups"
-msgstr ""
+msgstr "要求的用户组"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "传入转换"
 
 #. module: process
 #: field:process.transition.action,state:0
@@ -268,13 +268,13 @@ msgstr "处理"
 #. module: process
 #: view:process.node:0
 msgid "Search ProcessNode"
-msgstr ""
+msgstr "搜索流程节点"
 
 #. module: process
 #: view:process.node:0
 #: view:process.process:0
 msgid "Other Conditions"
-msgstr ""
+msgstr "其他条件"
 
 #. module: process
 #: model:ir.module.module,shortdesc:process.module_meta_information
@@ -291,7 +291,7 @@ msgstr "动作"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Properties"
-msgstr ""
+msgstr "属性"
 
 #. module: process
 #: model:ir.actions.act_window,name:process.action_process_transition_form
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 3595b0031ad..e1c08b0a93f 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:59+0000\n"
+"PO-Revision-Date: 2010-12-31 09:47+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -47,7 +47,7 @@ msgstr "Gruppierung..."
 #. module: procurement
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
-msgstr ""
+msgstr "Beschaffungsentwurf für Produkt oder Lagerort der Bestellung"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -243,12 +243,12 @@ msgstr ""
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Durchzuführende Beschaffungsaufträge"
 
 #. module: procurement
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -452,13 +452,13 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"    Dieses Modul errechnet Beschaffungsvorschläge.\n"
+"    Dieses Modul errechnet automatische Beschaffungsvorschläge.\n"
 "    "
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Bezugnehmende Beschaffungsaufträge"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -491,6 +491,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
+"Durch Deaktivierung können Sie die Ansicht für den Bestellzeitpunkt "
+"ausblenden."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_max_qty:0
@@ -600,6 +602,7 @@ msgstr "Normal"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
@@ -655,7 +658,7 @@ msgstr "Beschaffung Bezeichnung"
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index c125550766e..e0605b76e6d 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/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-27 18:12+0000\n"
+"PO-Revision-Date: 2010-12-28 09:19+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index 92b93e249e0..2e12cd60aec 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:50+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:50+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:10+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr ""
+
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
@@ -41,7 +46,7 @@ msgid "Draft procurement of the product and location of that orderpoint"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:288
 #, python-format
 msgid "No supplier defined for this product !"
 msgstr ""
@@ -57,7 +62,7 @@ msgid "Procurement Method"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:298
 #, python-format
 msgid "No address defined for the supplier"
 msgstr ""
@@ -67,11 +72,6 @@ msgstr ""
 msgid "Compute Stock Minimum Rules Only"
 msgstr ""
 
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.procurement_action
-msgid "A procurement order is used to record a need in a specific product at a specific location. They are usually created automatically by the sales orders, the Pull Logistics rules or the minimum stock rules. When the procurement order is confirmed, it creates automatically the necessary operations to fullfil the need: purchase order proposition, manufacturing order, etc."
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,company_id:0
 #: field:stock.warehouse.orderpoint,company_id:0
@@ -114,6 +114,11 @@ msgstr ""
 msgid "Notes"
 msgstr ""
 
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr ""
+
 #. module: procurement
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
@@ -236,11 +241,6 @@ msgstr ""
 msgid "Warehouse"
 msgstr ""
 
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
-msgid "You can define your minimum stock rules, so that OpenERP will trigger automatically the propositions of manufacturing or purchase orders according to the stock level. Once the virtual stock of a product (=stock on hand minus all confirmed orders and reservations) is bellow the minimum quantity, OpenERP will generate a procurement request in order to fullfil the stock up to the maximum quantity."
-msgstr ""
-
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Best price (not yet active!)"
@@ -268,8 +268,8 @@ msgid "Scheduler Range Days"
 msgstr ""
 
 #. module: procurement
-#: view:make.procurement:0
-msgid "Ask New Products"
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid "A procurement order is used to record a need for a specific product at a specific location. A procurement order is usually created automatically from sales orders, a Pull Logistics rule or Minimum Stock Rules. When the procurement order is confirmed, it automatically creates the necessary operations to fullfil the need: purchase order proposition, manufacturing order, etc."
 msgstr ""
 
 #. module: procurement
@@ -289,13 +289,13 @@ msgid "Quantity"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:370
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:137
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -395,6 +395,11 @@ msgstr ""
 msgid "Related Procurement Orders"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Min Quantity"
@@ -411,7 +416,7 @@ msgid "plus"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:319
 #, python-format
 msgid "Please check the Quantity in Procurement Order(s), it should not be less than 1!"
 msgstr ""
@@ -457,21 +462,11 @@ msgstr ""
 msgid "This wizard will schedule procurements."
 msgstr ""
 
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.procurement_exceptions
-msgid "Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message)"
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order:0
 msgid "Status"
 msgstr ""
 
-#. module: procurement
-#: help:res.company,schedule_range:0
-msgid "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."
-msgstr ""
-
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Normal"
@@ -503,7 +498,7 @@ msgid "Exception"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/schedulers.py:0
+#: code:addons/procurement/schedulers.py:179
 #, python-format
 msgid "Automatic OP: %s"
 msgstr ""
@@ -559,19 +554,19 @@ msgid "Date Closed"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:372
 #, python-format
 msgid "Procurement '%s' is in exception: not enough stock."
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:138
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:318
 #, python-format
 msgid "Data Insufficient !"
 msgstr ""
@@ -746,8 +741,8 @@ msgid "Waiting"
 msgstr ""
 
 #. module: procurement
-#: selection:procurement.order,procure_method:0
-msgid "on order"
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid "You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or purchase quotations according to the stock level. Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, OpenERP will generate a procurement request to increase the stock up to the maximum quantity."
 msgstr ""
 
 #. module: procurement
@@ -787,7 +782,7 @@ msgid "Product UoS"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:347
 #, python-format
 msgid "from stock: products assigned."
 msgstr ""
@@ -800,8 +795,8 @@ msgid "Compute Schedulers"
 msgstr ""
 
 #. module: procurement
-#: view:procurement.orderpoint.compute:0
-msgid "Wizard checks all the stock minimum rules and generate procurement order."
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid "Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message)."
 msgstr ""
 
 #. module: procurement
@@ -814,6 +809,11 @@ msgstr ""
 msgid "Search Procurement"
 msgstr ""
 
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid "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 future computation."
+msgstr ""
+
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Very Urgent"
@@ -830,7 +830,7 @@ msgid "Procurement Details"
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/schedulers.py:0
+#: code:addons/procurement/schedulers.py:180
 #, python-format
 msgid "SCHEDULER"
 msgstr ""
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 8bb9d5c7897..bfa17c48c92 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-27 06:22+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 08:01+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-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -49,7 +49,7 @@ msgstr ""
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "No supplier defined for this product !"
-msgstr ""
+msgstr "Không có nhà cung cấp nào cho sản phẩm này !"
 
 #. module: procurement
 #: field:make.procurement,uom_id:0
@@ -65,7 +65,7 @@ msgstr "Phương pháp mua hàng"
 #: code:addons/procurement/procurement.py:0
 #, python-format
 msgid "No address defined for the supplier"
-msgstr ""
+msgstr "Không có địa chỉ nào được gán cho nhà cung cấp"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 37c300e03ab..618e8d9794c 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -35,6 +35,7 @@
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom" string="UOM"/>
+                    <field name="state" invisible = "1"/>
                     <field name="message"/>
                 </tree>
             </field>
@@ -272,7 +273,7 @@
         <menuitem id="menu_stock_sched" name="Schedulers" parent="stock.menu_stock_root" sequence="4"/>
             <menuitem action="action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="20" groups="stock.group_stock_manager"/>
             <menuitem action="procurement_exceptions" id="menu_stock_procurement_action" parent="menu_stock_sched" sequence="50" groups="stock.group_stock_manager"/>
-        <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5" groups="base.group_extended"/>
+        <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="menu_stock_procurement" sequence="10"/>
 
     </data>
diff --git a/addons/procurement/security/procurement_security.xml b/addons/procurement/security/procurement_security.xml
index 7dd67c39f6c..2e250db461c 100644
--- a/addons/procurement/security/procurement_security.xml
+++ b/addons/procurement/security/procurement_security.xml
@@ -6,14 +6,14 @@
             <field name="name">procurement multi-company</field>
             <field name="model_id" search="[('model','=','procurement.order')]" model="ir.model"/>
             <field name="global" eval="True"/>
-            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
 
         <record model="ir.rule" id="stock_warehouse_orderpoint_rule">
             <field name="name">stock_warehouse.orderpoint multi-company</field>
             <field name="model_id" search="[('model','=','stock.warehouse.orderpoint')]" model="ir.model"/>
             <field name="global" eval="True"/>
-            <field name="domain_force">['|',('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
+            <field name="domain_force">['|','|',('company_id','child_of',[user.company_id.id]),('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id])]</field>
         </record>
 
     </data>
diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index d94e6753231..8f9c1fc3d53 100644
--- a/addons/procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
@@ -63,7 +63,7 @@ class procurement_compute(osv.osv_memory):
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_orderpoint, args=(cr, uid, ids, context))
         threaded_calculation.start()
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 procurement_compute()
 
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 5fae2760edf..293a195b4ed 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -59,8 +59,8 @@ class procurement_compute_all(osv.osv_memory):
         """
         threaded_calculation = threading.Thread(target=self._procure_calculation_all, args=(cr, uid, ids, context))
         threaded_calculation.start()
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 procurement_compute_all()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index 12c5e59ac69..9de1bc6485c 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2255,7 +2255,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Product Process"
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index 1f2eb73c7a0..8971d250271 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,7 +2252,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Configuration"
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index fcbce14af68..0723f23f6e4 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2287,10 +2287,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
-"kategorije i pod kategorije. Ostavite prazno za sve proizvode"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
@@ -2499,6 +2497,13 @@ msgstr ""
 #~ "proizvodnju i, ako je skup materijala sa više nivoa, samo za nivo ovog "
 #~ "proizvoda. Druga kašnjenja će biti sabrana za sve nivoe i narudžbenice."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
+#~ "kategorije i pod kategorije. Ostavite prazno za sve proizvode"
+
 #~ msgid ""
 #~ "Delay in days between the confirmation of the purchase order and the "
 #~ "reception of the products in your warehouse. Used by the scheduler for "
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index 77a533fe6f1..af95bffa1f3 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2290,11 +2290,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indica una categoria de producte si aquesta regla només s'aplica a productes "
-"d'una categoria i als seus descendents. Deixeu-lo buit per a tots els "
-"productes"
 
 #~ msgid "Childs Categories"
 #~ msgstr "Categories filles"
@@ -2603,6 +2600,14 @@ msgstr ""
 #~ "Unitat de mesura per defecte utilitzada en les ordres de compra. Heu "
 #~ "d'estar en la mateixa categoria que la unitat de mesura per defecte."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indica una categoria de producte si aquesta regla només s'aplica a productes "
+#~ "d'una categoria i als seus descendents. Deixeu-lo buit per a tots els "
+#~ "productes"
+
 #~ msgid "KGM"
 #~ msgstr "Kg."
 
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 61e59066b0c..82f23f6701b 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,7 +2252,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Childs Categories"
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 1933f6692ab..fffe0c1f0bc 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:04+0000\n"
+"PO-Revision-Date: 2010-12-31 09:46+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -157,6 +157,8 @@ msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier UoM if "
 "any or in the default UoM of the product otherrwise."
 msgstr ""
+"Minimalbestand für den Anstoss dieser Regel, ausgedrückt in der Einheit des "
+"Lieferanten oder alternativ in der Standard Mengeneinheit."
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
@@ -496,6 +498,8 @@ msgid ""
 "Choose here the Unit of Measure in which the prices and quantities are "
 "expressed below."
 msgstr ""
+"Wählen Sie die Maßeinheit in der Preise und Stückzahlen unten angezeigt "
+"werden sollen."
 
 #. module: product
 #: field:product.price_list,qty4:0
@@ -518,6 +522,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"Wenn dieses Feld deaktiviert ist, können Produkte ausgeblendet werden."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
@@ -711,6 +716,8 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"Die minimale Anzeige für die Bestellung beim Lieferanten, ausgedrückt in der "
+"Produkt Mengeneinheit des Lieferanten."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -723,6 +730,8 @@ msgid ""
 "This price will be considered as a price for the supplier UoM if any or the "
 "default Unit of Measure of the product otherwise"
 msgstr ""
+"Der Preis wird als Standard Preis für einzelne verschiedene Mengeneinheiten "
+"hinterlegt"
 
 #. module: product
 #: model:product.category,name:product.product_category_accessories
@@ -969,10 +978,10 @@ msgstr ""
 "Verkaufspreis für alle Partner oder Produkte (oder deren Kategorien) die der "
 "Liste zugeordnet sind zu berechnen. Preislisten können aus mehreren "
 "Versionen (2010, 2011, Promotion Februar 2010, etc.) bestehen und jede "
-"Version hat eigene Regeln. \r\n"
-"Beispiel: Der Verkaufspreis für Produkte der Produktkategorie "
-"\"Büromaterial\" basiert auf dem Einkaufspreis multipliziert mit 1.80 und "
-"gilt nur für Kunden der Kategorie \"Norddeutschland\"."
+"Version hat eigene Regeln. Beispiel: Der Verkaufspreis für Produkte der "
+"Produktkategorie \"Büromaterial\" basiert auf dem Einkaufspreis "
+"multipliziert mit 1.80 und gilt nur für Kunden der Kategorie "
+"\"Norddeutschland\"."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1228,6 +1237,28 @@ msgid ""
 "    Print product labels with barcode.\n"
 "    "
 msgstr ""
+"\n"
+"    Dies Anwendung ist das Basis-Modul für die Verwaltung von Produkten und "
+"Preislisten in OpenERP.\n"
+"\n"
+"     Das Produkt Modul unterstützt Varianten, unterschiedliche Preislisten, "
+"Lieferanten\n"
+"     Informationen, verschiedene Dispositionsverfahren vom Lager / vom "
+"Auftrag, verschiedene Mengeneinheiten,\n"
+"     verschiedene Produktverpackungen sowie die Definition von "
+"Produkteigenschaften.\n"
+"\n"
+"     Das Preislistenmanagement unterstützt folgende Anforderungen:\n"
+"     * Mehrstufige Rabatte (nach Produkt, Kategorie, Menge)\n"
+"     * Preisberechnung auf Basis verschiedener Kriterien:\n"
+"         * Andere Preisliste,\n"
+"         * Produktkosten,\n"
+"         * Listenpreis,\n"
+"         * Lieferantenpreis, ...\n"
+"     Preislisten Präferenzen für Produkte und / oder Partnern.\n"
+"\n"
+"     Druck von Artikeldatenblättern oder von Produktetiketten mit Barcode.\n"
+"    "
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -1296,7 +1327,7 @@ msgstr "Partner"
 #. module: product
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Sie können nicht zwei identische Benutzeranmeldungen definieren!"
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1332,7 +1363,7 @@ msgstr "Weitere ME"
 #: code:addons/product/product.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Fehler !"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1379,6 +1410,10 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"Konfiguration der Reihenfolge, nach der verschiedene Preislistenpositionen "
+"sukzessiv überprüft werden. Die Prüfung erfolgt von der höchsten Priorität "
+"bis zur niedrigsten Priorität  der Reihenfolge und stoppt an der Stelle, wo "
+"der passende Artikel gefunden wird."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1449,6 +1484,9 @@ msgid ""
 "Conversion from Product UoM m to Default UoM PCE is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"Umrechnung der Produkt Mengeneinheit zur Standard Mengeneinheit Stk ist "
+"nicht möglich, wenn die Mengeneinheiten zu unterschiedlichen Kategorien "
+"zugeordnet sind."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1489,7 +1527,7 @@ msgstr "Basic PC"
 msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
-msgstr ""
+msgstr "Durch Deaktivierung können Sie die Preisliste ausblenden."
 
 #. module: product
 #: field:product.product,qty_available:0
@@ -1518,6 +1556,8 @@ msgstr ""
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Das ausgewählte Unternehmen gehört nicht zu den zulässigen Unternehmen für "
+"diesen Benutzer"
 
 #. module: product
 #: field:product.uom,rounding:0
@@ -1813,7 +1853,7 @@ msgstr "Bezeichnung für diese Preisart."
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "Mengeneinheit bei Lieferanten"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -2088,7 +2128,7 @@ msgstr "Gewichte"
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
@@ -2393,18 +2433,17 @@ msgid ""
 msgstr ""
 "Es kann mehr als eine Version einer Preisliste geben. Wenn Sie weitere "
 "Versionen einer Preisliste benötigen, können Sie hier erstellen und "
-"Verwalten. \r\n"
-"Ein paar Beispiele: 2010, 2011, Promotion Februar 2010, etc."
+"Verwalten. Ein paar Beispiele: 2010, 2011, Promotion Februar 2010, etc."
 
 #. 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"
+"and his children. Keep empty for all products"
 msgstr ""
-"Definiere eine Produkt Kategorie, wenn diese Regel nur auf die Produkte "
-"einer Kategorie und seinen zugeordneten Produkten angewendet werden soll. "
-"Lasse den Eintrag leer für alle Produkte."
+"Definieren Sie eine Produktkategorie, nach der diese Regel nur für diese "
+"Kategorie und dessen untergeordnete Element gilt. Bitte lassen Sie dieses "
+"Feld konsequenterweise dann auch für alle anderen Produkte frei."
 
 #~ msgid "Price Min. Margin"
 #~ msgstr "Min. Preisspanne"
@@ -2850,6 +2889,14 @@ msgstr ""
 #~ "Die minimale Bestellmenge bei einem Lieferanten, angezeigt in der Standard "
 #~ "Mengeneinheit für dieses Produkt."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Definiere eine Produkt Kategorie, wenn diese Regel nur auf die Produkte "
+#~ "einer Kategorie und seinen zugeordneten Produkten angewendet werden soll. "
+#~ "Lasse den Eintrag leer für alle Produkte."
+
 #~ msgid "Shortcut for this menu already exists!"
 #~ msgstr "Die Verknüpfung existiert bereits für dieses Menü!"
 
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index fb52fcff1bc..f0d51627537 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2327,11 +2327,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Ρυθμίστε μιά κατηγορία προϊόντων έαν αυτός ο κανόνας χρησιμοποιείται σε "
-"προϊόντα μιάς κατηγορίας και των υποκατηγοριών. Διατηρήστε κενό για όλα τα "
-"προϊόντα."
 
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
@@ -2611,6 +2608,14 @@ msgstr ""
 #~ "Προκαθορισμένη Μονάδα Μέτρησης που χρησιμοποιείται στις εντολές αγοράς. Θα "
 #~ "πρέπει να είναι στην ίδια κατηγορια με την προκαθορισμένη μονάδα μέτρησης."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Ρυθμίστε μιά κατηγορία προϊόντων έαν αυτός ο κανόνας χρησιμοποιείται σε "
+#~ "προϊόντα μιάς κατηγορίας και των υποκατηγοριών. Διατηρήστε κενό για όλα τα "
+#~ "προϊόντα."
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Άκυρο XML για την αρχιτεκτονική όψης!"
 
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 2e8c50ffe89..2f43d3963fa 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:02+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-31 09:00+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-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2424,11 +2423,10 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indicar una categoría de producto si esta regla sólo se aplica a productos "
-"de una categoría y a sus descendientes. Dejarlo vacío para todos los "
-"productos"
+"Establecer una categoría de producto si esta regla sólo se aplicará a los "
+"productos de una categoría y sus hijos. Dejar vacío para todos los productos"
 
 #~ msgid "Childs Categories"
 #~ msgstr "Categorías hijas"
@@ -2737,6 +2735,14 @@ msgstr ""
 #~ "Unidad de medida por defecto utilizada en las órdenes de compra. Debe "
 #~ "estar en la misma categoría que la unidad de medida por defecto."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indicar una categoría de producto si esta regla sólo se aplica a productos "
+#~ "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
+#~ "productos"
+
 #~ msgid "KGM"
 #~ msgstr "Kg."
 
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index 0e5c138444c..e9d18fa397e 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2293,11 +2293,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indicar una categoría de producto si esta regla sólo se aplica a productos "
-"de una categoría y a sus descendientes. Dejarlo vacío para todos los "
-"productos"
 
 #~ msgid ""
 #~ "This is the average time between the confirmation of the customer order and "
@@ -2557,6 +2554,14 @@ msgstr ""
 #~ "para el nivel de este producto. Diferentes plazos serán sumados para todos "
 #~ "los niveles y pedidos de compra."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indicar una categoría de producto si esta regla sólo se aplica a productos "
+#~ "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
+#~ "productos"
+
 #~ msgid ""
 #~ "Delay in days between the confirmation of the purchase order and the "
 #~ "reception of the products in your warehouse. Used by the scheduler for "
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index 9cde7b22a85..2dd070082db 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2295,11 +2295,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indicar una categoría de producto si esta regla sólo se aplica a productos "
-"de una categoría y a sus descendientes. Dejarlo vacío para todos los "
-"productos"
 
 #~ msgid ""
 #~ "The cost of the product for accounting stock valuation. It can serves as a "
@@ -2531,6 +2528,14 @@ msgstr ""
 #~ "Unidad de medida por defecto utilizada en las órdenes de compra. Debe "
 #~ "estar en la misma categoría que la unidad de medida por defecto."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indicar una categoría de producto si esta regla sólo se aplica a productos "
+#~ "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
+#~ "productos"
+
 #~ msgid "KGM"
 #~ msgstr "Kg."
 
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index ec14b1e9711..75500c20047 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2283,10 +2283,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Määra toote kategooria, kui see reegel rakendub ainult kategooria toodetele "
-"ja nende alamatele. Hoia tühjana kõigi toodete jaoks."
 
 #~ msgid "Rentable product"
 #~ msgstr "Renditav toode"
@@ -2469,6 +2467,13 @@ msgstr ""
 #~ "Arvutatud kogus on selle väärtuse kordne. Kasuta 1.0 toodetel, mida ei saa "
 #~ "poolitada."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Määra toote kategooria, kui see reegel rakendub ainult kategooria toodetele "
+#~ "ja nende alamatele. Hoia tühjana kõigi toodete jaoks."
+
 #~ msgid ""
 #~ "Code of the product for this partner, will be used when printing a request "
 #~ "for quotation. Keep empty to use the internal one."
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index 00a1f9d822c..f04089eb1b7 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2255,7 +2255,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Procure Method"
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index ba601e89699..9677e1a0352 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2287,11 +2287,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Aseta tuotekategoria jos sääntöä sovelletaan vain siinä tai sen "
-"alakategorioissa oleviin tuotteisiin. Jätä tyhjäksi jos sovelletaan kaikkiin "
-"tuotteisiin."
 
 #~ msgid "Supplier of Product"
 #~ msgstr "Tuotteen toimittaja"
@@ -2508,6 +2505,14 @@ msgstr ""
 #~ msgid "Paletization"
 #~ msgstr "Lavoitus"
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Aseta tuotekategoria jos sääntöä sovelletaan vain siinä tai sen "
+#~ "alakategorioissa oleviin tuotteisiin. Jätä tyhjäksi jos sovelletaan kaikkiin "
+#~ "tuotteisiin."
+
 #~ msgid ""
 #~ "Default Unit of Measure used for purchase orders. It must in the same "
 #~ "category than the default unit of measure."
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 4adfd69f601..4b8a665a16e 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2404,11 +2404,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Indiquer une catégorie de produit si la règle n'est appliquée que sur une "
-"catégorie de produits et ses fils. Laisser vide si elle s'applique à tous "
-"les produits"
 
 #~ msgid "Childs Categories"
 #~ msgstr "Catégorie enfant"
@@ -2656,6 +2653,14 @@ msgstr ""
 #~ "L'unité de mesure par défaut pour les commandes d'achats. Qui doit être dans "
 #~ "la même catégorie que l'unité de mesure par défaut."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Indiquer une catégorie de produit si la règle n'est appliquée que sur une "
+#~ "catégorie de produits et ses fils. Laisser vide si elle s'applique à tous "
+#~ "les produits"
+
 #~ msgid "Rentable product"
 #~ msgstr "Peut être loué"
 
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index c2ded4745c3..7cfa744b6a5 100644
--- a/addons/product/i18n/gl.po
+++ b/addons/product/i18n/gl.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2253,5 +2253,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index eecf0b3a43e..299c3268d2d 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2290,10 +2290,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Postavite kategoriju proizvoda samo ako se ovo pravilo odnosi na proizvode "
-"kategorije i podkategorije. Ostavite prazno za sve proizvode."
 
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
@@ -2555,5 +2553,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Predefinirana JM za narudžbenice. Mora biti u istoj kategoriji kao i JM."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Postavite kategoriju proizvoda samo ako se ovo pravilo odnosi na proizvode "
+#~ "kategorije i podkategorije. Ostavite prazno za sve proizvode."
+
 #~ msgid "KGM"
 #~ msgstr "KGM"
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 74f51467aac..5955fc16469 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.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-08-03 08:58+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 22:34+0000\n"
+"Last-Translator: Tamás Dénes <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: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -75,7 +75,7 @@ msgstr ""
 #. module: product
 #: field:product.product,incoming_qty:0
 msgid "Incoming"
-msgstr ""
+msgstr "Bejövő"
 
 #. module: product
 #: field:product.template,mes_type:0
@@ -119,18 +119,18 @@ msgstr ""
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Árlista"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Base Prices"
-msgstr ""
+msgstr "Alapárak"
 
 #. module: product
 #: field:product.pricelist.item,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Szabály neve"
 
 #. module: product
 #: field:product.product,code:0
@@ -153,12 +153,12 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Keyboard"
-msgstr ""
+msgstr "Billentyűzet"
 
 #. module: product
 #: model:ir.model,name:product.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: product
 #: help:product.template,supply_method:0
@@ -170,7 +170,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
-msgstr ""
+msgstr "Átlagár"
 
 #. module: product
 #: help:product.pricelist.item,name:0
@@ -181,7 +181,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Mértékegység kategóriák"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
@@ -196,22 +196,22 @@ msgstr ""
 #. module: product
 #: field:product.price_list,price_list:0
 msgid "PriceList"
-msgstr ""
+msgstr "Árlista"
 
 #. module: product
 #: view:product.template:0
 msgid "UOM"
-msgstr ""
+msgstr "ME"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "PCE"
-msgstr ""
+msgstr "db"
 
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Egyéb"
 
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
@@ -239,7 +239,7 @@ msgstr ""
 #: model:product.pricelist.type,name:product.pricelist_type_sale
 #: field:res.partner,property_product_pricelist:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "Értékesítési árlista"
 
 #. module: product
 #: view:product.template:0
@@ -256,7 +256,7 @@ msgstr ""
 #: code:addons/product/product.py:0
 #, python-format
 msgid "Products: "
-msgstr ""
+msgstr "Termékek: "
 
 #. module: product
 #: field:product.category,parent_id:0
@@ -345,7 +345,7 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,state:0
 msgid "Status"
-msgstr ""
+msgstr "Állapot"
 
 #. module: product
 #: help:product.template,categ_id:0
@@ -366,7 +366,7 @@ msgstr ""
 #: model:product.price.type,name:product.list_price
 #: field:product.product,lst_price:0
 msgid "Public Price"
-msgstr ""
+msgstr "Listaár"
 
 #. module: product
 #: field:product.price_list,qty5:0
@@ -381,7 +381,7 @@ msgstr ""
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr ""
+msgstr "Termékfelelős"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
@@ -403,7 +403,7 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Értékesítési leírás"
 
 #. module: product
 #: view:product.product:0
@@ -419,7 +419,7 @@ msgstr ""
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr ""
+msgstr "Nettó súly (kg)"
 
 #. module: product
 #: help:product.template,state:0
@@ -430,12 +430,12 @@ msgstr ""
 #: field:pricelist.partnerinfo,min_quantity:0
 #: field:product.supplierinfo,qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Mennyiség"
 
 #. module: product
 #: field:product.packaging,height:0
 msgid "Height"
-msgstr ""
+msgstr "Magasság"
 
 #. module: product
 #: help:product.pricelist.version,date_end:0
@@ -445,7 +445,7 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.cat0
 msgid "All products"
-msgstr ""
+msgstr "Minden termék"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -482,7 +482,7 @@ msgstr ""
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Beszerzés, értékesítés"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
@@ -512,7 +512,7 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr ""
+msgstr "Termék ME kategória"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -522,12 +522,12 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Price Computation"
-msgstr ""
+msgstr "Árszámítás"
 
 #. module: product
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "Beszerezhető"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
@@ -556,7 +556,7 @@ msgstr ""
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Virtual Stock"
-msgstr ""
+msgstr "Felhasználható készlet"
 
 #. module: product
 #: selection:product.category,type:0
@@ -577,12 +577,12 @@ msgstr ""
 #: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hiba: Érvénytelen EAN kód"
 
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
 msgid "Min. Quantity"
-msgstr ""
+msgstr "Min. mennyiség"
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -683,7 +683,7 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "New Price ="
-msgstr ""
+msgstr "Új ár ="
 
 #. module: product
 #: help:pricelist.partnerinfo,price:0
@@ -718,7 +718,7 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Min. Margin"
-msgstr "Minimum margó"
+msgstr "Min. árrés"
 
 #. module: product
 #: field:product.category,child_id:0
@@ -739,14 +739,14 @@ msgstr ""
 #: view:product.product:0
 #: field:product.ul,type:0
 msgid "Type"
-msgstr ""
+msgstr "Típus"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_main
 msgid "Pricelists"
-msgstr ""
+msgstr "Árlisták"
 
 #. module: product
 #: field:product.product,partner_ref:0
@@ -774,6 +774,8 @@ msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
 msgstr ""
+"Válasszon ki egy terméket, ha a szabály csak arra vonatkozik. Hagyja üresen "
+"minden termékhez."
 
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
@@ -788,7 +790,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,state:0
 msgid "In Development"
-msgstr ""
+msgstr "Fejlesztés alatt"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -820,14 +822,14 @@ msgstr ""
 #: model:process.node,name:product.process_node_supplier0
 #: view:product.supplierinfo:0
 msgid "Supplier Information"
-msgstr ""
+msgstr "Szállítói információ"
 
 #. module: product
 #: field:product.price.type,currency_id:0
 #: report:product.pricelist:0
 #: field:product.pricelist,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Pénznem"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
@@ -837,7 +839,7 @@ msgstr ""
 #. module: product
 #: view:product.category:0
 msgid "Product Categories"
-msgstr ""
+msgstr "Termékkategóriák"
 
 #. module: product
 #: view:product.uom:0
@@ -885,7 +887,7 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr ""
+msgstr "Információ a termék beszállítójáról."
 
 #. module: product
 #: view:product.product:0
@@ -897,7 +899,7 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Beszerzési leírás"
 
 #. module: product
 #: constraint:product.pricelist.version:0
@@ -925,17 +927,17 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr ""
+msgstr "Készletezhető termék"
 
 #. module: product
 #: field:product.packaging,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kód"
 
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr ""
+msgstr "Sorsz."
 
 #. module: product
 #: view:product.price_list:0
@@ -1029,7 +1031,7 @@ msgstr ""
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr ""
+msgstr "Szállítási egységek"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1042,7 +1044,7 @@ msgstr ""
 #: field:product.uom,name:0
 #: field:product.uom.categ,name:0
 msgid "Name"
-msgstr ""
+msgstr "Név"
 
 #. module: product
 #: view:product.product:0
@@ -1135,7 +1137,7 @@ msgstr ""
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr ""
+msgstr "Eladási egység"
 
 #. module: product
 #: model:ir.module.module,description:product.module_meta_information
@@ -1178,7 +1180,7 @@ msgstr ""
 #: model:product.category,name:product.product_category_services
 #: view:product.product:0
 msgid "Services"
-msgstr ""
+msgstr "Szolgáltatások"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -1192,7 +1194,7 @@ msgstr "Alapárlista"
 #: model:ir.ui.menu,name:product.menu_products
 #: view:product.product:0
 msgid "Products"
-msgstr ""
+msgstr "Termékek"
 
 #. module: product
 #: help:product.packaging,rows:0
@@ -1219,7 +1221,7 @@ msgstr ""
 #. module: product
 #: field:product.template,seller_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Partnerek"
 
 #. module: product
 #: sql_constraint:res.users:0
@@ -1247,7 +1249,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr ""
+msgstr "Második mértékegység"
 
 #. module: product
 #: code:addons/product/product.py:0
@@ -1261,12 +1263,12 @@ msgstr ""
 #: model:ir.ui.menu,name:product.next_id_16
 #: view:product.uom:0
 msgid "Units of Measure"
-msgstr ""
+msgstr "Mértékegységek"
 
 #. module: product
 #: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr ""
+msgstr "Minimum mennyiség"
 
 #. module: product
 #: model:product.category,name:product.product_category_pc
@@ -1283,7 +1285,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Készletre gyártás"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
@@ -1306,12 +1308,12 @@ msgstr ""
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr ""
+msgstr "A mezőhöz használt pénznem"
 
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr ""
+msgstr "Bruttó súly (kg)"
 
 #. module: product
 #: view:product.product:0
@@ -1322,12 +1324,12 @@ msgstr ""
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr ""
+msgstr "Mértékegység kategória"
 
 #. module: product
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "Állvány"
 
 #. module: product
 #: field:product.template,uom_po_id:0
@@ -1401,7 +1403,7 @@ msgstr ""
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Real Stock"
-msgstr ""
+msgstr "Valós készlet"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
@@ -1411,13 +1413,15 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Termék mértékegysége"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Hiba: Az alapértelmezett mennyiségi egységnek és a beszerzési mennyiségi "
+"egységének ugyanabban a kategóriában kell lennie."
 
 #. module: product
 #: constraint:res.users:0
@@ -1427,7 +1431,7 @@ msgstr ""
 #. module: product
 #: field:product.uom,rounding:0
 msgid "Rounding Precision"
-msgstr ""
+msgstr "Kerekítési pontosság"
 
 #. module: product
 #: view:product.uom:0
@@ -1447,7 +1451,7 @@ msgstr ""
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr ""
+msgstr "Mennyiségi egység kategóriák"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
@@ -1481,7 +1485,7 @@ msgstr ""
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "A csomagolási egység EAN kódja."
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1496,7 +1500,7 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
 msgid "Pricelists Types"
-msgstr ""
+msgstr "Árlista típusok"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1509,6 +1513,7 @@ msgstr ""
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
 msgstr ""
+"A készletezési műveletekhez használatos alapértelmezett mennyiségi egység."
 
 #. module: product
 #: model:product.category,name:product.product_category_misc0
@@ -1523,7 +1528,7 @@ msgstr ""
 #. module: product
 #: field:pricelist.partnerinfo,price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Egységár"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action_puchased
@@ -1568,12 +1573,12 @@ msgstr ""
 #. module: product
 #: field:product.packaging,ul_qty:0
 msgid "Package by layer"
-msgstr ""
+msgstr "Csomagok száma rétegenként"
 
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr ""
+msgstr "Szavatosság (hónap)"
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1586,7 +1591,7 @@ msgstr ""
 #: field:product.supplierinfo,product_id:0
 #: model:res.request.link,name:product.req_link_product
 msgid "Product"
-msgstr ""
+msgstr "Termék"
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -1596,7 +1601,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "Rendelésre gyártás"
 
 #. module: product
 #: help:product.packaging,qty:0
@@ -1606,24 +1611,24 @@ msgstr ""
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr ""
+msgstr "Változatok"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_products_category
 msgid "Products by Category"
-msgstr ""
+msgstr "Termékek kategóriánként"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 msgid "Products Categories"
-msgstr ""
+msgstr "Termék kategóriák"
 
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "UOM -> UOS Coeff"
-msgstr ""
+msgstr "ME -> EE átváltás"
 
 #. module: product
 #: help:product.supplierinfo,sequence:0
@@ -1653,7 +1658,7 @@ msgstr "Kerekítési metódus"
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr ""
+msgstr "Termék címkék"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
@@ -1673,7 +1678,7 @@ msgstr "Csomag magassága"
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr ""
+msgstr "Termék árlisták"
 
 #. module: product
 #: field:product.pricelist,company_id:0
@@ -1687,20 +1692,20 @@ msgstr ""
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 msgid "Prices Types"
-msgstr ""
+msgstr "Ártípusok"
 
 #. module: product
 #: help:product.template,list_price:0
 msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
-msgstr ""
+msgstr "Az eladási ár alapjául szolgál. Szokás katalógusárnak is nevezni."
 
 #. module: product
 #: code:addons/product/pricelist.py:0
 #, python-format
 msgid "Partner section of the product form"
-msgstr ""
+msgstr "A termék űrlap Partner adatai"
 
 #. module: product
 #: help:product.price.type,name:0
@@ -1732,7 +1737,7 @@ msgstr ""
 #. module: product
 #: field:product.packaging,length:0
 msgid "Length"
-msgstr ""
+msgstr "Hossz"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
@@ -1749,7 +1754,7 @@ msgstr ""
 #: field:product.pricelist,type:0
 #: view:product.pricelist.type:0
 msgid "Pricelist Type"
-msgstr ""
+msgstr "Árlista típus"
 
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
@@ -1769,12 +1774,12 @@ msgstr ""
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Gyártási átfutási idő"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
 msgid "Supplier Pricelist"
-msgstr ""
+msgstr "Beszállítói árlista"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -1797,14 +1802,14 @@ msgstr ""
 #. module: product
 #: field:product.pricelist,name:0
 msgid "Pricelist Name"
-msgstr ""
+msgstr "Árlista név"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
 #: view:product.pricelist:0
 #: view:product.pricelist.version:0
 msgid "Pricelist Version"
-msgstr ""
+msgstr "Árlista változat"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1835,7 +1840,7 @@ msgstr ""
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Termék kategória"
 
 #. module: product
 #: report:product.pricelist:0
@@ -1862,7 +1867,7 @@ msgstr ""
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
-msgstr ""
+msgstr "Doboz"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_ul_form_action
@@ -1911,7 +1916,7 @@ msgstr ""
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
 msgid "Weight"
-msgstr ""
+msgstr "Súly"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
@@ -1921,7 +1926,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Mouse"
-msgstr ""
+msgstr "Egér"
 
 #. module: product
 #: field:product.uom,uom_type:0
@@ -1944,12 +1949,12 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Descriptions"
-msgstr ""
+msgstr "Leírások"
 
 #. module: product
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr ""
+msgstr "Sor"
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
@@ -1965,7 +1970,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Weigths"
-msgstr ""
+msgstr "Súlyok"
 
 #. module: product
 #: constraint:res.partner:0
@@ -1997,7 +2002,7 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.item,price_round:0
 msgid "Price Rounding"
-msgstr ""
+msgstr "Árkerekítés"
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
@@ -2025,7 +2030,7 @@ msgstr ""
 #: model:product.price.type,name:product.standard_price
 #: field:product.template,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Önköltségi ár"
 
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
@@ -2035,7 +2040,7 @@ msgstr ""
 #. module: product
 #: field:product.template,weight:0
 msgid "Gross weight"
-msgstr ""
+msgstr "Bruttó súly"
 
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
@@ -2068,7 +2073,7 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
 msgid "Pricelist item"
-msgstr ""
+msgstr "Árlista tétel"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
@@ -2112,7 +2117,7 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description:0
 msgid "Description"
-msgstr ""
+msgstr "Leírás"
 
 #. module: product
 #: code:addons/product/pricelist.py:0
@@ -2125,7 +2130,7 @@ msgstr ""
 #. module: product
 #: view:product.template:0
 msgid "Product Description"
-msgstr ""
+msgstr "Termékleírás"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -2142,12 +2147,12 @@ msgstr ""
 #. module: product
 #: field:product.template,volume:0
 msgid "Volume"
-msgstr ""
+msgstr "Térfogat"
 
 #. module: product
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "Rekesz"
 
 #. module: product
 #: view:product.product:0
@@ -2171,7 +2176,7 @@ msgstr ""
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr ""
+msgstr "Terméksablon"
 
 #. module: product
 #: field:product.template,cost_method:0
@@ -2201,7 +2206,7 @@ msgstr ""
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action
 #: field:product.pricelist,version_id:0
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Árlista változatok"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -2255,7 +2260,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Childs Categories"
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 872bd213770..2bcbf54c5de 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,5 +2252,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 3dc33158d9c..06d1d37ecae 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2389,11 +2389,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Selezionare una categoria di prodotti se questa regola va applicata ai "
-"prodotti di una categoria e le sue sottocategorie. Lasciare vuoto per tutti "
-"i prodotti."
 
 #~ msgid ""
 #~ "This is the average time between the confirmation of the customer order and "
@@ -2527,6 +2524,14 @@ msgstr ""
 #~ "Il costo del prodotto per la valorizzazione contabile del magazzino. Può "
 #~ "essere utilizzato come prezzo base per il prezzo del fornitore."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Selezionare una categoria di prodotti se questa regola va applicata ai "
+#~ "prodotti di una categoria e le sue sottocategorie. Lasciare vuoto per tutti "
+#~ "i prodotti."
+
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index 43d428c1a4e..de0a400dc30 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2257,10 +2257,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"이 규칙이 어느 한 카테고리와 그 차일드 카테고리들의 상품에만 적용될 경우, 상품 카테고리를 설정합니다. 모든 상품의 경우는 비워 "
-"두십시오."
 
 #~ msgid ""
 #~ "The minimal quantity to purchase for this supplier, expressed in the default "
@@ -2524,6 +2522,13 @@ msgstr ""
 #~ "이 상품의 평균 생산 시간. 생산 주만에만 해당되거나, 다중 레벨 BoM의 경우, 이 상품의 레벨에만 적용됩니다. 상이한 지연들이 모든 "
 #~ "레벨과 구매 주문을 위해 합계됩니다."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "이 규칙이 어느 한 카테고리와 그 차일드 카테고리들의 상품에만 적용될 경우, 상품 카테고리를 설정합니다. 모든 상품의 경우는 비워 "
+#~ "두십시오."
+
 #~ msgid ""
 #~ "Delay in days between the confirmation of the purchase order and the "
 #~ "reception of the products in your warehouse. Used by the scheduler for "
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 711b517fe39..a34a7072b1d 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
@@ -2280,10 +2280,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Pasirinkti produkto kategoriją, jeigu taisyklė susijusi su šia kategorija. "
-"Palikti tuščią, jeigu taisyklė naudojama visiems produktams."
 
 #~ msgid "Procure Method"
 #~ msgstr "Gavimo būdas"
@@ -2593,6 +2591,13 @@ msgstr ""
 #~ "Šis mato vnt. pagal nutylėjimą bus parenkamas visiems pirkimo užsakymams. "
 #~ "Jis turi priklausyti tai pačiai kategorijai kaip ir numatytasis mato vnt."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Pasirinkti produkto kategoriją, jeigu taisyklė susijusi su šia kategorija. "
+#~ "Palikti tuščią, jeigu taisyklė naudojama visiems produktams."
+
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index 7c027cf0886..6d370a9b27f 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-27 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2253,5 +2253,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 99052335a8b..dc48b272e71 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2350,10 +2350,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Уг дүрэм нь сонгосон ангилалын бараануудад үйлчилнэ. Хоосон орхивол бүх "
-"бараанд үйлчилнэ."
 
 #~ msgid "Customer Price"
 #~ msgstr "Зарах үнэ"
@@ -2652,6 +2650,13 @@ msgstr ""
 #~ "Сонгосон хүснэгтэд идэвхитэй үнийн хувилбар алга !\n"
 #~ "' \\n                                'Идэвхитэй хувилбар үүсгэн үү!"
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Уг дүрэм нь сонгосон ангилалын бараануудад үйлчилнэ. Хоосон орхивол бүх "
+#~ "бараанд үйлчилнэ."
+
 #~ msgid "Only one value can be defined for each given usage!"
 #~ msgstr "Бүх хэрэглээнд зөвхөн нэг утга хэрэглэгдэнэ!"
 
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 30955f48632..a1d104bad56 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2255,7 +2255,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index fc0696c580c..939a5d49c9f 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2294,11 +2294,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Selecteer een productcategorie als deze regel alleen betrekking heeft op "
-"producten van één categorie en diens subcategorieën. Laat deze leeg voor "
-"alle producten."
 
 #~ msgid "Childs Categories"
 #~ msgstr "Kind Categorieën"
@@ -2682,5 +2679,13 @@ msgstr ""
 #~ "alleen voor het niveau van dit product. Verschillende vertragingen zullen "
 #~ "worden gesommeerd voor alle niveau's en bestelopdrachten."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Selecteer een productcategorie als deze regel alleen betrekking heeft op "
+#~ "producten van één categorie en diens subcategorieën. Laat deze leeg voor "
+#~ "alle producten."
+
 #~ msgid "KGM"
 #~ msgstr "kg"
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index e39ba0b6fb2..bd1cfc0bc9f 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2253,7 +2253,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index f4fd3c04ac0..09e4062de69 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-12-27 15:15+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 08:26+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-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -558,7 +558,7 @@ msgid ""
 "in the product form."
 msgstr ""
 "Jeden lub kilku dostawców może być związane z produktem. Informacje o tym są "
-"formularzu produktu."
+"w formularzu produktu."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -2306,11 +2306,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Ustaw kategorię produktu, jeśli ta reguła ma dotyczyć produktów tej "
-"kategorii lub kategorii podrzędnych. Zostaw puste, jeśli ma dotyczyć "
-"wszystkich produktów."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
@@ -2540,6 +2537,14 @@ msgstr ""
 #~ msgid "You can not have 2 pricelist version that overlaps!"
 #~ msgstr "Nie możesz mieć dwóch cenników nachodzących na siebie !"
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Ustaw kategorię produktu, jeśli ta reguła ma dotyczyć produktów tej "
+#~ "kategorii lub kategorii podrzędnych. Zostaw puste, jeśli ma dotyczyć "
+#~ "wszystkich produktów."
+
 #~ msgid ""
 #~ "Futur stock for this product according to the selected location or all "
 #~ "internal if none have been selected. Computed as: Real Stock - Outgoing + "
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 4d36296ab2c..d74f410573b 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:12+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -96,7 +96,9 @@ msgid "Fixed"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:186
+#: code:addons/product/pricelist.py:339
+#: code:addons/product/pricelist.py:357
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -236,7 +238,7 @@ msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:378
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -370,6 +372,11 @@ msgstr ""
 msgid "Medium PC"
 msgstr ""
 
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action_puchased
+msgid "Products can be purchased and/or sold. They 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."
+msgstr ""
+
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
@@ -464,6 +471,11 @@ msgstr ""
 msgid "Working Time"
 msgstr ""
 
+#. module: product
+#: model:ir.actions.act_window,help:product.product_pricelist_action2
+msgid "A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80."
+msgstr ""
+
 #. module: product
 #: help:product.product,active:0
 msgid "If the active field is set to False, it will allow you to hide the product without removing it."
@@ -475,7 +487,7 @@ msgid "Metal Cleats"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:340
 #, python-format
 msgid "No active version for the selected pricelist !\n"
 "Please create or activate one."
@@ -632,11 +644,6 @@ msgstr ""
 msgid "To Purchase"
 msgstr ""
 
-#. module: product
-#: model:product.template,name:product.product_product_mb1_product_template
-msgid "Mainboard ASUStek A7N8X"
-msgstr ""
-
 #. module: product
 #: help:product.supplierinfo,min_qty:0
 msgid "The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."
@@ -730,6 +737,12 @@ msgstr ""
 msgid "Set a product if this rule only apply to one product. Keep empty for all products"
 msgstr ""
 
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement & Locations"
+msgstr ""
+
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
@@ -800,9 +813,8 @@ msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
 msgstr ""
 
 #. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Procurement & Locations"
+#: model:ir.actions.act_window,help:product.product_uom_form_action
+msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category."
 msgstr ""
 
 #. module: product
@@ -863,8 +875,8 @@ msgid "Lead time in days between the confirmation of the purchase order and the
 msgstr ""
 
 #. module: product
-#: model:ir.actions.act_window,help:product.product_pricelist_action2
-msgid "A pricelist contains rules to be evaluated in order to compute the purchase or sale price for all the partners assigned to a pricelist. Pricelists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of this category of product will be based on the supplier price multiplied by 1.80."
+#: model:ir.actions.act_window,help:product.product_pricelist_action
+msgid "There can be more than one version of a pricelist. Here you can create and manage new versions of a price list. Some examples of versions: 2010, 2011, Summer Promotion, etc."
 msgstr ""
 
 #. module: product
@@ -897,16 +909,6 @@ msgstr ""
 msgid "Partner Information"
 msgstr ""
 
-#. module: product
-#: model:ir.actions.act_window,help:product.product_normal_action
-msgid "You must define a Product for everything you buy or sell. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information of your products related to procurement logistics, sales price, product category, suppliers and so on."
-msgstr ""
-
-#. module: product
-#: model:ir.model,name:product.model_res_users
-msgid "res.users"
-msgstr ""
-
 #. module: product
 #: selection:product.ul,type:0
 #: model:product.uom.categ,name:product.product_uom_categ_unit
@@ -934,6 +936,11 @@ msgstr ""
 msgid "Price List Items"
 msgstr ""
 
+#. module: product
+#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
+msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days."
+msgstr ""
+
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
@@ -960,8 +967,8 @@ msgid "Price Surcharge"
 msgstr ""
 
 #. module: product
-#: model:ir.actions.act_window,help:product.product_uom_form_action
-msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate to be used between the several Unit of Measure within the same category."
+#: model:product.template,name:product.product_product_mb1_product_template
+msgid "Mainboard ASUStek A7N8X"
 msgstr ""
 
 #. module: product
@@ -975,6 +982,7 @@ msgstr ""
 #: field:product.pricelist.type,name:0
 #: field:product.pricelist.version,name:0
 #: view:product.product:0
+#: field:product.product,name_template:0
 #: field:product.template,name:0
 #: field:product.ul,name:0
 #: field:product.uom,name:0
@@ -992,6 +1000,11 @@ msgstr ""
 msgid "Wood Lintel 4m"
 msgstr ""
 
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action
+msgid "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."
+msgstr ""
+
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
@@ -1137,7 +1150,7 @@ msgid "Pallet Dimension"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:603
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -1147,21 +1160,11 @@ msgstr ""
 msgid "Partners"
 msgstr ""
 
-#. module: product
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr ""
-
 #. module: product
 #: help:product.template,sale_delay:0
 msgid "This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."
 msgstr ""
 
-#. module: product
-#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
-msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measures are in the same category, they can be converted within each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days."
-msgstr ""
-
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
@@ -1169,7 +1172,7 @@ msgid "Second UoM"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:142
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -1249,13 +1252,13 @@ msgid "Purchase Unit of Measure"
 msgstr ""
 
 #. module: product
-#: model:ir.actions.act_window,help:product.product_category_action
-msgid "Here is a list of all your products classified by category. You can click on a category to get the list of all products linked to this category or to a child of this category."
+#: field:product.template,supply_method:0
+msgid "Supply method"
 msgstr ""
 
 #. module: product
-#: field:product.template,supply_method:0
-msgid "Supply method"
+#: model:ir.actions.act_window,help:product.product_category_action
+msgid "Here is a list of all your products classified by category. You can click a category to get the list of all products linked to this category or to a child of this category."
 msgstr ""
 
 #. module: product
@@ -1269,7 +1272,7 @@ msgid "Regular processor config"
 msgstr ""
 
 #. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:142
 #, python-format
 msgid "Conversion from Product UoM m to Default UoM PCE is not possible as they both belong to different Category!."
 msgstr ""
@@ -1319,11 +1322,6 @@ msgstr ""
 msgid "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
 
-#. module: product
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
-
 #. module: product
 #: field:product.uom,rounding:0
 msgid "Rounding Precision"
@@ -1395,6 +1393,7 @@ msgstr ""
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_type_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action2
 msgid "Pricelists Types"
 msgstr ""
 
@@ -1424,11 +1423,6 @@ msgstr ""
 msgid "Unit Price"
 msgstr ""
 
-#. module: product
-#: model:ir.actions.act_window,help:product.product_normal_action_puchased
-msgid "Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information on your  products related to procurement logistics, sales price, product category, suppliers and so on."
-msgstr ""
-
 #. module: product
 #: model:product.category,name:product.product_category_7
 #: model:product.template,name:product.product_product_1_product_template
@@ -1470,6 +1464,11 @@ msgstr ""
 msgid "Warranty (months)"
 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 children. Keep empty for all products"
+msgstr ""
+
 #. module: product
 #: model:ir.model,name:product.model_product_product
 #: model:ir.ui.menu,name:product.prod_config_main
@@ -1590,7 +1589,7 @@ msgid "Base price for computing the customer price. Sometimes called the catalog
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:515
 #, python-format
 msgid "Partner section of the product form"
 msgstr ""
@@ -1988,7 +1987,7 @@ msgid "Description"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:358
 #, python-format
 msgid "Could not resolve product category, you have defined cyclic categories of products!"
 msgstr ""
@@ -2029,7 +2028,7 @@ msgid "Shelves"
 msgstr ""
 
 #. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:514
 #, python-format
 msgid "Other Pricelist"
 msgstr ""
@@ -2099,23 +2098,13 @@ msgid "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
 
-#. module: product
-#: field:product.pricelist.item,price_discount:0
-msgid "Price Discount"
-msgstr ""
-
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
 msgstr ""
 
 #. module: product
-#: model:ir.actions.act_window,help:product.product_pricelist_action
-msgid "There can be more than one version of a pricelist. If you need to create new versions of a pricelist, you can do it and manage them from here. Some examples of versions: 2010, 2011, Promotion of February 2010, etc."
-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 children. Keep empty for all products"
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
 msgstr ""
 
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index d9072297b98..b517f9f24d5 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2289,10 +2289,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Defina uma categoria de produto se esta regra aplica-se apenas para produtos "
-"de uma categoria e seus dependentes. Manter vazio para todos os produtos."
 
 #~ msgid "Palet"
 #~ msgstr "Palete"
@@ -2642,3 +2640,10 @@ msgstr ""
 #~ msgstr ""
 #~ "Unidade de Medida Padrão utilizada para ordens de compra. Deve estar na "
 #~ "mesma categoria que a unidade de medida padrão."
+
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Defina uma categoria de produto se esta regra aplica-se apenas para produtos "
+#~ "de uma categoria e seus dependentes. Manter vazio para todos os produtos."
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 2127f71ac75..7bdcf020a2f 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 01:58+0000\n"
+"PO-Revision-Date: 2010-12-31 08:37+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -493,7 +493,7 @@ msgstr "Quantidade-4"
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Vendas & Compras"
+msgstr "Compras e Vendas"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
@@ -2289,10 +2289,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Defina uma categoria de produto, se esta regra apenas se aplica aos produtos "
-"de uma categoria e seus filhos. Mantenha em branco para todos os produtos"
 
 #~ msgid ""
 #~ "This is the average time between the confirmation of the customer order and "
@@ -2529,6 +2527,13 @@ msgstr ""
 #~ "Unidade padrão de medida utilizada para a compras. É preciso ser da mesma "
 #~ "categoria que o padrão da unidade de medida."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Defina uma categoria de produto, se esta regra apenas se aplica aos produtos "
+#~ "de uma categoria e seus filhos. Mantenha em branco para todos os produtos"
+
 #~ msgid ""
 #~ "The coefficient for the formula:\n"
 #~ "1 (base unit) = coef (this unit)"
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index edfcee0fbf9..fe602177b62 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2254,7 +2254,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Packagings"
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 28dd270d5aa..5ac8092eb1c 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2323,7 +2323,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "You can not have 2 pricelist version that overlaps!"
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 1fa79126cb2..ec94060875f 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2291,7 +2291,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index a86d0dd278c..c748d7728a8 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2262,7 +2262,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index 42ab243f3e9..54888661698 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:28+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2253,5 +2253,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 758a08aac99..923a704da59 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2337,10 +2337,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
-"kategorije i pod kategorije. Ostavite prazno za sve proizvode"
 
 #~ msgid ""
 #~ "The cost of the product for accounting stock valuation. It can serves as a "
@@ -2576,6 +2574,13 @@ msgstr ""
 #~ "Podrazumevana jedinica mere koja se koristi za narudžbenice. Mora da bude u "
 #~ "istoj kategoriji kao i podrazumnevana jedinica mere."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
+#~ "kategorije i pod kategorije. Ostavite prazno za sve proizvode"
+
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index a795a86ac1b..44c8abb2bdb 100644
--- a/addons/product/i18n/sr@latin.po
+++ b/addons/product/i18n/sr@latin.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2337,7 +2337,12 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
-"kategorije i pod kategorije. Ostavite prazno za sve proizvode"
+
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
+#~ "kategorije i pod kategorije. Ostavite prazno za sve proizvode"
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index be55d54fed1..c5f96b41622 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\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 14:16+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-29 22:04+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <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:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2328,10 +2328,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Bestäm en produktkategori om denna regel endast tillämpas på produkter i en "
-"kategori och barnprodukter. Håll tomt för alla produkter"
 
 #~ msgid "Rentable product"
 #~ msgstr "Hyrbar produkt"
@@ -2571,6 +2569,13 @@ msgstr ""
 #~ "Standardmåttenhet som används för inköpsorder. Den måste finnas i samma "
 #~ "kategori som standardmåttenheten."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Bestäm en produktkategori om denna regel endast tillämpas på produkter i en "
+#~ "kategori och barnprodukter. Håll tomt för alla produkter"
+
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index ee424ec4d05..2b55bb9f2ae 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,5 +2252,5 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 530f34daf2a..60a7f9876f1 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,7 +2252,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "List Price"
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index 0349f1f0d36..1621ea61b8e 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2257,7 +2257,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid ""
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 3320f79ee2e..920ca2041e7 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2290,10 +2290,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
-"Thiết lập một chủng loại sản phẩm nếu quy tắc này chỉ áp dụng cho các sản "
-"phẩm của một chủng loại. Để trống cho tất cả sản phẩm."
 
 #~ msgid "Customer Price"
 #~ msgstr "Giá bán"
@@ -2637,6 +2635,13 @@ msgstr ""
 #~ "category than the default unit of measure."
 #~ msgstr "Đơn vị đo mặc định dùng trong các đơn đặt hàng."
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr ""
+#~ "Thiết lập một chủng loại sản phẩm nếu quy tắc này chỉ áp dụng cho các sản "
+#~ "phẩm của một chủng loại. Để trống cho tất cả sản phẩm."
+
 #~ msgid "KGM"
 #~ msgstr "KGM"
 
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 45bb5ce77a8..142fd87f1f6 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-16 17:53+0000\n"
+"PO-Revision-Date: 2010-12-31 10:15+0000\n"
 "Last-Translator: Wei \"oldrev\" Li <oldrev@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:30+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -248,7 +248,7 @@ msgstr "产品类型"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  例: 1*(目标单位) = ratio * (参照单位)"
 
 #. module: product
 #: code:addons/product/product.py:0
@@ -966,7 +966,7 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1177,7 +1177,7 @@ msgstr ""
 #. module: product
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
-msgstr ""
+msgstr "最优先的主供应商"
 
 #. module: product
 #: model:product.category,name:product.product_category_services
@@ -1337,7 +1337,7 @@ msgstr "货架"
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "采购计量单位"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_category_action
@@ -2262,8 +2262,8 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
-msgstr "如果这规则只适合这产品类型和它的子项,设置产品类型. ( 留空为适合全部)"
+"and his children. Keep empty for all products"
+msgstr ""
 
 #~ msgid "Childs Categories"
 #~ msgstr "子项分类"
@@ -2572,6 +2572,11 @@ msgstr "如果这规则只适合这产品类型和它的子项,设置产品类
 #~ "基础单位 = 这单位 * 比率\n"
 #~ "1 / 系数"
 
+#~ msgid ""
+#~ "Set a category of product if this rule only apply to products of a category "
+#~ "and his childs. Keep empty for all products"
+#~ msgstr "如果这规则只适合这产品类型和它的子项,设置产品类型. ( 留空为适合全部)"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "在动作定义中使用了无效的模快名。"
 
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index 167d0f1b72b..79231bd76c0 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -2252,7 +2252,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #~ msgid "Customer Price"
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index ad11edff47c..cd8c338da89 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -23,8 +23,6 @@ from osv import fields, osv
 
 from _common import rounding
 import time
-from tools import config
-from tools.misc import ustr
 from tools.translate import _
 import decimal_precision as dp
 
@@ -223,7 +221,7 @@ class product_pricelist(osv.osv):
                         'AND (min_quantity IS NULL OR min_quantity <= %s) '
                         'AND i.price_version_id = v.id AND v.pricelist_id = pl.id '
                     'ORDER BY sequence',
-                    (tmpl_id, product_id, pricelist_id, qty))
+                    (tmpl_id, product_id, plversion_ids[0], qty))
                 res1 = cr.dictfetchall()
                 uom_price_already_computed = False
                 for res in res1:
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 83b6b5beec6..c6c248be3ce 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -208,5 +208,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
+
+        <menuitem
+            action="product_pricelist_type_action" id="menu_product_pricelist_type_action2"
+            parent="product.menu_product_pricelist_main" sequence="2"
+            groups="base.group_extended"/>
+
     </data>
 </openerp>
diff --git a/addons/product/product.py b/addons/product/product.py
index c55105a1b16..eabd9494908 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -53,7 +53,7 @@ def check_ean(eancode):
             evensum += int(finalean[i])
     total=(oddsum * 3) + evensum
 
-    check = int(10 - math.ceil(total % 10.0))
+    check = int(10 - math.ceil(total % 10.0)) %10
 
     if check != int(eancode[-1]):
         return False
@@ -524,9 +524,9 @@ class product_product(osv.osv):
             if sellers:
                 for s in sellers:
                     mydict = {
-                              'id': product.id, 
-                              'name': s.product_name or product.name, 
-                              'default_code': s.product_code or product.default_code, 
+                              'id': product.id,
+                              'name': s.product_name or product.name,
+                              'default_code': s.product_code or product.default_code,
                               'variants': product.variants
                               }
                     result.append(_name_get(mydict))
@@ -724,7 +724,8 @@ class product_supplierinfo(osv.osv):
         'qty': lambda *a: 0.0,
         'sequence': lambda *a: 1,
         'delay': lambda *a: 1,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c)
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c),
+        'product_uom': _get_uom_id,
     }
     def _check_uom(self, cr, uid, ids, context=None):
         for supplier_info in self.browse(cr, uid, ids, context=context):
@@ -788,21 +789,3 @@ class pricelist_partnerinfo(osv.osv):
     _order = 'min_quantity asc'
 pricelist_partnerinfo()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-class res_users(osv.osv):
-    _inherit = 'res.users'
-    def _get_group(self, cr, uid, context=None):
-        result = super(res_users, self)._get_group(cr, uid, context=context)
-        dataobj = self.pool.get('ir.model.data')
-        try:
-            dummy,group_id = dataobj.get_object_reference(cr, 1, 'product', 'group_product_manager')
-            result.append(group_id)
-        except ValueError:
-            # If these groups does not exists anymore
-            pass
-        return result
-
-    _defaults = {
-        'groups_id': _get_group,
-    }
-res_users()
diff --git a/addons/product/test/product_report.yml b/addons/product/test/product_report.yml
index de86f392e5b..397c2c9d0b6 100644
--- a/addons/product/test/product_report.yml
+++ b/addons/product/test/product_report.yml
@@ -1,17 +1,16 @@
 -
-  In order to test the PDF reports defined on Products, we will print a Products Pricelists Report
-- 
+ Print the Products Pricelists Report through the wizard
+-
   !python {model: product.product}: |
-    import netsvc, tools, os
-    data_dict = {'model': 'product.product'}
-    data_dict['form'] = {
-        'qty1': 1,
+    ctx={}
+    ctx.update({'model': 'product.product','active_ids': [ref('product.product_product_pc1'), ref('product.product_product_pc3')]})
+    data_dict = {'qty1': 1,
         'qty2': 5,
         'qty3': 10,
         'qty4': 0,
         'qty5': 0,
-        'price_list':ref('product.list0')
-    }
-    (data, format) = netsvc.LocalService('report.product.pricelist').create(cr, uid, [ref('product.product_product_pc1'), ref('product.product_product_pc3')], data_dict, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'product-product_pricelist'+format), 'wb+').write(data)
+        'price_list':ref('product.list0')}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_product_price_list',wiz_data=data_dict, context=ctx, our_module='product')
+
+
diff --git a/addons/product_expiry/i18n/de.po b/addons/product_expiry/i18n/de.po
index c7d8a7e69f5..9ad0522cd8f 100644
--- a/addons/product_expiry/i18n/de.po
+++ b/addons/product_expiry/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 09:34+0000\n"
+"PO-Revision-Date: 2010-12-29 10:20+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
@@ -48,6 +48,8 @@ msgstr "Verfalldauer"
 msgid ""
 "The date on which the lot starts deteriorating without becoming dangerous."
 msgstr ""
+"Der Tag ab dem sich die Qualität verschlechtert, ohne dass die Produkte "
+"bereits unbrauchbar sind."
 
 #. module: product_expiry
 #: field:product.product,use_time:0
@@ -59,11 +61,12 @@ msgstr "Mindesthaltbarkeit"
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
+"Die Kombination von Serinenummer und interner Referenz muss eindeutig sein."
 
 #. module: product_expiry
 #: help:stock.production.lot,removal_date:0
 msgid "The date on which the lot should be removed."
-msgstr ""
+msgstr "Datum ab dem das Fertigungslos nicht mehr verwendet werden sollte."
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -75,7 +78,7 @@ msgstr "Produkt"
 msgid ""
 "The number of days after which an alert should be notified about the "
 "production lot."
-msgstr ""
+msgstr "Anzahl der Tage nachdem ein Alarm ausgegeben werden soll."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -92,6 +95,8 @@ msgstr "Datum der Vernichtung"
 msgid ""
 "The date on which the lot may become dangerous and should not be consumed."
 msgstr ""
+"Datum nachdem die Losnummer verschieden und nicht mehr benutzt werden "
+"sollten."
 
 #. module: product_expiry
 #: model:ir.module.module,description:product_expiry.module_meta_information
@@ -181,6 +186,8 @@ msgstr ""
 msgid ""
 "The date on which an alert should be notified about the production lot."
 msgstr ""
+"Das Datum, an dem eine Benachrichtung für den Fertgungsauftrag generiert "
+"werden kann"
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index aa629f6deba..7aab02c055d 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:12+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/product_manufacturer/i18n/de.po b/addons/product_manufacturer/i18n/de.po
index 233d97fc2f1..fd5d013717a 100644
--- a/addons/product_manufacturer/i18n/de.po
+++ b/addons/product_manufacturer/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-30 12:34+0000\n"
+"PO-Revision-Date: 2010-12-28 23:26+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -63,7 +63,7 @@ msgstr "Wert"
 #. module: product_manufacturer
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
index 2901a68eabc..4cf4ac5baa3 100644
--- a/addons/product_manufacturer/i18n/fr.po
+++ b/addons/product_manufacturer/i18n/fr.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:44+0000\n"
-"PO-Revision-Date: 2010-12-17 02:28+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-29 07:38+0000\n"
+"Last-Translator: Aline (OpenERP) <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
 #: model:ir.module.module,description:product_manufacturer.module_meta_information
 msgid "A module that add manufacturers and attributes on the product form"
 msgstr ""
+"Un module qui ajoute des fabricants et des attributs sur la fiche Produit"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/fr_BE.po b/addons/product_manufacturer/i18n/fr_BE.po
deleted file mode 100644
index bcf9aabbe06..00000000000
--- a/addons/product_manufacturer/i18n/fr_BE.po
+++ /dev/null
@@ -1,91 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* product_manufacturer
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-08-13 06:18:00+0000\n"
-"PO-Revision-Date: 2010-08-13 06:18:00+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: product_manufacturer
-#: model:ir.module.module,description:product_manufacturer.module_meta_information
-msgid "A module that add manufacturers and attributes on the product form"
-msgstr ""
-
-#. module: product_manufacturer
-#: field:product.product,manufacturer_pref:0
-msgid "Manufacturer Product Code"
-msgstr ""
-
-#. module: product_manufacturer
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.manufacturer.attribute:0
-msgid "Product Template Name"
-msgstr ""
-
-#. module: product_manufacturer
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
-msgid "Product attributes"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.manufacturer.attribute:0
-#: view:product.product:0
-msgid "Product Attributes"
-msgstr ""
-
-#. module: product_manufacturer
-#: field:product.manufacturer.attribute,name:0
-msgid "Attribute"
-msgstr ""
-
-#. module: product_manufacturer
-#: model:ir.model,name:product_manufacturer.model_product_product
-#: field:product.manufacturer.attribute,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: product_manufacturer
-#: field:product.manufacturer.attribute,value:0
-msgid "Value"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.product:0
-#: field:product.product,attribute_ids:0
-msgid "Attributes"
-msgstr ""
-
-#. module: product_manufacturer
-#: model:ir.module.module,shortdesc:product_manufacturer.module_meta_information
-msgid "Products Attributes & Manufacturers"
-msgstr ""
-
-#. module: product_manufacturer
-#: field:product.product,manufacturer_pname:0
-msgid "Manufacturer Product Name"
-msgstr ""
-
-#. module: product_manufacturer
-#: view:product.product:0
-#: field:product.product,manufacturer:0
-msgid "Manufacturer"
-msgstr ""
-
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
index c2a8ffae19c..d187880675e 100644
--- a/addons/product_manufacturer/i18n/product_manufacturer.pot
+++ b/addons/product_manufacturer/i18n/product_manufacturer.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:53+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:13+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/product_manufacturer/security/ir.model.access.csv b/addons/product_manufacturer/security/ir.model.access.csv
index c12946db678..b06d5d3ea96 100644
--- a/addons/product_manufacturer/security/ir.model.access.csv
+++ b/addons/product_manufacturer/security/ir.model.access.csv
@@ -1,6 +1,2 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,0,0,0
-"access_product_manufacturer_attribute 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
+"access_product_manufacturer_attribute","product.manufacturer.attribute","model_product_manufacturer_attribute",base.group_user,1,1,1,1
diff --git a/addons/product_margin/i18n/de.po b/addons/product_margin/i18n/de.po
index 976c9009814..3163953fba3 100644
--- a/addons/product_margin/i18n/de.po
+++ b/addons/product_margin/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 09:32+0000\n"
+"PO-Revision-Date: 2010-12-29 11:55+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
@@ -105,6 +105,14 @@ msgid ""
 "and other interesting indicators based on invoices. The wizard to launch\n"
 "the report has several options to help you get the data you need.\n"
 msgstr ""
+"\n"
+"Ergänzt ein Auswertungsmenü zu Produkten für eine Berechnung der "
+"Umsatzerlöse, des\n"
+"Einkaufsumsatz, der Verkaufsspannen oder anderer betrieblicher Indikatoren "
+"auf Basis der \n"
+"Abrechnung. Der Assistent erstellt dabei eine Auswertung mit zahlreichen "
+"Optionen zur \n"
+"Kalkulation der erforderlichen Daten.\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -255,7 +263,7 @@ msgstr "Allgemeine Information"
 #. module: product_margin
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: product_margin
 #: field:product.product,purchase_gap:0
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index 74c15809aa3..d3c493f7f01 100644
--- a/addons/product_margin/i18n/es.po
+++ b/addons/product_margin/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 12:10+0000\n"
+"PO-Revision-Date: 2010-12-28 08:51+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index 237b0d0b0e4..d42dd84770f 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:53+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:13+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -234,7 +234,7 @@ msgid "Sales"
 msgstr ""
 
 #. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:0
+#: code:addons/product_margin/wizard/product_margin.py:73
 #: model:ir.actions.act_window,name:product_margin.product_margin_act_window
 #: model:ir.ui.menu,name:product_margin.menu_action_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 00ec98ab1e0..a6d6eff5238 100644
--- a/addons/product_margin/product_margin_view.xml
+++ b/addons/product_margin/product_margin_view.xml
@@ -84,7 +84,7 @@
             </field>
         </record>
 
-  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product" groups="base.group_sale_salesman,base.group_sale_manager,purchase.group_purchase_manager,stock.group_stock_manager,mrp.group_mrp_manager"/>
+  <menuitem icon="STOCK_JUSTIFY_FILL" action="product_margin_act_window" id="menu_action_product_margin" name="Product Margins" sequence="5" parent="base.menu_product"/>
 
 </data>
 </openerp>
diff --git a/addons/product_visible_discount/i18n/de.po b/addons/product_visible_discount/i18n/de.po
index 428087e215c..3356bd97fc5 100644
--- a/addons/product_visible_discount/i18n/de.po
+++ b/addons/product_visible_discount/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 09:32+0000\n"
+"PO-Revision-Date: 2010-12-31 10:56+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -47,6 +47,21 @@ msgid ""
 "Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
 "    "
 msgstr ""
+"\n"
+"    Mit Hilfe dieser Anwendung können Sie für Positionen in "
+"Verkaufsaufträgen und Ausgangsrechnungen auf Basis der Partner Preisliste "
+"den entsprechenden Rabatt kalkulieren und ausweisen.\n"
+"    Zu diesem Zweck wurde eine neue Checkbox \"Anzeige Rabatt\" zum Formular "
+"der Preislisten ergänzt.\n"
+"    Beispiel:\n"
+"        Für das Produkt PC1 und den Partner \"Asustek\": Ausgehend von einem "
+"Listenpreis = 450 und einem Preis gemäß Asustek Preisliste = 225.\n"
+"        Wenn die Checkbox in der Preisliste aktiviert wurde, erhalten wir "
+"folgende Anzeige für die Auftragsposition: Preis: 450, Rabatt=50,00, "
+"Nettopreis= 225.\n"
+"        Wenn die Checkbox nicht aktiviert wurde, erhalten wir hingegen "
+"folgende Anzeige: Preis=450, Rabatt=0,00, Nettopreis=225.\n"
+"    "
 
 #. module: product_visible_discount
 #: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
@@ -79,7 +94,7 @@ msgstr "Sie müssen zuerst eine Preisliste für den Lieferanten hinterlegen!"
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Auftragsposition"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index 148bb2b611d..4e360eda35e 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-12-27 18:13+0000\n"
+"PO-Revision-Date: 2011-01-01 07: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-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
@@ -49,18 +49,17 @@ msgid ""
 msgstr ""
 "\n"
 "    Este módulo permite calcular descuentos en las líneas del Pedido de "
-"Ventas y en las de la Factura basados en la lista de precios del proveedor.\n"
-"    Para esto, una nueva casilla de selección llamada \"Descuento visible\" "
-"se añade al formulario de la lista de precios.\n"
+"Ventas y en las de la Factura basados en la tarifa de la empresa.\n"
+"    Para ello se añade al formulario de la tarifa una nueva opción llamada "
+"\"Descuento visible\".\n"
 "    Ejemplo:\n"
-"        Para el producto PC1 y el proveedor \"Asustek\": si el precio de "
-"lista es 450 y el precio calculado con la lista de precios de Asustek es "
-"225\n"
-"        Si la casilla de selección está activada, en la línea del pedido "
-"aparecerá: precio unicario=450, Descuento=50,00, Precio neto=225\n"
-"        Si la casilla de selección está desactivada, en la línea del pedido "
-"y en la factura aparecerá: Precio unitario=225, Descuento=0,00, Precio "
-"neto=225\n"
+"        Para el producto PC1 y la empresa \"Asustek\": si el precio de venta "
+"es 450 y el precio calculado con la tarifa de Asustek es 225:\n"
+"        Si la opción \"Descuento visible\" está activada, en la línea del "
+"pedido aparecerá: precio unitario=450, Descuento=50,00, Precio neto=225\n"
+"        Si la opción \"Descuento visible\" está desactivada, en la línea del "
+"pedido y en la factura aparecerá: Precio unitario=225, Descuento=0,00, "
+"Precio neto=225\n"
 "    "
 
 #. module: product_visible_discount
diff --git a/addons/product_visible_discount/i18n/fr_BE.po b/addons/product_visible_discount/i18n/fr_BE.po
deleted file mode 100644
index 983dd588c65..00000000000
--- a/addons/product_visible_discount/i18n/fr_BE.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# translation of fr_FR.po to Français
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* product_visible_discount
-#
-# Numerigraphe <informatique@numerigraphe.com>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: fr_FR\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-03-25 12:11:15+0000\n"
-"PO-Revision-Date: 2009-03-25 13:17+0100\n"
-"Last-Translator: Numerigraphe <informatique@numerigraphe.com>\n"
-"Language-Team: Français\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Generator: KBabel 1.11.4\n"
-
-#. module: product_visible_discount
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: product_visible_discount
-#: model:ir.module.module,description:product_visible_discount.module_name_translation
-msgid ""
-"\n"
-"    This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.\n"
-"    To this end, a new check box named \"Visible Discount\" is added to the pricelist form.\n"
-"    Example:\n"
-"        For the product PC1 and the partner \"Asustek\": if listprice=450, and the price calculated using Asustek's pricelist is 225\n"
-"        If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225\n"
-"        If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
-"    "
-msgstr ""
-"\n"
-"    Ce module vous permet de calculer les remises sur les lignes de Commande  et de Facture en se basant sur la liste de prix du partenaire.\n"
-"    Pour cela, une nouvelle case à cocher \"Remise visible\" est ajoutée au formulaire \"Liste de prix\".\n"
-"    Par exemple :\n"
-"        Pour le produit PC1 et le partenaire \"Asustek\" : si le prix public=450, et le prix prix calculé en utilisant la liste de prix d'Asustek est 225\n"
-"        Si la case est cochée, on aura sur la ligne de commande : Prix unitaire=450, Remise=50,00, Prix net=225\n"
-"        Si la case N'EST PAS est cochée, on aura sur la ligne de commande : Prix unitaire=225, Remise=0,00, Prix net=225\n"
-"    "
-
-#. module: product_visible_discount
-#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation
-#: field:product.pricelist,visible_discount:0
-msgid "Visible Discount"
-msgstr "Remise visible"
-
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index e6581f5570a..6846df363d1 100644
--- a/addons/product_visible_discount/i18n/product_visible_discount.pot
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:14+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:147
 #, python-format
 msgid "No Purchase Pricelist Found !"
 msgstr ""
 
 #. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:155
 #, python-format
 msgid "No Sale Pricelist Found "
 msgstr ""
@@ -51,7 +51,7 @@ msgid "Invoice Line"
 msgstr ""
 
 #. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:155
 #, python-format
 msgid "You must first define a pricelist for Customer !"
 msgstr ""
@@ -62,7 +62,7 @@ msgid "Pricelist"
 msgstr ""
 
 #. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:147
 #, python-format
 msgid "You must first define a pricelist for Supplier !"
 msgstr ""
diff --git a/addons/profile_tools/i18n/de.po b/addons/profile_tools/i18n/de.po
index e174615524f..4c7e0e7ab1b 100644
--- a/addons/profile_tools/i18n/de.po
+++ b/addons/profile_tools/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 07:22+0000\n"
+"PO-Revision-Date: 2010-12-31 11:01+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_tools
@@ -41,11 +41,16 @@ msgid ""
 "Here are applications that can help you improve your organization without "
 "being key in its management."
 msgstr ""
+"Hier finden Sie die Anwendungen, die für Ihre Organisation nützlich sein "
+"können, ohne dass Sie Schlüsselanwendungen für das Management Ihres "
+"Unternehmens sind."
 
 #. module: profile_tools
 #: help:misc_tools.installer,lunch:0
 msgid "A simple module to help you to manage Lunch orders."
 msgstr ""
+"Eine einfache Anwendung für die Verwaltung der täglichen "
+"Mitarbeiterverpflegung."
 
 #. module: profile_tools
 #: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
@@ -55,7 +60,7 @@ msgstr "Konfiguration Werkzeuge"
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Configure Extra Tools"
-msgstr ""
+msgstr "Konfiguration Extra Anwendungen"
 
 #. module: profile_tools
 #: model:ir.module.module,description:profile_tools.module_meta_information
@@ -71,7 +76,7 @@ msgstr ""
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: profile_tools
 #: help:misc_tools.installer,survey:0
@@ -102,7 +107,7 @@ msgstr "Mittagessen"
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Extra Tools Configuration"
-msgstr ""
+msgstr "Konfiguration Extra Anwendungen"
 
 #. module: profile_tools
 #: field:misc_tools.installer,idea:0
diff --git a/addons/profile_tools/i18n/es.po b/addons/profile_tools/i18n/es.po
index 9c21d0bcd0e..e3d7f63da26 100644
--- a/addons/profile_tools/i18n/es.po
+++ b/addons/profile_tools/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:15+0000\n"
+"PO-Revision-Date: 2010-12-28 08:34+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_tools
diff --git a/addons/profile_tools/i18n/profile_tools.pot b/addons/profile_tools/i18n/profile_tools.pot
index 474b5c2cff3..807891ec80f 100644
--- a/addons/profile_tools/i18n/profile_tools.pot
+++ b/addons/profile_tools/i18n/profile_tools.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:14+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -25,24 +25,19 @@ msgstr ""
 msgid "Allows you to give restricted access to your OpenERP documents to external users, such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc."
 msgstr ""
 
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Here are applications that can help you improve your organization without being key in its management."
-msgstr ""
-
 #. module: profile_tools
 #: help:misc_tools.installer,lunch:0
 msgid "A simple module to help you to manage Lunch orders."
 msgstr ""
 
 #. module: profile_tools
-#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
-msgid "Tools Configuration"
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
 msgstr ""
 
 #. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Configure Extra Tools"
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
 msgstr ""
 
 #. module: profile_tools
@@ -52,6 +47,11 @@ msgid "Installs tools for lunch,survey,subscription and audittrail\n"
 "    "
 msgstr ""
 
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools are applications that can help you improve your organization although they are not key for company management."
+msgstr ""
+
 #. module: profile_tools
 #: view:misc_tools.installer:0
 msgid "Configure"
@@ -93,8 +93,13 @@ msgid "Helps to generate automatically recurring documents."
 msgstr ""
 
 #. module: profile_tools
-#: field:misc_tools.installer,subscription:0
-msgid "Recurring Documents"
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
 msgstr ""
 
 #. module: profile_tools
@@ -103,8 +108,8 @@ msgid "Survey"
 msgstr ""
 
 #. module: profile_tools
-#: model:ir.model,name:profile_tools.model_misc_tools_installer
-msgid "misc_tools.installer"
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
 msgstr ""
 
 #. module: profile_tools
@@ -113,8 +118,8 @@ msgid "Configuration Progress"
 msgstr ""
 
 #. module: profile_tools
-#: field:misc_tools.installer,pad:0
-msgid "Native pad integration"
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
 msgstr ""
 
 #. module: profile_tools
@@ -127,8 +132,3 @@ msgstr ""
 msgid "Web Share"
 msgstr ""
 
-#. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
-msgstr ""
-
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 6c0d03e2ddb..6f68b63cc02 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -31,7 +31,7 @@ class misc_tools_installer(osv.osv_memory):
         'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
         'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
             'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc.'),
-        'pad': fields.boolean('Native pad integration',
+        'pad': fields.boolean('Collaborative Note Pads',
             help="This module creates a tighter integration between a Pad "
                  "instance of your choosing and your OpenERP Web Client by "
                  "letting you easily link pads to OpenERP objects via "
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index 6a55b72d9c2..4a21aec6aab 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:49+0000\n"
+"PO-Revision-Date: 2010-12-31 10:21+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 04:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -359,7 +359,7 @@ msgstr "EMail Kopf"
 #. module: project
 #: view:project.installer:0
 msgid "Configure Your Project Management Application"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre Anwendungen für das Projektmanagement"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -568,7 +568,7 @@ msgstr "Meine Projekte"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: project
 #: view:project.task:0
@@ -796,7 +796,7 @@ msgstr "Neue Bezeichnung der delegierten Aufgabe."
 #. module: project
 #: view:report.project.task.user:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Monat -1    "
 
 #. module: project
 #: view:project.installer:0
@@ -804,6 +804,8 @@ msgid ""
 "Various OpenERP applications are available to manage your projects with "
 "different level of control and flexibility."
 msgstr ""
+"Verschiedene OpenERP Anwendungen mit unterschiedlichen Komplexitäten und "
+"Funktionen werden für das Projektmanagement von Unternehmen angeboten."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -1023,6 +1025,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 ""
+"Ein Projekt besteht aus einer Reihe von Einzelaufgaben oder projektbezogenen "
+"Problemstellungen, die durch Ihre Mitarbeiter zu bearbeiten sind. Ein "
+"Projekt kann in eine bestehende multidimensionale Projekthierachie, z.B. als "
+"Teilprojekt platziert werden. Jeder Anwender kann dabei sein eigenes Projekt "
+"in seinen Benutzer Eigenschaften hinterlegen, wodurch für die Anzeige der zu "
+"bearbeitenden Aufgaben ein automatischer Filter nur für dieses Projekt "
+"angewendet wird. Wenn Sie Ihre Anwendung für Projekte so konfiguriert haben, "
+"dass eine unmittelbare Weiterberechnung von erledigten Aufgaben möglich sein "
+"soll, können Sie einstellen, ob für ein Projekt die Abrechnungsfunktion "
+"angewendet werden soll oder nicht."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1078,7 +1090,7 @@ msgstr "Projekt Aufgaben"
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@@ -1139,7 +1151,7 @@ msgstr "Stufen"
 #. module: project
 #: view:project.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: project
 #: view:project.project:0
@@ -1250,6 +1262,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Wenn diese Option deaktiviert wird, können Sie die Anzeige des Projekts "
+"ausblenden."
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
@@ -1796,7 +1810,7 @@ msgstr "Projekt Zeiteinheit"
 #. module: project
 #: view:project.task:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Geleistete Stunden"
 
 #. module: project
 #: code:addons/project/project.py:0
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index aa67fd89b25..2cfee43022f 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:22+0000\n"
+"PO-Revision-Date: 2010-12-28 08:41+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index b6d56711eed..cf2be51504b 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/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-20 10:19+0000\n"
+"PO-Revision-Date: 2010-12-31 10:58+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-24 04:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -25,7 +25,7 @@ msgstr "Uzdotie uzdevumi"
 #. module: project
 #: help:project.task.delegate,new_task_description:0
 msgid "Reinclude the description of the task in the task of the user"
-msgstr ""
+msgstr "Ievietot uzdevuma aprakstu lietotāja uzdevumā"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -41,7 +41,7 @@ msgstr "Izvēlēta kompānija nav atļauto kompāniju sarakstā šim lietotājam
 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
 msgid "Put here the remaining hours required to close the task."
-msgstr ""
+msgstr "Norādiet šeit atlikušās stundas nepieciešamas uzdevuma pabeigšanai."
 
 #. module: project
 #: view:project.task:0
@@ -315,6 +315,8 @@ msgid ""
 "Helps generate invoices based on time spent on tasks, if activated on the "
 "project."
 msgstr ""
+"Ja aktivizēts projektam, palīdz ģenerēt rēķinus pēc laika, kas patērēts "
+"uzdevumiem."
 
 #. module: project
 #: view:project.task:0
@@ -353,7 +355,7 @@ msgstr "Iestarpinājums e-pasta sākumā"
 #. module: project
 #: view:project.installer:0
 msgid "Configure Your Project Management Application"
-msgstr ""
+msgstr "Konfigurējiet savu projektu vadības sistēmu"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -363,7 +365,7 @@ msgstr "Veiktais uzdevums"
 #. module: project
 #: help:project.task.delegate,prefix:0
 msgid "Title for your validation task"
-msgstr ""
+msgstr "Validācijas uzdevuma virsraksts"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -380,12 +382,12 @@ msgstr "Uzdevums ir pabeigts"
 #: field:project.task,date_end:0
 #: field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Beigu Datums"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mēnesis   "
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -397,7 +399,7 @@ msgstr "Nodod uzdevumu citam lietotājam"
 #: view:project.task:0
 #: view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupēt pēc..."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -416,7 +418,7 @@ msgstr ""
 #. module: project
 #: model:ir.model,name:project.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
@@ -426,7 +428,7 @@ msgstr "Testēšana"
 #. module: project
 #: help:project.task.delegate,planned_hours:0
 msgid "Estimated time to close this task by the delegated user"
-msgstr ""
+msgstr "Laika novērtējums uzdevuma pabeigšanai norīkotajam lietotājam"
 
 #. module: project
 #: view:project.project:0
@@ -484,7 +486,7 @@ msgstr "Partneris"
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Kļūda! Nedrīkst veidot rekursīvus analītiskos kontus"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -502,6 +504,7 @@ msgstr "Atbildīgais"
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Uzskaita un palīdz lietotājiem kodēt un validēt laika tabulas un apmeklējumu."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -522,12 +525,12 @@ msgstr "Pārvērtēt uzdevumu"
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
-msgstr ""
+msgstr "Pārtraukšanas datums: %(date)s"
 
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Nevar būt divi lietotāji ar vienādu pieteikuma vārdu!"
 
 #. module: project
 #: view:project.project:0
@@ -625,12 +628,12 @@ msgstr "Efektīvas stundas"
 #. module: project
 #: view:project.task.delegate:0
 msgid "Validation Task Title"
-msgstr ""
+msgstr "Validācijas uzdevuma virsraksts"
 
 #. module: project
 #: view:project.task:0
 msgid "Reevaluate"
-msgstr ""
+msgstr "Pārvērtēt"
 
 #. module: project
 #: code:addons/project/project.py:0
@@ -641,7 +644,7 @@ msgstr "Nosūtīt e-pastu pēc uzdevumu pabeigšanas"
 #. module: project
 #: view:report.project.task.user:0
 msgid "OverPass delay"
-msgstr ""
+msgstr "Pēc termiņa aizkave"
 
 #. module: project
 #: selection:project.task,priority:0
@@ -691,6 +694,8 @@ msgid ""
 "Sum of planned hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Plānoto stundu summa visiem ar šo projektu saistītiem uzdevumiem un "
+"apakšprojektiem."
 
 #. module: project
 #: field:project.task.delegate,name:0
@@ -765,7 +770,7 @@ msgstr "Jauns lietotājam deliģēta uzdevuma virsraksts"
 #. module: project
 #: view:report.project.task.user:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mēnesis-1    "
 
 #. module: project
 #: view:project.installer:0
@@ -926,7 +931,7 @@ msgstr "Aprēķināts kā: Patērētais Laiks / Kopējo Laiku."
 #: view:report.project.task.user:0
 #: field:report.project.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mēnesis"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.dblc_proj
@@ -972,7 +977,7 @@ msgstr "Sākuma Datums"
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying a list of task"
-msgstr ""
+msgstr "Ļauj attēlot uzdevumu sarakstu secībā pēc kārtas"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_view_project_all
@@ -1005,7 +1010,7 @@ msgstr "Informācija"
 #. module: project
 #: help:project.installer,account_budget:0
 msgid "Helps accountants manage analytic and crossover budgets."
-msgstr ""
+msgstr "Palīdz grāmatvežiem pārvaldīt analītiskos un salīdzinošos budžetus"
 
 #. module: project
 #: field:project.task,priority:0
@@ -1116,6 +1121,8 @@ msgid ""
 "New state of your own task. Pending will be reopened automatically when the "
 "delegated task is closed"
 msgstr ""
+"Jauns jūsu paša uzdevuma stāvoklis. Gaidošais tiks atkal atsākts "
+"automātiski, kad norīkotais uzdevums tiks pabeigts"
 
 #. module: project
 #: field:project.project,warn_customer:0
@@ -1133,6 +1140,8 @@ msgid ""
 "Implements and tracks the concepts and task types defined in the SCRUM "
 "methodology."
 msgstr ""
+"Realizē un uzskaite koncepcijas un uzdevumu tipus, kas definēti SCRUM "
+"metodoloģijā."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1208,6 +1217,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Ja lauks aktīvs ir iestatīts uz \"nē\", tas ļaus paslēpt projektu to "
+"nedzēšot."
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
@@ -1503,6 +1514,8 @@ msgid ""
 "Sum of spent hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Patērēto stundu summa visiem ar projektu saistītiem uzdevumiem un "
+"apakšprojektiem."
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1510,6 +1523,8 @@ msgid ""
 "Computed as difference of the time estimated by the project manager and the "
 "real time to close the task."
 msgstr ""
+"Tiek aprēķināts kā starpība starp projektu vadītāja novērtēto un reālo "
+"uzdevuma pabeigšanas laiku."
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_reevaluate
@@ -1522,6 +1537,8 @@ msgid ""
 "Enables long-term projects tracking, including multiple-phase projects and "
 "resource allocation handling."
 msgstr ""
+"Iespējo ilgtermiņa projektu uzskaiti, ieskaitot vairāku fāžu projektus un "
+"resursu sadalīšanas vadību."
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@@ -1589,7 +1606,7 @@ msgstr "Uzdevums: %(name)s"
 #: model:ir.actions.act_window,name:project.action_project_installer
 #: view:project.installer:0
 msgid "Project Application Configuration"
-msgstr ""
+msgstr "Projektu sistēmas konfigurācija"
 
 #. module: project
 #: field:project.task.delegate,user_id:0
@@ -1605,7 +1622,7 @@ msgstr "Patērētais Laiks"
 #. module: project
 #: model:ir.actions.act_window,name:project.act_my_account
 msgid "My accounts to invoice"
-msgstr ""
+msgstr "Klienti ar izrakstāmiem rēķiniem"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1632,6 +1649,7 @@ msgid ""
 "Sum of total hours of all tasks related to this project and its child "
 "projects."
 msgstr ""
+"Kopējo stundu summa ar šo projektu saistītiem uzdevumiem un apakšprojektiem."
 
 #. module: project
 #: help:project.task.close,manager_email:0
@@ -1667,6 +1685,8 @@ msgstr "Uzdevumi pa dienām"
 msgid ""
 "Couldn't send mail! Check the email ids and smtp configuration settings"
 msgstr ""
+"Neizdodas nosūtīt e-pastu! Pārbaudiet e-pasta identifikācijas un SMTP "
+"konfigurācijas iestatījumus!"
 
 #. module: project
 #: field:project.task.close,partner_warn:0
@@ -1752,7 +1772,7 @@ msgstr "Stundas Kopā"
 #. module: project
 #: help:project.project,sequence:0
 msgid "Gives the sequence order when displaying a list of Projects."
-msgstr ""
+msgstr "Ļauj attēlot projektu sarakstu secībā pēc kārtas."
 
 #. module: project
 #: field:project.task,id:0
@@ -1816,6 +1836,8 @@ msgid ""
 "Estimated time for you to validate the work done by the user to whom you "
 "delegate this task"
 msgstr ""
+"Jūsu novērtētais laiks, lai validētu lietotāja, kuram jūs norīkojat šo "
+"uzdevumu, padarīto darbu"
 
 #. module: project
 #: view:project.project:0
@@ -1825,18 +1847,18 @@ msgstr "Vadītājs"
 #. module: project
 #: field:project.task,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Izveidošanas datums"
 
 #. module: project
 #: code:addons/project/project.py:0
 #, python-format
 msgid "The task '%s' is cancelled."
-msgstr ""
+msgstr "Uzdevums '%s' ir atcelts."
 
 #. module: project
 #: view:project.task.close:0
 msgid "_Send"
-msgstr ""
+msgstr "_Sūtīt"
 
 #. module: project
 #: field:project.task.work,name:0
@@ -1846,23 +1868,23 @@ msgstr "Paveiktais darbs"
 #. module: project
 #: view:project.project:0
 msgid "Scheduling"
-msgstr ""
+msgstr "Plānošana"
 
 #. module: project
 #: view:project.installer:0
 msgid "title"
-msgstr ""
+msgstr "nosaukums"
 
 #. module: project
 #: help:project.installer,project_issue:0
 msgid "Automatically synchronizes project tasks and crm cases."
-msgstr ""
+msgstr "Automātiski sinhronizē projektu uzdevumus un crm lietas."
 
 #. module: project
 #: view:project.project:0
 #: field:project.project,type_ids:0
 msgid "Tasks Stages"
-msgstr ""
+msgstr "Uzdevumu posmi"
 
 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@@ -1878,7 +1900,7 @@ msgstr "Iestarpinājums e-pasta beigās"
 #. module: project
 #: field:project.installer,account_budget:0
 msgid "Budgets"
-msgstr ""
+msgstr "Budžeti"
 
 #~ msgid "Change Remaining Hours"
 #~ msgstr "Izmainīt Atlikušās stundas"
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index ad2be7f43eb..8479d639beb 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:55+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:55+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:15+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,11 +26,17 @@ msgid "Reinclude the description of the task in the task of the user"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:657
 #, python-format
 msgid "The task '%s' has been delegated to %s."
 msgstr ""
 
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid "This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), don't forget to setup the right unit of measure in your employees."
+msgstr ""
+
 #. module: project
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
@@ -47,13 +53,17 @@ msgid "Deadlines"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:121
 #, python-format
 msgid "Operation Not Permitted !"
 msgstr ""
 
 #. module: project
-#: code:addons/project/wizard/project_task_delegate.py:0
+#: code:addons/project/wizard/project_task_delegate.py:55
+#: code:addons/project/wizard/project_task_delegate.py:56
+#: code:addons/project/wizard/project_task_delegate.py:63
+#: code:addons/project/wizard/project_task_delegate.py:64
+#: code:addons/project/wizard/project_task_delegate.py:67
 #, python-format
 msgid "CHECK: "
 msgstr ""
@@ -91,7 +101,7 @@ msgid "Total remaining time, can be re-estimated periodically by the assignee of
 msgstr ""
 
 #. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:86
 #, python-format
 msgid "Task '%s' Closed"
 msgstr ""
@@ -224,7 +234,7 @@ msgid "Day"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:570
 #, python-format
 msgid "The task '%s' is done"
 msgstr ""
@@ -409,7 +419,7 @@ msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:552
 #, python-format
 msgid "Task '%s' closed"
 msgstr ""
@@ -426,8 +436,8 @@ msgid "Done by"
 msgstr ""
 
 #. module: project
-#: model:ir.actions.act_window,help:project.open_task_type_form
-msgid "Define here the steps that will be used on the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress of the resolution of a task or an issue."
+#: view:project.task:0
+msgid "Planning"
 msgstr ""
 
 #. module: project
@@ -459,16 +469,12 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:224
+#: code:addons/project/project.py:245
 #, python-format
 msgid " (copy)"
 msgstr ""
 
-#. module: project
-#: field:project.task,user_id:0
-msgid "Responsible"
-msgstr ""
-
 #. module: project
 #: help:project.installer,hr_timesheet_sheet:0
 msgid "Tracks and helps employees encode and validate timesheets and attendances."
@@ -490,6 +496,11 @@ msgstr ""
 msgid "Reevaluate Task"
 msgstr ""
 
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr ""
+
 #. module: project
 #: view:project.project:0
 msgid "Date Stop: %(date)s"
@@ -552,8 +563,9 @@ msgid "Percent of tasks closed according to the total of tasks todo."
 msgstr ""
 
 #. module: project
-#: model:ir.actions.act_window,help:project.action_view_task
-msgid "A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to antoher user. If you delegate a task to another user, you get a new task in pending state, which will be re-opened when you have to review the work achieved. If you install the project_timesheet module, tasks works can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed."
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
 msgstr ""
 
 #. module: project
@@ -593,7 +605,7 @@ msgid "Reevaluate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:530
 #, python-format
 msgid "Send Email after close task"
 msgstr ""
@@ -683,7 +695,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:266
 #: model:ir.actions.act_window,name:project.open_view_project_all
 #: model:ir.ui.menu,name:project.menu_open_view_project_all
 #: view:project.project:0
@@ -700,12 +712,12 @@ msgid "Stage"
 msgstr ""
 
 #. module: project
-#: field:report.project.task.user,user_id:0
-msgid "Assigned To"
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid "Define the steps that will be used in the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress in solving a task or an issue."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:621
 #, python-format
 msgid "The task '%s' is opened."
 msgstr ""
@@ -799,7 +811,7 @@ msgid "My Board"
 msgstr ""
 
 #. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:79
 #, python-format
 msgid "Please specify the email address of Project Manager."
 msgstr ""
@@ -843,6 +855,11 @@ msgstr ""
 msgid "Task Delegate"
 msgstr ""
 
+#. module: project
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid "A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed."
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "September"
@@ -929,8 +946,8 @@ msgid "Gives the sequence order when displaying a list of task"
 msgstr ""
 
 #. module: project
-#: model:ir.actions.act_window,help:project.open_view_project_all
-msgid "A project contains a set of tasks or issues that will be performed by your assigned personnel. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project's duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on. If you have personalized your 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."
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
 msgstr ""
 
 #. module: project
@@ -1061,11 +1078,6 @@ msgstr ""
 msgid "New state of your own task. Pending will be reopened automatically when the delegated task is closed"
 msgstr ""
 
-#. module: project
-#: field:project.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
@@ -1089,7 +1101,7 @@ msgid "Project Dashboard"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
+#: field:project.project,parent_id:0
 msgid "Parent Project"
 msgstr ""
 
@@ -1119,7 +1131,7 @@ msgid "Customer Email"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:189
 #, python-format
 msgid "The project '%s' has been closed."
 msgstr ""
@@ -1160,7 +1172,7 @@ msgid "When task is completed, it will come into the done state."
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:211
 #, python-format
 msgid "The project '%s' has been opened."
 msgstr ""
@@ -1176,13 +1188,15 @@ msgid "Dashboard"
 msgstr ""
 
 #. module: project
-#: help:res.company,project_time_mode_id:0
-msgid "This will set the unit of measure used in projects and tasks.\n"
-"If you use the timesheet linked to projects (project_timesheet module), don't forget to setup the right unit of measure in your employees."
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
 msgstr ""
 
 #. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:79
+#: code:addons/project/wizard/project_task_close.py:82
+#: code:addons/project/wizard/project_task_close.py:91
+#: code:addons/project/wizard/project_task_close.py:111
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1203,7 +1217,7 @@ msgid "_Delegate"
 msgstr ""
 
 #. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:91
 #, python-format
 msgid "Couldn't send mail because your email address is not configured!"
 msgstr ""
@@ -1282,7 +1296,7 @@ msgid "This report allows you to analyse the performance of your projects and us
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:581
 #, python-format
 msgid "Task '%s' set in progress"
 msgstr ""
@@ -1328,7 +1342,7 @@ msgid "Open"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:121
 #, python-format
 msgid "You can not delete a project with tasks. I suggest you to deactivate it."
 msgstr ""
@@ -1347,7 +1361,7 @@ msgid "In Progress"
 msgstr ""
 
 #. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:82
 #, python-format
 msgid "Please specify the email address of Customer."
 msgstr ""
@@ -1369,9 +1383,8 @@ msgid "Current Activity"
 msgstr ""
 
 #. module: project
-#: view:project.task.delegate:0
-#: field:project.task.delegate,new_task_description:0
-msgid "New Task Description"
+#: field:project.task,user_id:0
+msgid "Responsible"
 msgstr ""
 
 #. module: project
@@ -1402,11 +1415,6 @@ msgstr ""
 msgid "Very Low"
 msgstr ""
 
-#. module: project
-#: view:project.task:0
-msgid "Planning"
-msgstr ""
-
 #. module: project
 #: field:project.project,warn_manager:0
 #: field:project.task.close,manager_warn:0
@@ -1571,7 +1579,7 @@ msgid "Task By Days"
 msgstr ""
 
 #. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:111
 #, python-format
 msgid "Couldn't send mail! Check the email ids and smtp configuration settings"
 msgstr ""
@@ -1644,7 +1652,7 @@ msgid "Spent Hours"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:664
 #, python-format
 msgid "The task '%s' is pending."
 msgstr ""
@@ -1693,6 +1701,11 @@ msgstr ""
 msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
 msgstr ""
 
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section."
+msgstr ""
+
 #. module: project
 #: field:project.project,total_hours:0
 msgid "Total Time"
@@ -1704,7 +1717,7 @@ msgid "Validation State"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:601
 #, python-format
 msgid "Task '%s' cancelled"
 msgstr ""
@@ -1730,7 +1743,7 @@ msgid "Create Date"
 msgstr ""
 
 #. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:609
 #, python-format
 msgid "The task '%s' is cancelled."
 msgstr ""
diff --git a/addons/project/project.py b/addons/project/project.py
index c076ed764d4..dda6819839a 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -129,7 +129,6 @@ class project(osv.osv):
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"),
         'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'parent_id': fields.many2one('project.project', 'Parent Project'),
         'tasks': fields.one2many('project.task', 'project_id', "Project tasks"),
         'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",
             store = {
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index f3bab29250a..01f63ab314d 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -17,13 +17,13 @@
         
         <!--
 		Resource: project.project
-		
+		-->
         <record id="all_projects_account" model="account.analytic.account">
             <field name="name">Projects</field>
             <field name="code">3</field>
         </record>
 	
 		<function eval="('default',False,'parent_id', [('project.project', False)], all_projects_account, True, False, False, False, True)" id="parent_project_default_set" model="ir.values" name="set"/>
-        -->
+        
     </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index e3b905fea9d..27a5b31a5bb 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -241,10 +241,10 @@
         </record>
 
         <!-- Projects -->
-        <record id="all_projects_account" model="project.project">
+        <!-- <record id="all_projects_account" model="project.project">
             <field name="name">Projects</field>
             <field name="code">3</field>
-        </record>
+        </record> -->
         
         <record id="project_project_9" model="project.project">
             <field name="warn_manager">1</field>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f4c837e5d21..3375f790091 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,7 +21,7 @@
                 <form string="Project">
                     <group colspan="6" col="6">
                         <field name="name" string="Project Name" select="1"/>
-                        <field name="parent_id" domain="[('id','!=',active_id)]"/>
+                        <field name="parent_id" string="Parent Project" domain="[('id','!=',active_id)]" context="{'current_model': 'project.project'}"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
@@ -42,7 +42,6 @@
                             <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" required="1"/>
-                                <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                                 <field name="warn_manager"/>
                             </group>
                             <newline/>
@@ -74,6 +73,7 @@
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
                             <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Invoice Address"/>
                             <field name="warn_customer"/>
+                            <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
                             <group colspan="4" col="4" groups="base.group_extended">
                                 <separator colspan="2" string="Mail Header"/>
@@ -143,7 +143,7 @@
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
-                    <field name="parent_id" invisible="1"/>
+                    <field name="parent_id" string="Parent Project" invisible="1"/>
                     <field name="planned_hours" widget="float_time"/>
                     <field name="total_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time"/>
@@ -153,11 +153,25 @@
             </field>
         </record>
 
+       <record id="view_project_project_gantt" model="ir.ui.view">
+            <field name="name">project.project.gantt</field>
+            <field name="model">project.project</field>
+            <field name="type">gantt</field>
+            <field name="arch" type="xml">
+                <gantt color="user_id" date_delay="planned_hours" date_start="date_start" string="Projects">
+                    <level object="project.project" link="id" domain="[]">
+                        <field name="complete_name"/>
+                    </level>
+                </gantt>
+            </field>
+        </record>
+
         <record id="open_view_project_all" model="ir.actions.act_window">
             <field name="name">Projects</field>
             <field name="res_model">project.project</field>
             <field name="view_type">form</field>
             <field name="domain">[]</field>
+            <field name="view_mode">tree,form,gantt</field>
             <field name="view_id" ref="view_project"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{'search_default_Current':1}</field>
diff --git a/addons/project_caldav/i18n/de.po b/addons/project_caldav/i18n/de.po
index d91dea37011..4739104eabb 100644
--- a/addons/project_caldav/i18n/de.po
+++ b/addons/project_caldav/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 07:23+0000\n"
+"PO-Revision-Date: 2010-12-31 11:01+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
@@ -81,7 +81,7 @@ msgstr "März"
 #. module: project_caldav
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_caldav
 #: selection:project.task,week_list:0
@@ -333,7 +333,7 @@ msgstr "Erinnerung"
 #. module: project_caldav
 #: model:ir.module.module,description:project_caldav.module_meta_information
 msgid " Synchronize between Project task and Caldav Vtodo."
-msgstr ""
+msgstr " Synchronisation der Projekt Aufgaben mit Caldav Vtodo"
 
 #. module: project_caldav
 #: view:project.task:0
diff --git a/addons/project_caldav/i18n/es.po b/addons/project_caldav/i18n/es.po
index 2fe7bb2b0b9..08a542bbde8 100644
--- a/addons/project_caldav/i18n/es.po
+++ b/addons/project_caldav/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:23+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-31 08: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-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_caldav
@@ -439,7 +438,7 @@ msgstr "Personalizado"
 #. module: project_caldav
 #: field:project.task,exrule:0
 msgid "Exception Rule"
-msgstr "Exception de regla"
+msgstr "Regla de excepción"
 
 #. module: project_caldav
 #: view:project.task:0
diff --git a/addons/project_caldav/i18n/lv.po b/addons/project_caldav/i18n/lv.po
new file mode 100644
index 00000000000..614a62aa37b
--- /dev/null
+++ b/addons/project_caldav/i18n/lv.po
@@ -0,0 +1,555 @@
+# Latvian 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-31 10:23+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: 2011-01-01 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_caldav
+#: help:project.task,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Šī īpašība definē datums/laiks izņēmumu sarakstu kalendāra periodiskām "
+"komponentēm."
+
+#. module: project_caldav
+#: field:project.task,we:0
+msgid "Wed"
+msgstr "Tr"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Monthly"
+msgstr "Ik mēnesi"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Sunday"
+msgstr "Svētdiena"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fourth"
+msgstr "Ceturtais"
+
+#. module: project_caldav
+#: field:project.task,show_as:0
+msgid "Show as"
+msgstr "Rādīt kā"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees details"
+msgstr "Atbildīgo pap. inform."
+
+#. module: project_caldav
+#: field:project.task,day:0
+#: selection:project.task,select1:0
+msgid "Date of month"
+msgstr "Mēneša datums"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Public"
+msgstr "Publisks"
+
+#. module: project_caldav
+#: field:project.task,base_calendar_url:0
+msgid "Caldav URL"
+msgstr "Caldav URL"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "March"
+msgstr "Marts"
+
+#. module: project_caldav
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Friday"
+msgstr "Piektdiena"
+
+#. module: project_caldav
+#: field:project.task,allday:0
+msgid "All Day"
+msgstr "Visu dienu"
+
+#. module: project_caldav
+#: field:project.task,vtimezone:0
+msgid "Timezone"
+msgstr "Laika josla"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Free"
+msgstr "Brīvs"
+
+#. module: project_caldav
+#: field:project.task,mo:0
+msgid "Mon"
+msgstr "Pi"
+
+#. module: project_caldav
+#: model:ir.model,name:project_caldav.model_project_task
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Last"
+msgstr "Pēdējais"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Days"
+msgstr "Dienas"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "No Repeat"
+msgstr "Neatkārtot"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Exclude range"
+msgstr "Izņemot periodu"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Minutes"
+msgstr "Minūtes"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Yearly"
+msgstr "Ik gadu"
+
+#. module: project_caldav
+#: field:project.task,tu:0
+msgid "Tue"
+msgstr "Ot"
+
+#. module: project_caldav
+#: field:project.task,end_date:0
+msgid "Repeat Until"
+msgstr "Atkārtot līdz"
+
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every x"
+msgstr "Atkārtot katru"
+
+#. module: project_caldav
+#: field:project.task,organizer:0
+#: field:project.task,organizer_id:0
+msgid "Organizer"
+msgstr "Organizators"
+
+#. module: project_caldav
+#: field:project.task,sa:0
+msgid "Sat"
+msgstr "Se"
+
+#. module: project_caldav
+#: field:project.task,attendee_ids:0
+msgid "Attendees"
+msgstr "Dalībnieki"
+
+#. module: project_caldav
+#: field:project.task,su:0
+msgid "Sun"
+msgstr "Sv"
+
+#. module: project_caldav
+#: selection:project.task,select1:0
+msgid "Day of month"
+msgstr "Mēneša diena"
+
+#. module: project_caldav
+#: field:project.task,location:0
+msgid "Location"
+msgstr "Vieta"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Mail TO"
+msgstr "Kam"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Weeks"
+msgstr "Nedēļas"
+
+#. module: project_caldav
+#: field:project.task,select1:0
+msgid "Option"
+msgstr "Iespēja"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Confidential"
+msgstr "Konfidenciāls"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Seconds"
+msgstr "Sekundes"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Hours"
+msgstr "Stundas"
+
+#. module: project_caldav
+#: field:project.task,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr "Atkārtošanās ID"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "July"
+msgstr "Jūlijs"
+
+#. module: project_caldav
+#: field:project.task,th:0
+msgid "Thu"
+msgstr "Ce"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Daily"
+msgstr "Ik dienu"
+
+#. module: project_caldav
+#: field:project.task,class:0
+msgid "Mark as"
+msgstr "Atzīmēt kā"
+
+#. module: project_caldav
+#: help:project.task,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr "Lai notikums automātiski atkārtojās šajā intervālā"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "First"
+msgstr "Pirmais"
+
+#. module: project_caldav
+#: code:addons/project_caldav/project_caldav.py:0
+#, python-format
+msgid "Tasks"
+msgstr "Uzdevumi"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "September"
+msgstr "Septembris"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "December"
+msgstr "Decembris"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Tuesday"
+msgstr "Otrdiena"
+
+#. module: project_caldav
+#: field:project.task,month_list:0
+msgid "Month"
+msgstr "Mēnesis"
+
+#. module: project_caldav
+#: model:ir.module.module,shortdesc:project_caldav.module_meta_information
+msgid "CalDAV for task management"
+msgstr "CalDAV uzdevumu vadībai"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Custom Recurrency Rule"
+msgstr "Pielāgotais atkārtošanas noteikums"
+
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat max that times"
+msgstr "Atkārtot maksimums tik reižu"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Weekly"
+msgstr "Ik nedēļu"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Edit All"
+msgstr "Labot visus"
+
+#. module: project_caldav
+#: field:project.task,fr:0
+msgid "Fri"
+msgstr "Pie"
+
+#. module: project_caldav
+#: help:project.task,location:0
+msgid "Location of Event"
+msgstr "Pasākuma vieta"
+
+#. module: project_caldav
+#: field:project.task,rrule:0
+msgid "Recurrent Rule"
+msgstr "Atkārtošanas noteikums"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "From"
+msgstr "No"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Reminder"
+msgstr "Atgādinājums"
+
+#. module: project_caldav
+#: model:ir.module.module,description:project_caldav.module_meta_information
+msgid " Synchronize between Project task and Caldav Vtodo."
+msgstr " Sinhronizēt projektu uzdevumus un CalDAV vTodo"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assignees Detail"
+msgstr "Atbildīgā pap. inform."
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "August"
+msgstr "Augusts"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Monday"
+msgstr "Pirmdiena"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Third"
+msgstr "Trešais"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "June"
+msgstr "Jūnijs"
+
+#. module: project_caldav
+#: field:project.task,write_date:0
+msgid "Write Date"
+msgstr "Rakstīšanas datums"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "November"
+msgstr "Novembris"
+
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Count"
+msgstr "Skaits"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "October"
+msgstr "Oktobris"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "January"
+msgstr "Janvāris"
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Months"
+msgstr "Mēneši"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Wednesday"
+msgstr "Trešdiena"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "To"
+msgstr "Līdz"
+
+#. module: project_caldav
+#: field:project.task,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr "Atkārtošanās ID datums"
+
+#. module: project_caldav
+#: field:project.task,freq:0
+msgid "Frequency"
+msgstr "Biežums"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "of"
+msgstr "no"
+
+#. module: project_caldav
+#: selection:project.task,show_as:0
+msgid "Busy"
+msgstr "Aizņemts"
+
+#. module: project_caldav
+#: view:project.task:0
+#: field:project.task,rrule_type:0
+msgid "Recurrency"
+msgstr "Atkārtošanās"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Thursday"
+msgstr "Ceturtdiena"
+
+#. module: project_caldav
+#: selection:project.task,rrule_type:0
+msgid "Custom"
+msgstr "Pielāgots"
+
+#. module: project_caldav
+#: field:project.task,exrule:0
+msgid "Exception Rule"
+msgstr "Izņēmuma noteikums"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Other"
+msgstr "Citi"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Details"
+msgstr "Sīkāka informācija"
+
+#. module: project_caldav
+#: help:project.task,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+"Definē noteikumu vai laika atkārtošanās šablonu, ko izslēgt no atkārtošanas "
+"noteikuma."
+
+#. module: project_caldav
+#: selection:project.task,freq:0
+msgid "Years"
+msgstr "Gadi"
+
+#. module: project_caldav
+#: help:project.task,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences:  "
+"      FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "May"
+msgstr "Maijs"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "Assign Task"
+msgstr "Piešķirtu uzdevumu"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "February"
+msgstr "Februāris"
+
+#. module: project_caldav
+#: field:project.task,interval:0
+msgid "Interval"
+msgstr "Intervāls"
+
+#. module: project_caldav
+#: field:project.task,exdate:0
+msgid "Exception Date/Times"
+msgstr "Izņēmuma datumi/laiki"
+
+#. module: project_caldav
+#: field:project.task,alarm_id:0
+#: field:project.task,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr "Atgādinājums"
+
+#. module: project_caldav
+#: selection:project.task,month_list:0
+msgid "April"
+msgstr "Aprīlis"
+
+#. module: project_caldav
+#: field:project.task,week_list:0
+msgid "Weekday"
+msgstr "Nedēļas diena"
+
+#. module: project_caldav
+#: field:project.task,byday:0
+msgid "By day"
+msgstr "Pēc dienas"
+
+#. module: project_caldav
+#: view:project.task:0
+msgid "The"
+msgstr ""
+
+#. module: project_caldav
+#: help:project.task,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr "Iestatīt atgādinājumu uz šo laiku pirms notikuma iestāšanās"
+
+#. module: project_caldav
+#: selection:project.task,class:0
+msgid "Private"
+msgstr "Privāts"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Second"
+msgstr "Otrais"
+
+#. module: project_caldav
+#: field:project.task,date:0
+#: field:project.task,duration:0
+msgid "Duration"
+msgstr "Ilgums"
+
+#. module: project_caldav
+#: selection:project.task,week_list:0
+msgid "Saturday"
+msgstr "Sestdiena"
+
+#. module: project_caldav
+#: selection:project.task,byday:0
+msgid "Fifth"
+msgstr "Piektais"
diff --git a/addons/project_caldav/i18n/project_caldav.pot b/addons/project_caldav/i18n/project_caldav.pot
index 50784e517f7..99e7cb2ef64 100644
--- a/addons/project_caldav/i18n/project_caldav.pot
+++ b/addons/project_caldav/i18n/project_caldav.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,11 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
+#. module: project_caldav
+#: help:project.task,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
 #. module: project_caldav
 #: selection:project.task,week_list:0
 msgid "Sunday"
@@ -86,11 +91,6 @@ msgstr ""
 msgid "All Day"
 msgstr ""
 
-#. module: project_caldav
-#: field:project.task,vtimezone:0
-msgid "Timezone"
-msgstr ""
-
 #. module: project_caldav
 #: selection:project.task,show_as:0
 msgid "Free"
@@ -121,21 +121,16 @@ msgstr ""
 msgid "No Repeat"
 msgstr ""
 
-#. module: project_caldav
-#: view:project.task:0
-msgid "Exclude range"
-msgstr ""
-
-#. module: project_caldav
-#: selection:project.task,freq:0
-msgid "Minutes"
-msgstr ""
-
 #. module: project_caldav
 #: selection:project.task,rrule_type:0
 msgid "Yearly"
 msgstr ""
 
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Option"
+msgstr ""
+
 #. module: project_caldav
 #: field:project.task,tu:0
 msgid "Tue"
@@ -146,17 +141,17 @@ msgstr ""
 msgid "Repeat Until"
 msgstr ""
 
-#. module: project_caldav
-#: help:project.task,interval:0
-msgid "Repeat every x"
-msgstr ""
-
 #. module: project_caldav
 #: field:project.task,organizer:0
 #: field:project.task,organizer_id:0
 msgid "Organizer"
 msgstr ""
 
+#. module: project_caldav
+#: help:project.task,edit_all:0
+msgid "Edit all Occurrences  of recurrent Meeting."
+msgstr ""
+
 #. module: project_caldav
 #: field:project.task,sa:0
 msgid "Sat"
@@ -202,11 +197,6 @@ msgstr ""
 msgid "Confidential"
 msgstr ""
 
-#. module: project_caldav
-#: selection:project.task,freq:0
-msgid "Seconds"
-msgstr ""
-
 #. module: project_caldav
 #: selection:project.task,freq:0
 msgid "Hours"
@@ -227,6 +217,11 @@ msgstr ""
 msgid "Thu"
 msgstr ""
 
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat x times"
+msgstr ""
+
 #. module: project_caldav
 #: selection:project.task,rrule_type:0
 msgid "Daily"
@@ -237,6 +232,11 @@ msgstr ""
 msgid "Mark as"
 msgstr ""
 
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Repeat"
+msgstr ""
+
 #. module: project_caldav
 #: help:project.task,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
@@ -248,7 +248,7 @@ msgid "First"
 msgstr ""
 
 #. module: project_caldav
-#: code:addons/project_caldav/project_caldav.py:0
+#: code:addons/project_caldav/project_caldav.py:67
 #, python-format
 msgid "Tasks"
 msgstr ""
@@ -279,13 +279,8 @@ msgid "CalDAV for task management"
 msgstr ""
 
 #. module: project_caldav
-#: view:project.task:0
-msgid "Custom Recurrency Rule"
-msgstr ""
-
-#. module: project_caldav
-#: help:project.task,count:0
-msgid "Repeat max that times"
+#: field:project.task,vtimezone:0
+msgid "Timezone"
 msgstr ""
 
 #. module: project_caldav
@@ -294,7 +289,7 @@ msgid "Weekly"
 msgstr ""
 
 #. module: project_caldav
-#: view:project.task:0
+#: field:project.task,edit_all:0
 msgid "Edit All"
 msgstr ""
 
@@ -363,11 +358,6 @@ msgstr ""
 msgid "November"
 msgstr ""
 
-#. module: project_caldav
-#: field:project.task,count:0
-msgid "Count"
-msgstr ""
-
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "October"
@@ -388,6 +378,11 @@ msgstr ""
 msgid "Wednesday"
 msgstr ""
 
+#. module: project_caldav
+#: view:project.task:0
+msgid "Repeat Times"
+msgstr ""
+
 #. module: project_caldav
 #: view:project.task:0
 msgid "To"
@@ -403,6 +398,11 @@ msgstr ""
 msgid "Frequency"
 msgstr ""
 
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
 #. module: project_caldav
 #: view:project.task:0
 msgid "of"
@@ -413,6 +413,11 @@ msgstr ""
 msgid "Busy"
 msgstr ""
 
+#. module: project_caldav
+#: field:project.task,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
 #. module: project_caldav
 #: view:project.task:0
 #: field:project.task,rrule_type:0
@@ -424,11 +429,6 @@ msgstr ""
 msgid "Thursday"
 msgstr ""
 
-#. module: project_caldav
-#: selection:project.task,rrule_type:0
-msgid "Custom"
-msgstr ""
-
 #. module: project_caldav
 #: field:project.task,exrule:0
 msgid "Exception Rule"
@@ -470,6 +470,11 @@ msgstr ""
 msgid "Assign Task"
 msgstr ""
 
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Rule"
+msgstr ""
+
 #. module: project_caldav
 #: selection:project.task,month_list:0
 msgid "February"
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index a47869529c1..322dc2b2033 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 10:13+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 10:32+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:37+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -111,7 +112,7 @@ msgstr "Fehler!"
 #. module: project_gtd
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
@@ -189,6 +190,27 @@ msgid ""
 "performing those tasks.\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul implementiert das Konzept der Getting Things Done Methode. \n"
+"Diese weltweit verbreitete Methodik hilft Projektmitarbeitern bei der "
+"Organisation\n"
+"Ihrer persönlichen Arbeitszeit.\n"
+"\n"
+"Getting Things Done (GTD) ist ein Verfahren für das Management von "
+"Aktivitäten und\n"
+"wurde erfunden durch David Allen, der in seinem Bestseller die zu Grunde "
+"liegende Methodik erläutert.\n"
+"\n"
+"GTD basiert auf dem Prinzip, dass Mitarbeiter eine Vielzahl von Aufgaben "
+"strukturiert, in Zeitfenster und\n"
+"Kategorien aufteilen und dadurch sichergestellt wird, dass die Konzentration "
+"auf die aktuell\n"
+"anstehende Tätigkeit gerichtet wird, ohne dabei die Gesamtheit der Aufgaben "
+"aus dem Gedächtnis\n"
+"zu verlieren.\n"
+"\n"
+"Kategorien aufteilen\n"
+"    "
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index f9debee54b1..189d4b61a43 100644
--- a/addons/project_gtd/i18n/es.po
+++ b/addons/project_gtd/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:08+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 12:45+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-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
@@ -194,6 +193,23 @@ msgid ""
 "performing those tasks.\n"
 "    "
 msgstr ""
+"\n"
+"Este módulo implementa todos los conceptos definidos por la metodología\n"
+"Getting Things Done. Esta metodología reconocida mundialmente se usa\n"
+"para la mejorar la gestión del tiempo personal.\n"
+"\n"
+"Getting Things Done (habitualmente abreviado como GTD) es un método de "
+"gestión\n"
+"de actividades creado por David Allen, y descrito en un libro con el mismo "
+"nombre.\n"
+"\n"
+"GTD se basa en el principio de que una persona necesita liberar la mente de "
+"tareas\n"
+"anotándolas externamente. De ese modo, la mente es libre de recordar todo "
+"lo\n"
+"que hay que hacer, y se puede concentrar en realizar realmente\n"
+"esas tareas.\n"
+"    "
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
diff --git a/addons/project_gtd/i18n/lv.po b/addons/project_gtd/i18n/lv.po
new file mode 100644
index 00000000000..162b5c40a2b
--- /dev/null
+++ b/addons/project_gtd/i18n/lv.po
@@ -0,0 +1,286 @@
+# Latvian 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: 2011-01-01 22:09+0000\n"
+"Last-Translator: Vladimirs Kuzmins <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: 2011-01-02 05:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_gtd
+#: help:project.task,timebox_id:0
+msgid "Time-laps during which task has to be treated"
+msgstr "Laika sprīži, kad jātiek galā ar uzdevumu"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_timebox
+msgid "project.gtd.timebox"
+msgstr "project.gtd.timebox"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "Aktivizēt atkal"
+
+#. module: project_gtd
+#: help:project.gtd.timebox,sequence:0
+msgid "Gives the sequence order when displaying a list of timebox."
+msgstr "Attēlo laika sprīžu sarakstu secībā pēc kārtas."
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_travel
+msgid "Travel"
+msgstr "Ceļojumi"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "Timebox Empty Process Completed Successfully."
+msgstr "Laika sprīža iztukšošanas process noslēdzies veiksmīgi."
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#, python-format
+msgid "No timebox child of this one !"
+msgstr "Šim laika sprīdima nav pakarātotā!"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid ""
+"Timeboxes are defined in the \"Getting Things Done\" methodology. It defines "
+"a period of time in order to categorize your tasks: today, this week, this "
+"month, long term."
+msgstr ""
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:0
+#, python-format
+msgid "GTD"
+msgstr "GTD"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_lt
+msgid "Long Term"
+msgstr "Ilgtermiņa"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_empty
+msgid "Project Timebox Empty"
+msgstr "Projekta laika sprīdis tukšs"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_daily
+msgid "Today"
+msgstr "Šodien"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+#: field:project.gtd.timebox,name:0
+#: view:project.task:0
+#: field:project.task,timebox_id:0
+msgid "Timebox"
+msgstr "Laika sprīdis"
+
+#. module: project_gtd
+#: model:ir.module.module,shortdesc:project_gtd.module_meta_information
+msgid "Getting Things Done - Time Management Module"
+msgstr "Getting Things Done - Laika vadības modulis"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_to_id:0
+msgid "Set to Timebox"
+msgstr "Iestatīt par laika sprīdi"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#, python-format
+msgid "Error !"
+msgstr "Kļūda!"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "_Cancel"
+msgstr "_Atcelt"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
+#: view:project.timebox.empty:0
+msgid "Empty Timebox"
+msgstr "Iztīrīt laika sprīdi"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
+msgid "This Week"
+msgstr "Šajā nedēļā"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_monthly
+msgid "This Month"
+msgstr "Šajā mēnesī"
+
+#. module: project_gtd
+#: field:project.gtd.timebox,icon:0
+msgid "Icon"
+msgstr "Ikona"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
+msgid "Project Timebox Fill"
+msgstr "Projekta laika sprīža aizpildīšana"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_task
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "Add to Timebox"
+msgstr "Pievienot laika sprīdīm"
+
+#. module: project_gtd
+#: field:project.timebox.empty,name:0
+msgid "Name"
+msgstr "Nosaukums"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
+msgid "Contexts"
+msgstr "Konteksts"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_car
+msgid "Car"
+msgstr "Mašīna"
+
+#. module: project_gtd
+#: model:ir.module.module,description:project_gtd.module_meta_information
+msgid ""
+"\n"
+"This module implements all concepts defined by the Getting Things Done\n"
+"methodology. This world-wide used methodology is used for personal\n"
+"time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management\n"
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind "
+"by\n"
+"recording them externally. That way, the mind is freed from the job of\n"
+"remembering everything that needs to be done, and can concentrate on "
+"actually\n"
+"performing those tasks.\n"
+"    "
+msgstr ""
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
+#: view:project.timebox.fill.plan:0
+msgid "Plannify Timebox"
+msgstr "Plānot laika sprīdi"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
+#: view:project.gtd.timebox:0
+msgid "Timeboxes"
+msgstr "Laika sprīži"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_context
+#: view:project.gtd.context:0
+#: field:project.gtd.context,name:0
+#: field:project.task,context_id:0
+msgid "Context"
+msgstr "Konteksts"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Next"
+msgstr "Nākamais"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "_Ok"
+msgstr "_Labi"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:0
+#, python-format
+msgid "Getting Things Done"
+msgstr "Getting Things Done"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_office
+msgid "Office"
+msgstr "Birojs"
+
+#. module: project_gtd
+#: field:project.gtd.context,sequence:0
+#: field:project.gtd.timebox,sequence:0
+msgid "Sequence"
+msgstr "Secība"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid ""
+"Contexts are defined in the \"Getting Things Done\" methodology. It allows "
+"you to categorize your tasks according to the context in which they have to "
+"be done: at office, at home, when I take my car, etc."
+msgstr ""
+
+#. module: project_gtd
+#: help:project.gtd.context,sequence:0
+msgid "Gives the sequence order when displaying a list of contexts."
+msgstr "Attēlo kontekstu sarakstu secībā pēc kārtas."
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+msgid "Timebox Definition"
+msgstr "Laika sprīža definīcija"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,task_ids:0
+msgid "Tasks selection"
+msgstr "Uzdevumu izvēlēšanās"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:0
+#, python-format
+msgid "Inbox"
+msgstr "Ienākošie"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_id:0
+msgid "Get from Timebox"
+msgstr "Paņemt no laika sprīža"
+
+#. module: project_gtd
+#: help:project.task,context_id:0
+msgid "The context place where user has to treat task"
+msgstr "Konteksta vieta, kur lietotājam jātiek galā ar uzdevumu"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_home
+msgid "Home"
+msgstr "Mājas"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Previous"
+msgstr "Iepriekšējais"
diff --git a/addons/project_gtd/i18n/project_gtd.pot b/addons/project_gtd/i18n/project_gtd.pot
index 926df07cbde..d50deaa3d6a 100644
--- a/addons/project_gtd/i18n/project_gtd.pot
+++ b/addons/project_gtd/i18n/project_gtd.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -46,18 +46,13 @@ msgid "Timebox Empty Process Completed Successfully."
 msgstr ""
 
 #. module: project_gtd
-#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "No timebox child of this one !"
 msgstr ""
 
 #. module: project_gtd
-#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
-msgid "Timeboxes are defined in the \"Getting Things Done\" methodology. It defines a period of time in order to categorize your tasks: today, this week, this month, long term."
-msgstr ""
-
-#. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/project_gtd.py:112
 #, python-format
 msgid "GTD"
 msgstr ""
@@ -96,7 +91,7 @@ msgid "Set to Timebox"
 msgstr ""
 
 #. module: project_gtd
-#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -117,6 +112,11 @@ msgstr ""
 msgid "Empty Timebox"
 msgstr ""
 
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid "Timeboxes are defined in the \"Getting Things Done\" methodology. A timebox defines a period of time in order to categorize your tasks: today, this week, this month, long term."
+msgstr ""
+
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_weekly
 msgid "This Week"
@@ -212,7 +212,7 @@ msgid "_Ok"
 msgstr ""
 
 #. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/project_gtd.py:110
 #, python-format
 msgid "Getting Things Done"
 msgstr ""
@@ -228,11 +228,6 @@ msgstr ""
 msgid "Sequence"
 msgstr ""
 
-#. module: project_gtd
-#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
-msgid "Contexts are defined in the \"Getting Things Done\" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at office, at home, when I take my car, etc."
-msgstr ""
-
 #. module: project_gtd
 #: help:project.gtd.context,sequence:0
 msgid "Gives the sequence order when displaying a list of contexts."
@@ -249,7 +244,7 @@ msgid "Tasks selection"
 msgstr ""
 
 #. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/project_gtd.py:111
 #, python-format
 msgid "Inbox"
 msgstr ""
@@ -269,6 +264,11 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid "Contexts are defined in the \"Getting Things Done\" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc."
+msgstr ""
+
 #. module: project_gtd
 #: view:project.task:0
 msgid "Previous"
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index db0d7187500..7a36b3e6ead 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -54,7 +54,7 @@ class project_timebox_fill(osv.osv_memory):
         if not data[0]['task_ids']:
             return {}
         self.pool.get('project.task').write(cr, uid, data[0]['task_ids'], {'timebox_id':data[0]['timebox_to_id']})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 project_timebox_fill()
 
diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po
index fad0def6117..c339a0a6d01 100644
--- a/addons/project_issue/i18n/de.po
+++ b/addons/project_issue/i18n/de.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-28 11:40+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 10:25+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
@@ -35,7 +36,7 @@ msgstr "Arbeitszeit für Eröffnung"
 #. module: project_issue
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 
 #. module: project_issue
 #: field:project.issue,date_open:0
@@ -98,7 +99,7 @@ msgstr ""
 #. module: project_issue
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index 06b8db115fd..852d9802d9e 100644
--- a/addons/project_issue/i18n/es.po
+++ b/addons/project_issue/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 05:53+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 10:26+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
@@ -80,7 +80,7 @@ msgstr ""
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_version
 msgid "project.issue.version"
-msgstr ""
+msgstr "proyecto.incidencia.versión"
 
 #. module: project_issue
 #: field:project.issue,day_open:0
@@ -126,7 +126,7 @@ msgstr "Tarea"
 #. module: project_issue
 #: view:board.board:0
 msgid "Issues By Stage"
-msgstr ""
+msgstr "Incidencias por etapa"
 
 #. module: project_issue
 #: field:project.issue,partner_mobile:0
@@ -150,13 +150,13 @@ msgstr "Proyecto"
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
 msgid "My Open Project issues"
-msgstr ""
+msgstr "Mis incidencias de proyecto abiertas"
 
 #. module: project_issue
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
@@ -172,7 +172,7 @@ msgstr "Fecha de cierre"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Search"
-msgstr ""
+msgstr "Buscar en el gestor de incidencias"
 
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
@@ -222,7 +222,7 @@ msgstr " (copia)"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #. module: project_issue
 #: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
@@ -242,22 +242,22 @@ msgstr "Estadísticas"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Convert To Task"
-msgstr ""
+msgstr "Convertir a tarea"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Issues Analysis"
-msgstr ""
+msgstr "Análisis de incidencias"
 
 #. module: project_issue
 #: field:project.issue.version,name:0
 msgid "Version Number"
-msgstr ""
+msgstr "Número de versión"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Next"
-msgstr ""
+msgstr "Siguiente"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -265,12 +265,12 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioridad"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Enviar nuevo correo eléctronico"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -278,17 +278,17 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,version_id:0
 msgid "Version"
-msgstr ""
+msgstr "Versión"
 
 #. module: project_issue
 #: model:ir.module.module,shortdesc:project_issue.module_meta_information
 msgid "Issue Management in Project Management"
-msgstr ""
+msgstr "Gestión de incidencias en gestión de proyectos"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "Pending Issues"
-msgstr ""
+msgstr "Incidencias pendientes"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -298,40 +298,40 @@ msgstr ""
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
 msgid "Issue Categories"
-msgstr ""
+msgstr "Categorías de incidencias"
 
 #. module: project_issue
 #: field:project.issue,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Correo electrónico"
 
 #. module: project_issue
 #: field:project.issue,canal_id:0
 #: field:project.issue.report,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Canal"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "La más baja"
 
 #. module: project_issue
 #: field:project.issue,create_date:0
 #: field:project.issue.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: project_issue
 #: field:project.issue,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Teléfono"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Cambiar a borrador"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -342,72 +342,72 @@ msgstr "Hoy"
 #: model:ir.actions.act_window,name:project_issue.open_board_project_issue
 #: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
 msgid "Project Issue Dashboard"
-msgstr ""
+msgstr "Cuadro de mandos de incidencias de proyecto"
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: project_issue
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act
 msgid "Categories"
-msgstr ""
+msgstr "Categorías"
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 #: field:project.issue.report,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Etapa"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "History Information"
-msgstr ""
+msgstr "Información histórica"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
 #: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
 msgid "Project issues"
-msgstr ""
+msgstr "Incidencias proyecto"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.project_issue_version_action
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
 msgid "Versions"
-msgstr ""
+msgstr "Versiones"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "My Open Project Issue"
-msgstr ""
+msgstr "Mi incidencia de proyecto abierta"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
 msgid "My Project Issues"
-msgstr ""
+msgstr "Mis incidencias de proyecto"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Contact"
-msgstr ""
+msgstr "Contacto"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Mi tablero"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "My Issues"
-msgstr ""
+msgstr "Mis incidencias"
 
 #. module: project_issue
 #: help:project.issue,canal_id:0
@@ -429,27 +429,27 @@ msgstr ""
 #: code:addons/project_issue/project_issue.py:0
 #, python-format
 msgid "Tasks"
-msgstr ""
+msgstr "Tareas"
 
 #. module: project_issue
 #: field:project.issue.report,nbr:0
 msgid "# of Issues"
-msgstr ""
+msgstr "núm. de tareas"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Tree"
-msgstr ""
+msgstr "Árbol del gestor de incidencias"
 
 #. module: project_issue
 #: help:project.issue,assigned_to:0
@@ -461,29 +461,29 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
-msgstr ""
+msgstr "proyecto.incidencia.informe"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
 #: view:project.issue:0
 #, python-format
 msgid "Escalate"
-msgstr ""
+msgstr "Escalar"
 
 #. module: project_issue
 #: model:crm.case.categ,name:project_issue.feature_request_categ
 msgid "Feature Requests"
-msgstr ""
+msgstr "Peticiones de funcionalidades"
 
 #. module: project_issue
 #: field:project.issue,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Actualizar fecha"
 
 #. module: project_issue
 #: model:ir.module.module,description:project_issue.module_meta_information
@@ -499,7 +499,7 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoría"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -513,30 +513,33 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Estas direcciones de correo serán añadidas al campo CC para todos los "
+"correos entrantes y salientes de este registro antes de ser enviados. Separe "
+"las diferentes direcciones de correo con una coma."
 
 #. module: project_issue
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Baja"
 
 #. module: project_issue
 #: field:project.issue,date_closed:0
 #: selection:project.issue,state:0
 #: selection:project.issue.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Cerrada"
 
 #. module: project_issue
 #: field:project.issue.report,delay_close:0
 msgid "Avg. Delay to Close"
-msgstr ""
+msgstr "Retraso prom. hasta cierre"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -544,12 +547,12 @@ msgstr ""
 #: view:project.issue.report:0
 #: selection:project.issue.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendiente"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -559,18 +562,18 @@ msgstr ""
 #. module: project_issue
 #: view:board.board:0
 msgid "Current Issues"
-msgstr ""
+msgstr "Incidencias actuales"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -581,113 +584,113 @@ msgstr ""
 #: view:project.issue:0
 #: selection:project.issue,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Por hacer"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: project_issue
 #: field:project.issue,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Días para el cierre"
 
 #. module: project_issue
 #: field:project.issue,active:0
 #: field:project.issue.version,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activa"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Search"
-msgstr ""
+msgstr "Buscar"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Tree"
-msgstr ""
+msgstr "Árbol de gestión de funcionalidades"
 
 #. module: project_issue
 #: model:crm.case.categ,name:project_issue.bug_categ
 msgid "Bugs"
-msgstr ""
+msgstr "Fallos"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "Issues By State"
-msgstr ""
+msgstr "Incidencias por estado"
 
 #. module: project_issue
 #: view:project.issue:0
 #: field:project.issue,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: project_issue
 #: field:project.issue,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contacto empresa"
 
 #. module: project_issue
 #: field:project.issue,type_id:0
 msgid "Resolution"
-msgstr ""
+msgstr "Resolución"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "History"
-msgstr ""
+msgstr "Histórico"
 
 #. module: project_issue
 #: field:project.issue,assigned_to:0
 #: view:project.issue.report:0
 #: field:project.issue.report,assigned_to:0
 msgid "Assigned to"
-msgstr ""
+msgstr "Asignada a"
 
 #. module: project_issue
 #: field:project.project,reply_to:0
 msgid "Reply-To Email Address"
-msgstr ""
+msgstr "Responder a la dirección de correo electrónico"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "La más alta"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjuntos"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Form"
-msgstr ""
+msgstr "Formulario de gestión de incidencias"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -695,38 +698,38 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: project_issue
 #: view:project.issue.version:0
 msgid "Issue Version"
-msgstr ""
+msgstr "Versión incidencia"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicación"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: project_issue
 #: view:project.issue:0
 #: selection:project.issue.report,state:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all
@@ -734,7 +737,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_track
 #: view:project.issue:0
 msgid "Issues"
-msgstr ""
+msgstr "Incidencias"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
@@ -743,7 +746,7 @@ msgstr ""
 #: model:ir.ui.menu,name:project_issue.menu_project_confi
 #: view:project.issue.report:0
 msgid "Project Issue"
-msgstr ""
+msgstr "Indicencia proyecto"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -751,70 +754,70 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: project_issue
 #: help:project.issue,progress:0
 msgid "Computed as: Time Spent / Total Time."
-msgstr ""
+msgstr "Calculado como: Tiempo dedicado / Tiempo total."
 
 #. module: project_issue
 #: view:project.issue:0
 #: view:project.issue.report:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #. module: project_issue
 #: help:project.issue,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Estas personas recibirán correo electronico."
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Reply"
-msgstr ""
+msgstr "Responder"
 
 #. module: project_issue
 #: field:project.issue,name:0
 msgid "Issue"
-msgstr ""
+msgstr "Incidencia"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Search"
-msgstr ""
+msgstr "Búsqueda de gestión de funcionalidades"
 
 #. module: project_issue
 #: view:project.issue:0
 #: field:project.issue,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: project_issue
 #: field:project.issue,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Equipo de ventas"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_report
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 msgid "Issue Analysis"
-msgstr ""
+msgstr "Análisis de incidencias"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Sale Team    "
-msgstr ""
+msgstr "Equipo de ventas    "
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -825,7 +828,7 @@ msgstr ""
 #. module: project_issue
 #: field:project.issue,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nombre del empleado"
 
 #. module: project_issue
 #: help:project.issue,state:0
@@ -842,23 +845,23 @@ msgstr ""
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
 #, python-format
 msgid "Issue '%s' has been opened."
-msgstr ""
+msgstr "La incidencia '%s' ha sido abierta."
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
-msgstr ""
+msgstr "Descripción funcionalidad"
 
 #. module: project_issue
 #: field:project.project,project_escalation_id:0
 msgid "Project Escalation"
-msgstr ""
+msgstr "Escalado de proyecto"
 
 #. module: project_issue
 #: help:project.issue,section_id:0
@@ -870,23 +873,23 @@ msgstr ""
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mes-1"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
 #, python-format
 msgid "Issue '%s' has been closed."
-msgstr ""
+msgstr "La incidencia '%s' ha sido cerrada."
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "References"
-msgstr ""
+msgstr "Referencias"
 
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
@@ -896,13 +899,13 @@ msgstr ""
 #. module: project_issue
 #: field:project.issue,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:0
 #, python-format
 msgid "No Title"
-msgstr ""
+msgstr "Sin título"
 
 #. module: project_issue
 #: help:project.issue.report,delay_close:0
@@ -914,7 +917,7 @@ msgstr ""
 #: view:project.issue.report:0
 #: field:project.issue.report,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Equipo de ventas"
 
 #. module: project_issue
 #: field:project.issue.report,working_hours_close:0
@@ -925,28 +928,28 @@ msgstr ""
 #: selection:project.issue,priority:0
 #: selection:project.issue.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Alta"
 
 #. module: project_issue
 #: field:project.issue,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Fecha límite"
 
 #. module: project_issue
 #: field:project.issue,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Última acción"
 
 #. module: project_issue
 #: view:project.issue.report:0
 #: field:project.issue.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: project_issue
 #: field:project.issue,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duración"
 
 #. module: project_issue
 #: view:board.board:0
diff --git a/addons/project_issue/i18n/lv.po b/addons/project_issue/i18n/lv.po
index 5daeaab2ad1..e1058f16d04 100644
--- a/addons/project_issue/i18n/lv.po
+++ b/addons/project_issue/i18n/lv.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-21 14:41+0000\n"
+"PO-Revision-Date: 2010-12-31 10:59+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-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
 msgid "Avg. Delay to Open"
-msgstr ""
+msgstr "Vidējā uzsākšanas aizkave"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -73,7 +73,7 @@ msgstr "Sekotāju e-pasti"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Close Working hours"
-msgstr ""
+msgstr "Pabeigšanas darba stundas"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_version
@@ -96,7 +96,7 @@ msgstr ""
 #. module: project_issue
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Kļūda! Nedrīkst piešķirt eskalāciju uz to pašu projektu!"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -175,7 +175,7 @@ msgstr "Incidentu reģistra meklēšana"
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
-msgstr ""
+msgstr "Vidējās darba stundas līdz uzsākšanai"
 
 #. module: project_issue
 #: field:project.issue,date_action_next:0
@@ -380,7 +380,7 @@ msgstr "Projekta incidenti"
 #: model:ir.actions.act_window,name:project_issue.project_issue_version_action
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
 msgid "Versions"
-msgstr ""
+msgstr "Versijas"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -452,7 +452,7 @@ msgstr "Incidentu reģistra koks"
 #. module: project_issue
 #: help:project.issue,assigned_to:0
 msgid "This is the current user to whom the related task have been assigned"
-msgstr ""
+msgstr "Šis ir lietotājs, kuram tika uzticēts šis uzdevums"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -631,7 +631,7 @@ msgstr "Jaunu iespēju reģistra koks"
 #. module: project_issue
 #: model:crm.case.categ,name:project_issue.bug_categ
 msgid "Bugs"
-msgstr ""
+msgstr "Kļūdas"
 
 #. module: project_issue
 #: view:board.board:0
@@ -807,12 +807,12 @@ msgstr "Maijs"
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_report
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 msgid "Issue Analysis"
-msgstr ""
+msgstr "Pieteikuma analīze"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Sale Team    "
-msgstr ""
+msgstr "Pārdošanas komanda    "
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -944,12 +944,12 @@ msgstr "Gads"
 #. module: project_issue
 #: field:project.issue,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Ilgums"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "My Open Issues by Creation Date"
-msgstr ""
+msgstr "Mani nepabeigtie pieteikumi pēc izveidošanas datuma"
 
 #~ msgid "Maintenance"
 #~ msgstr "Uzturēšana"
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index 93a06e9e31c..1dae8050454 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -84,7 +84,7 @@ msgid "Days to Open"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "You cannot escalate this issue.\n"
 "The relevant Project has not configured the Escalation Project!"
@@ -154,7 +154,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:360
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -203,7 +203,7 @@ msgid "Partner"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:464
 #, python-format
 msgid " (copy)"
 msgstr ""
@@ -213,11 +213,6 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#. module: project_issue
-#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
-msgid "Issues such as system bugs, client complains, material breakdowns are collected here. You can define the stages assigned to the resolution of the issue on the project. (analysis, development, done) Using the mailgateway module, the issues can be integrated to an email address (example: support@mycompany.com)"
-msgstr ""
-
 #. module: project_issue
 #: view:project.issue:0
 msgid "Statistics"
@@ -404,7 +399,7 @@ msgid "You can use the issues tracker in OpenERP to handle bugs in the software
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:283
 #, python-format
 msgid "Tasks"
 msgstr ""
@@ -447,7 +442,7 @@ msgid "project.issue.report"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:362
 #: view:project.issue:0
 #, python-format
 msgid "Escalate"
@@ -738,6 +733,11 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid "Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+
 #. module: project_issue
 #: view:project.issue:0
 msgid "Details"
@@ -815,7 +815,7 @@ msgid "February"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:61
 #, python-format
 msgid "Issue '%s' has been opened."
 msgstr ""
@@ -841,7 +841,7 @@ msgid "Month-1"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:76
 #, python-format
 msgid "Issue '%s' has been closed."
 msgstr ""
@@ -867,7 +867,7 @@ msgid "ID"
 msgstr ""
 
 #. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:377
 #, python-format
 msgid "No Title"
 msgstr ""
diff --git a/addons/project_issue_sheet/i18n/es.po b/addons/project_issue_sheet/i18n/es.po
index 2574ee627f0..35a84f00278 100644
--- a/addons/project_issue_sheet/i18n/es.po
+++ b/addons/project_issue_sheet/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:26+0000\n"
+"PO-Revision-Date: 2010-12-28 07:37+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue_sheet
diff --git a/addons/project_issue_sheet/i18n/fr.po b/addons/project_issue_sheet/i18n/fr.po
index 4d85bbe4869..c6a461a8055 100644
--- a/addons/project_issue_sheet/i18n/fr.po
+++ b/addons/project_issue_sheet/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:44+0000\n"
-"PO-Revision-Date: 2010-08-30 12:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-12-31 11:01+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:55+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_issue_sheet
@@ -24,11 +24,15 @@ msgid ""
 "Issues/Bugs Management in Project\n"
 "                "
 msgstr ""
+"\n"
+"                    Ce module ajoute le système de feuille de temps pour la "
+"gestion des incidents/bogues dans l'application Projet\n"
+"                "
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Ligne analytique"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_project_issue
@@ -38,17 +42,17 @@ msgstr ""
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Ligne de feuille de temps"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
 msgid "Timesheet"
-msgstr ""
+msgstr "Feuille de temps"
 
 #. module: project_issue_sheet
 #: field:project.issue,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Compte Analytique"
 
 #. module: project_issue_sheet
 #: view:project.issue:0
@@ -58,17 +62,19 @@ msgstr ""
 #. module: project_issue_sheet
 #: field:account.analytic.line,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: project_issue_sheet
 #: field:project.issue,timesheet_ids:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Feuilles de temps"
 
 #. module: project_issue_sheet
 #: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
 msgid "Add the Timesheet support for Issue Management in Project Management"
 msgstr ""
+"Ajoute le système de feuille de temps pour la gestion des incidents des "
+"projets"
 
 #. module: project_issue_sheet
 #: field:hr.analytic.timesheet,issue_id:0
diff --git a/addons/project_issue_sheet/i18n/lv.po b/addons/project_issue_sheet/i18n/lv.po
new file mode 100644
index 00000000000..2b2da0f8ca3
--- /dev/null
+++ b/addons/project_issue_sheet/i18n/lv.po
@@ -0,0 +1,77 @@
+# Latvian 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-31 10:58+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: 2011-01-01 05:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid ""
+"\n"
+"                    This module adds the Timesheet support for the "
+"Issues/Bugs Management in Project\n"
+"                "
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_project_issue
+msgid "Project Issue"
+msgstr "Projekta incidents"
+
+#. module: project_issue_sheet
+#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Darba laika uzskaites Tabeles Ieraksts"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Timesheet"
+msgstr "Darba laika uzskaites Tabele"
+
+#. module: project_issue_sheet
+#: field:project.issue,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analītiskais Konts"
+
+#. module: project_issue_sheet
+#: view:project.issue:0
+msgid "Worklogs"
+msgstr "Darba žurnāls"
+
+#. module: project_issue_sheet
+#: field:account.analytic.line,create_date:0
+msgid "Create Date"
+msgstr "Izveidošanas datums"
+
+#. module: project_issue_sheet
+#: field:project.issue,timesheet_ids:0
+msgid "Timesheets"
+msgstr "Darba uzkaites Tabeles"
+
+#. module: project_issue_sheet
+#: model:ir.module.module,shortdesc:project_issue_sheet.module_meta_information
+msgid "Add the Timesheet support for Issue Management in Project Management"
+msgstr "Pievienot laika tabeļu atbalstu projektu incidentu vadībā"
+
+#. module: project_issue_sheet
+#: field:hr.analytic.timesheet,issue_id:0
+msgid "Issue"
+msgstr ""
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index 9b903251abe..657e79b7e2a 100644
--- a/addons/project_issue_sheet/i18n/project_issue_sheet.pot
+++ b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index 42aab552044..9c4a72f7a7c 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:05+0000\n"
+"PO-Revision-Date: 2010-12-31 14:22+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: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -94,23 +94,24 @@ msgstr ""
 "            - Projekt Phasen werden durch den Projektmanager erstellt und "
 "gemanagt.\n"
 "            - Berechnung der Terminierung v. Projektphasen:  Berechnung von "
-"Start und EndeDatum der Phasen die durch die verschiedenen Stadien Entwurf, "
-"Offen oder Unerledigt gekennzeichnet sind.\n"
-"       Wenn kein bestimmtes Projekt vorgegeben ist werden nur die Stadien "
-"Entwurf, Offen,Unerledigt herangezogen.\n"
+"Start und Ende Datum der Phasen die durch die verschiedenen Stadien Entwurf, "
+"Offen oder Im Wartezustand gekennzeichnet sind.\n"
+"       Wenn kein bestimmtes Projekt vorgegeben ist, werden nur die Stadien "
+"Entwurf, Offen, Im Wartezustand herangezogen.\n"
 "            - Berechnung der Aufgaben Terminierung: Dieses funktioniert in "
 "gleicher Weise wie der Klick auf den Button bei den einzelnen Projektphasen. "
 "Herangezogen wird das Projekt als solches, berechnet werden alle Aufgaben "
-"der Stadien Offen,Entwurf und Unerledigt.\n"
-"            - Terminiere Aufgaben: Alle Aufgaben in den Stadien Entwurf, "
-"Unerledigt und Offen werden ausgehend vom Start Datum der Phasen berechnet.\n"
+"der Stadien Offen,Entwurf und Im Wartezustand.\n"
+"            - Terminiere Aufgaben: Alle Aufgaben in den Stadien Entwurf, Im "
+"Wartezustand und Offen werden ausgehend vom Start Datum der Phasen "
+"berechnet.\n"
 "\n"
 "    "
 
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
@@ -186,7 +187,8 @@ msgstr "Ende Datum"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
-msgid "Ending Date of the phase"
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
 msgstr "Ende Datum d. Phase"
 
 #. module: project_long_term
@@ -539,7 +541,10 @@ msgstr "Phase"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
-msgid "Starting Date of the phase"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
 msgstr "Beginn der Phase"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/en_US.po b/addons/project_long_term/i18n/en_US.po
index 00e0d982c1c..15a3bd4034b 100644
--- a/addons/project_long_term/i18n/en_US.po
+++ b/addons/project_long_term/i18n/en_US.po
@@ -171,8 +171,8 @@ msgstr "Usability of this resource for this project phase in percentage (=50%)"
 #. module: project_long_term
 #: help:project.phase,date_end:0
 #: field:project.resource.allocation,phase_id_date_end:0
-msgid "Ending Date of the phase"
-msgstr "Ending Date of the phase"
+msgid "It's computed by the scheduler according to the start date and the duration."
+msgstr "It's computed by the scheduler according to the start date and the duration."
 
 #. module: project_long_term
 #: view:project.compute.phases:0
@@ -451,8 +451,8 @@ msgstr "Phase"
 #. module: project_long_term
 #: help:project.phase,date_start:0
 #: field:project.resource.allocation,phase_id_date_start:0
-msgid "Starting Date of the phase"
-msgstr "Starting Date of the phase"
+msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
+msgstr "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
 
 #. module: project_long_term
 #: help:project.phase,state:0
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
new file mode 100644
index 00000000000..97294142262
--- /dev/null
+++ b/addons/project_long_term/i18n/es.po
@@ -0,0 +1,623 @@
+# 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-31 10:23+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: 2011-01-01 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr "Gestión de proyectos a largo plazo"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of Phases"
+msgstr "Calcular planificación de fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Siguientes fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Tareas del proyecto"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fases"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr ""
+"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
+"del proyecto."
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Resources Allocation"
+msgstr "Asignación de recursos"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Programa"
+
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid ""
+"\n"
+"\n"
+"        Long Term Project management module that tracks planning, "
+"scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of "
+"the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the "
+"draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler "
+"button on project.phase. It takes the project as argument and computes all "
+"the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and "
+"open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No se pueden crear tareas recursivas."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
+msgstr "Asignación de recursos"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "Day"
+msgstr "Día"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Calcular un sólo proyecto"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Fases previas"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "UdM (Unidad de Medida) es la unidad de medida para la duración"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,project_id:0
+#: view:project.task:0
+msgid "Project"
+msgstr "Proyecto"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#, python-format
+msgid "Error!"
+msgstr "¡Error!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "No tasks to compute for Project '%s'."
+msgstr ""
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Fecha de fin"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr "Planificación"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Fecha límite"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+msgid "Compute Phase Scheduling"
+msgstr "Calcular planificación de fases"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (copia)"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
+msgstr "Disponibilidad"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Estado"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "C_alcular"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr ""
+"Calcular planificación de fases para todos o el proyecto especificado"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "UdM duración"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+msgid "Compute Task Scheduling"
+msgstr "Calcular planificación de tareas"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Fecha de inicio mínima"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_resource_allocation
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Project Resource Allocation"
+msgstr "Asignación de recursos de proyecto"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr "Calcular planificación de tarea"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr "Recursos"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"\t           "
+msgstr ""
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Fecha de inicio"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Tareas relacionadas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Tareas de proyecto"
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr "Recursos de proyecto"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr "_Aceptar"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_schedule_tasks
+msgid "project.schedule.tasks"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
+msgid "Start Date"
+msgstr "Fecha inicio"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr "Asignación de recursos"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your resources allocation, describe different tasks and link your "
+"phase to previous and next ones, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"human resources, convert your phases into a series of tasks when you start "
+"working on it."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Pendiente"
+
+#. module: project_long_term
+#: field:project.resource.allocation,name:0
+msgid "unknown"
+msgstr "desconocido"
+
+#. module: project_long_term
+#: field:project.resource.allocation,user_id:0
+msgid "User"
+msgstr "Usuario"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr "Detalles tarea"
+
+#. module: project_long_term
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "No responsible person assigned !"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "You must assign a responsible person for phase '%s' !"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "Should have Resources Allocation or Project Members!"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Restricciones"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Hecho"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Horas restantes"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Other Info"
+msgstr "Otra información"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr "Responsable"
+
+#. module: project_long_term
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Horario de trabajo"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Current"
+msgstr "Actual"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Comenzar fase"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#, python-format
+msgid "Please Specify Project to be schedule"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr "Total horas"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "Fase"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
+msgid "End Date"
+msgstr "Fecha de fin"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr "Periodo de trabajo"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr "Detalle recurso"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+#: view:project.phase:0
+msgid "Scheduling"
+msgstr "Planificación"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "No tasks to compute for Phase '%s'."
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: field:project.resource.allocation,phase_id:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+msgid "Project Phase"
+msgstr "Fase proyecto"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Calcular fases del proyecto"
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr "Mensaje"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "No se permiten bucles en fases"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr "Calcular todos los proyectos"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Ausencias recursos"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
+#: view:project.phase:0
+#: view:project.schedule.tasks:0
+msgid "Schedule Tasks"
+msgstr "Planificar tareas"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Por defecto en días"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Duración"
+
+#~ msgid "Ending Date of the phase"
+#~ msgstr "Fecha de fin de la fase"
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index 0a4f1dbaf71..3b7d111daac 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/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:44+0000\n"
-"PO-Revision-Date: 2010-12-24 22:25+0000\n"
+"PO-Revision-Date: 2010-12-31 11:08+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-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -164,7 +164,8 @@ msgstr "Date de fin"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
-msgid "Ending Date of the phase"
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
 msgstr "Date de fin de la phase"
 
 #. module: project_long_term
@@ -518,7 +519,10 @@ msgstr "Phase"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
-msgid "Starting Date of the phase"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
 msgstr "Date de début de la phase"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
new file mode 100644
index 00000000000..508efda1634
--- /dev/null
+++ b/addons/project_long_term/i18n/lv.po
@@ -0,0 +1,623 @@
+# Latvian 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-31 10:24+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: 2011-01-01 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_long_term
+#: model:ir.module.module,shortdesc:project_long_term.module_meta_information
+msgid "Long Term Project Management"
+msgstr "Ilgtermiņa projektu vadība"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of Phases"
+msgstr "Aprēķināt fāžu grafiku"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,next_phase_ids:0
+msgid "Next Phases"
+msgstr "Nākamās fāzes"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Project's Tasks"
+msgstr "Projekta uzdevumi"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phases
+msgid "Phases"
+msgstr "Fāzes"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Group By..."
+msgstr "Grupēt pēc..."
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Kļūda! Projekta sākuma datumam jābūt mazākam nekā beigu."
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Resources Allocation"
+msgstr "Resursu iedalīšana"
+
+#. module: project_long_term
+#: field:project.compute.phases,target_project:0
+msgid "Schedule"
+msgstr "Grafiks"
+
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid ""
+"\n"
+"\n"
+"        Long Term Project management module that tracks planning, "
+"scheduling, resources allocation.\n"
+"        Mainly used with Big project management.\n"
+"            - Project Phases will be maintained by Manager of the project\n"
+"            - Compute Phase Scheduling: Compute start date and end date of "
+"the phases which are in draft,open and pending state of the project given.\n"
+"                                        If no project given then all the "
+"draft,open and pending state phases will be taken\n"
+"            - Compute Task Scheduling: This works same as the scheduler "
+"button on project.phase. It takes the project as argument and computes all "
+"the open,draft and pending tasks\n"
+"            - Schedule Tasks: All the tasks which are in draft,pending and "
+"open state are scheduled with taking the phase's start date\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: project_long_term
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+msgid "Resource Allocations"
+msgstr "Resursu iedalīšanas"
+
+#. module: project_long_term
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Kļūda! Nedrīkst piešķirt eskalāciju uz to pašu projektu!"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "Day"
+msgstr "Diena"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute a Single Project"
+msgstr "Aprēķināt vienu projektu"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,previous_phase_ids:0
+msgid "Previous Phases"
+msgstr "Iepriekš. fāzes"
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
+msgstr "Mērv. (mērvienība) ir ilguma mērvienība"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_project
+#: field:project.compute.phases,project_id:0
+#: field:project.compute.tasks,project_id:0
+#: view:project.phase:0
+#: field:project.phase,project_id:0
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,project_id:0
+#: view:project.task:0
+msgid "Project"
+msgstr "Projekts"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#, python-format
+msgid "Error!"
+msgstr "Kļūda!"
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr "Atcelts"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "No tasks to compute for Project '%s'."
+msgstr "Projektam '%s' nav uzdevumu ko aprēķināt."
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_end:0
+msgid "Ending Date"
+msgstr "Beigu Datums"
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Planning"
+msgstr "Plānošana"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr "Termiņš"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "_Cancel"
+msgstr "_Atcelt"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+msgid "Compute Phase Scheduling"
+msgstr "Aprēķināt fāzes grafiku"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid " (copy)"
+msgstr " (kopija)"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,useability:0
+msgid "Availability"
+msgstr "Pieejamība"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,state:0
+msgid "State"
+msgstr "Stāvoklis"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr "A_prēķināt"
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+msgid "Compute Scheduling of phases for all or specified project"
+msgstr "Aprēķināt fāžu grafiku visiem vai norādītajam projektam"
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration UoM"
+msgstr "Ilguma mērv."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
+#: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
+msgid "Compute Task Scheduling"
+msgstr "Aprēķināt uzdevumu grafiku"
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr "Minimālais sākuma datums"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_resource_allocation
+#: view:project.phase:0
+#: view:project.resource.allocation:0
+msgid "Project Resource Allocation"
+msgstr "Projekta resursu iedalīšana"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task"
+msgstr "Aprēķināt uzdevumu grafiku"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
+#: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+#: view:project.resource.allocation:0
+msgid "Resources"
+msgstr "Resursi"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid ""
+"To schedule phases of all or a specified project. It then open a gantt "
+"view.\n"
+"\t           "
+msgstr ""
+
+#. module: project_long_term
+#: help:project.resource.allocation,date_start:0
+msgid "Starting Date"
+msgstr "Sākuma Datums"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Related Tasks"
+msgstr "Saistītie uzdevumi"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: project_long_term
+#: help:project.resource.allocation,useability:0
+msgid ""
+"Availability of this resource for this project phase in percentage (=50%)"
+msgstr "Šī resursa pieejamība šai projekta fāzei procentos (piem., 50%)"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr "uzspiest fāzei sākties pēc šī datuma"
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr "Projekta uzdevumi"
+
+#. module: project_long_term
+#: field:project.phase,resource_ids:0
+msgid "Project Resources"
+msgstr "Projekta resursi"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "_Ok"
+msgstr "_Labi"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr "Mēnesis"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr "Fāzes sākuma datumam jābūt mazākam par fāzes beigu datumu."
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_schedule_tasks
+msgid "project.schedule.tasks"
+msgstr "project.schedule.tasks"
+
+#. module: project_long_term
+#: field:project.phase,date_start:0
+#: field:project.resource.allocation,date_start:0
+msgid "Start Date"
+msgstr "Sākuma datums"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Resource Allocation"
+msgstr "Resursu iedalīšana"
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr "uzspiest fāzei beigties pirms šī datuma"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Draft"
+msgstr "Melnraksts"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid ""
+"A project can be split into the different phases. For each phase, you can "
+"define your resources allocation, describe different tasks and link your "
+"phase to previous and next ones, add date constraints for the automated "
+"scheduling. Use the long term planning in order to planify your available "
+"human resources, convert your phases into a series of tasks when you start "
+"working on it."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr "Neizlemts"
+
+#. module: project_long_term
+#: field:project.resource.allocation,name:0
+msgid "unknown"
+msgstr "nezināms"
+
+#. module: project_long_term
+#: field:project.resource.allocation,user_id:0
+msgid "User"
+msgstr "Lietotājs"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Task Detail"
+msgstr "Uzdevuma informācija"
+
+#. module: project_long_term
+#: help:project.project,resource_calendar_id:0
+msgid "Timetable working hours to adjust the gantt diagram report"
+msgstr "Darba laika saraksts, ar ko pielāgot Ganta diagrammas atskaiti"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
+msgstr "Projekts - aprēķināt uzdevumus"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "No responsible person assigned !"
+msgstr "Nav nozīmēta atbildīgā persona!"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "Error"
+msgstr "Kļūda"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "You must assign a responsible person for phase '%s' !"
+msgstr "Fāzei '%s' jānozīmē atbildīgo personu!"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "Should have Resources Allocation or Project Members!"
+msgstr "Nepieciešama resursu iedalīšana vai projekta dalībnieki!"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Constraints"
+msgstr "Ierobežojumi"
+
+#. module: project_long_term
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr "Fāžu sarakstā attēlo secībā pēc kārtas."
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr "Projekta fāzes"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr "Pabeigts"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr "Progresā"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr "Atlikušās Stundas"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Other Info"
+msgstr "Cita informācija"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,responsible_id:0
+msgid "Responsible"
+msgstr "Atbildīgais"
+
+#. module: project_long_term
+#: field:project.project,resource_calendar_id:0
+msgid "Working Time"
+msgstr "Darba Laiks"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Current"
+msgstr "Pašreizējā"
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Start Phase"
+msgstr "Sākt fāzi"
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#, python-format
+msgid "Please Specify Project to be schedule"
+msgstr "Lūdzu, norādiet plānojamo projektu"
+
+#. module: project_long_term
+#: view:project.phase:0
+#: field:project.phase,total_hours:0
+msgid "Total Hours"
+msgstr "Stundas Kopā"
+
+#. module: project_long_term
+#: view:project.schedule.tasks:0
+msgid "Task Scheduling completed successfully."
+msgstr "Uzdevumu grafika veidošana bija veiksmīga"
+
+#. module: project_long_term
+#: view:project.compute.tasks:0
+msgid "Compute Scheduling of Task for specified project."
+msgstr "Aprēķināt uzdevumu grafiku norādītajām projektam."
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+msgid "Phase"
+msgstr "Fāze"
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid ""
+"If the phase is created the state 'Draft'.\n"
+" If the phase is started, the state becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' state.                        "
+"          \n"
+" If the phase is over, the states is set to 'Done'."
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.resource.allocation,date_end:0
+msgid "End Date"
+msgstr "Beigu datums"
+
+#. module: project_long_term
+#: view:project.resource.allocation:0
+#: field:project.resource.allocation,resource_id:0
+msgid "Resource"
+msgstr "Resurss"
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr "Nosaukums"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Period"
+msgstr "Darba laiks"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_resource_resource
+msgid "Resource Detail"
+msgstr "Resursa informācija"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+#: view:project.phase:0
+msgid "Scheduling"
+msgstr "Plānošana"
+
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:0
+#, python-format
+msgid "No tasks to compute for Phase '%s'."
+msgstr "Fāzei '%s' nav uzdevumu ko aprēķināt"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_phase
+#: view:project.phase:0
+#: field:project.resource.allocation,phase_id:0
+#: view:project.task:0
+#: field:project.task,phase_id:0
+msgid "Project Phase"
+msgstr "Projekta fāze"
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_phases
+msgid "Project Compute Phases"
+msgstr "Projekts: aprēķināt fāzes"
+
+#. module: project_long_term
+#: field:project.schedule.tasks,msg:0
+msgid "Message"
+msgstr "Ziņa"
+
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr "Cilpas fāzēs nav atļautas"
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr "Secība"
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All Projects"
+msgstr "Aprēķināt visus projektus"
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr "Resursu lapas"
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_schedule_tasks
+#: view:project.phase:0
+#: view:project.schedule.tasks:0
+msgid "Schedule Tasks"
+msgstr "Ieplānot uzdevumus"
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr "Pēc noklusējuma dienās"
+
+#. module: project_long_term
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr "Ilgums"
+
+#~ msgid "Ending Date of the phase"
+#~ msgstr "Fāzes beigu datums"
+
+#~ msgid "Starting Date of the phase"
+#~ msgstr "Fāzes sākuma datums"
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index 1364eb70a97..7f9ba5b37ef 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-05 09:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 11:08+0000\n"
+"Last-Translator: Sbh (Open ERP) <sbh@tinyerp.com>\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:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -165,7 +165,8 @@ msgstr "Data końcowa"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
-msgid "Ending Date of the phase"
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
 msgstr "Końcowa data fazy"
 
 #. module: project_long_term
@@ -505,8 +506,11 @@ msgstr "Faza"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
-msgid "Starting Date of the phase"
-msgstr "Data rozpoczęcia fazy"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
+msgstr ""
 
 #. module: project_long_term
 #: help:project.phase,state:0
@@ -641,3 +645,9 @@ msgstr "Czas trwania"
 #~ msgstr ""
 #~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
 #~ "specjalnych !"
+
+#~ msgid ""
+#~ "It's computed according to the phases order : the start date of the 1st "
+#~ "phase is set by you while the other start dates depend on the end date of "
+#~ "their previous phasesStarting Date of the phase"
+#~ msgstr "Data rozpoczęcia fazy"
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index 1824bd1df22..cfacf155fc5 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -57,6 +57,11 @@ msgstr ""
 msgid "Resources Allocation"
 msgstr ""
 
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr ""
+
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
 msgid "Schedule"
@@ -94,7 +99,7 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:130
 #, python-format
 msgid "Day"
 msgstr ""
@@ -120,6 +125,17 @@ msgstr ""
 msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
 msgstr ""
 
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:489
+#, python-format
+msgid "Resources should be allocated to your phases and Members should be assigned to your Project!"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid " It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_project
 #: field:project.compute.phases,project_id:0
@@ -133,7 +149,7 @@ msgid "Project"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -144,7 +160,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:426
 #, python-format
 msgid "No tasks to compute for Project '%s'."
 msgstr ""
@@ -154,11 +170,6 @@ msgstr ""
 msgid "Ending Date"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.phase,date_end:0
-msgid "Ending Date of the phase"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Planning"
@@ -182,12 +193,13 @@ msgid "Compute Phase Scheduling"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:192
 #, python-format
 msgid " (copy)"
 msgstr ""
 
 #. module: project_long_term
+#: view:project.phase:0
 #: view:project.resource.allocation:0
 #: field:project.resource.allocation,useability:0
 msgid "Availability"
@@ -292,6 +304,11 @@ msgstr ""
 msgid "_Ok"
 msgstr ""
 
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr ""
+
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Month"
@@ -307,6 +324,11 @@ msgstr ""
 msgid "project.schedule.tasks"
 msgstr ""
 
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid "A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on the project."
+msgstr ""
+
 #. module: project_long_term
 #: field:project.phase,date_start:0
 #: field:project.resource.allocation,date_start:0
@@ -329,11 +351,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: project_long_term
-#: model:ir.actions.act_window,help:project_long_term.act_project_phase
-msgid "A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next ones, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on it."
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
@@ -350,6 +367,11 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
+msgstr ""
+
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Task Detail"
@@ -366,29 +388,23 @@ msgid "Project Compute Tasks"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:244
 #, python-format
 msgid "No responsible person assigned !"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:489
 #, python-format
 msgid "Error"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:244
 #, python-format
 msgid "You must assign a responsible person for phase '%s' !"
 msgstr ""
 
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
-#, python-format
-msgid "Should have Resources Allocation or Project Members!"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Constraints"
@@ -431,11 +447,6 @@ msgstr ""
 msgid "Remaining Hours"
 msgstr ""
 
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Other Info"
-msgstr ""
-
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,responsible_id:0
@@ -458,7 +469,7 @@ msgid "Start Phase"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
 #, python-format
 msgid "Please Specify Project to be schedule"
 msgstr ""
@@ -484,11 +495,6 @@ msgstr ""
 msgid "Phase"
 msgstr ""
 
-#. module: project_long_term
-#: help:project.phase,date_start:0
-msgid "Starting Date of the phase"
-msgstr ""
-
 #. module: project_long_term
 #: help:project.phase,state:0
 msgid "If the phase is created the state 'Draft'.\n"
@@ -514,6 +520,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr ""
+
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
 msgid "Working Period"
@@ -526,12 +537,11 @@ msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-#: view:project.phase:0
 msgid "Scheduling"
 msgstr ""
 
 #. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:329
 #, python-format
 msgid "No tasks to compute for Phase '%s'."
 msgstr ""
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index a6e00dbaf85..2d24cac1e7a 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.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-12 09:19+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 11:07+0000\n"
+"Last-Translator: Sbh (Open ERP) <sbh@tinyerp.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_long_term
@@ -165,7 +165,8 @@ msgstr "Data de fim"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
-msgid "Ending Date of the phase"
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
 msgstr "Data de fim da fase"
 
 #. module: project_long_term
@@ -504,7 +505,10 @@ msgstr "Fase"
 
 #. module: project_long_term
 #: help:project.phase,date_start:0
-msgid "Starting Date of the phase"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
 msgstr "Data de início da fase"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 4640ea8fa48..45d75b16b05 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 from tools.translate import _
 from osv import fields, osv
@@ -105,8 +105,8 @@ class project_phase(osv.osv):
 
     _columns = {
         'name': fields.char("Name", size=64, required=True),
-        'date_start': fields.date('Start Date', help="Starting Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'date_end': fields.date('End Date', help="Ending Date of the phase", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'date_start': fields.date('Start Date', help="It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'date_end': fields.date('End Date', help=" It's computed by the scheduler according to the start date and the duration.", states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'constraint_date_start': fields.date('Minimum Start Date', help='force the phase to start after this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'constraint_date_end': fields.date('Deadline', help='force the phase to finish before this date', states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'project_id': fields.many2one('project.project', 'Project', required=True),
@@ -144,13 +144,6 @@ class project_phase(osv.osv):
             result['date_start'] = project_id.date_start
         return {'value': result}
 
-    def onchange_days(self, cr, uid, ids, project, context=None):
-        result = {}
-        for id in ids:
-            project_id = self.browse(cr, uid, id, context=context)
-            newdate = datetime.strptime(project_id.date_start, '%Y-%m-%d') + relativedelta(days=project_id.duration or 0.0)
-            result['date_end'] = newdate.strftime('%Y-%m-%d')
-        return {'value': result}
 
     def _check_date_start(self, cr, uid, phase, date_end, context=None):
        """
@@ -192,55 +185,6 @@ class project_phase(osv.osv):
        dt_end = work_times[-1][1].strftime('%Y-%m-%d')
        self.write(cr, uid, [phase.id], {'date_start': date_start.strftime('%Y-%m-%d'), 'date_end': dt_end}, context=context)
 
-    def write(self, cr, uid, ids, vals, context=None):
-        resource_calendar_obj = self.pool.get('resource.calendar')
-        resource_obj = self.pool.get('resource.resource')
-        uom_obj = self.pool.get('product.uom')
-        if context is None:
-            context = {}
-        res = super(project_phase, self).write(cr, uid, ids, vals, context=context)
-        if context.get('scheduler',False):
-            return res
-        # Consider calendar and efficiency if the phase is performed by a resource
-        # otherwise consider the project's working calendar
-
-        #TOCHECK : why need this ?
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        default_uom_id = self._get_default_uom_id(cr, uid)
-        for phase in self.browse(cr, uid, ids, context=context):
-            calendar_id = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
-            resource_id = resource_obj.search(cr, uid, [('user_id', '=', phase.responsible_id.id)],context=context)
-            if resource_id:
-                cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
-                if cal_id:
-                    calendar_id = cal_id
-
-            avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
-            # Change the date_start and date_end
-            # for previous and next phases respectively based on valid condition
-            if vals.get('date_start', False) and vals['date_start'] < phase.date_start:
-                dt_start = datetime.strptime(vals['date_start'], '%Y-%m-%d')
-                work_times = resource_calendar_obj.interval_get(cr, uid, calendar_id, dt_start, avg_hours or 0.0, resource_id and resource_id[0] or False)
-                if work_times:
-                    vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d')
-                for prv_phase in phase.previous_phase_ids:
-                    if prv_phase.id == phase.id:
-                        continue
-                    self._check_date_start(cr, uid, prv_phase, dt_start, context=context)
-
-            if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
-                dt_end = datetime.strptime(vals['date_end'], '%Y-%m-%d')
-                work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
-                if work_times:
-                    vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d')
-                for next_phase in phase.next_phase_ids:
-                    if next_phase.id == phase.id:
-                        continue
-                    self._check_date_end(cr, uid, next_phase, dt_end, context=context)
-
-        return res
-
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
@@ -282,25 +226,31 @@ class project_phase(osv.osv):
             res[phase.id] = resource_objs
         return res
 
-    def generate_schedule(self, cr, uid, ids, start_date, calendar_id=False, context=None):
+    def generate_schedule(self, cr, uid, ids, start_date=False, calendar_id=False, context=None):
         """
         Schedule phase with the start date till all the next phases are completed.
-        @param: start_dsate : start date for the phase
+        @param: start_date (datetime.datetime) : start date for the phase. It would be either Start date of phase or start date of project or system current date
         @param: calendar_id : working calendar of the project
         """
         if context is None:
             context = {}
         resource_pool = self.pool.get('resource.resource')
+        data_pool = self.pool.get('ir.model.data')
         resource_allocation_pool = self.pool.get('project.resource.allocation')
         uom_pool = self.pool.get('product.uom')
-        default_uom_id = self._get_default_uom_id(cr, uid)
+        data_model, day_uom_id = data_pool.get_object_reference(cr, uid, 'product', 'uom_day')
         for phase in self.browse(cr, uid, ids, context=context):
             if not phase.responsible_id:
                 raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,))
 
-            phase_resource_obj = resource_pool.generate_resources(cr, uid, [phase.responsible_id.id], calendar_id, context=context)
-            avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
-            duration = str(avg_hours) + 'H'
+            if not start_date:
+                start_date = phase.project_id.date_start or phase.date_start or datetime.now().strftime("%Y-%m-%d")
+                start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d") 
+            phase_resource_obj = self.generate_resources(cr, uid, [phase.id], context=context)[phase.id]
+            avg_days = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, day_uom_id)
+            if not phase_resource_obj: #TOCHECK: why need this ?
+                avg_days = avg_days - 1
+            duration = str(avg_days) + 'd'
             # Create a new project for each phase
             def Project():
                 # If project has working calendar then that
@@ -308,14 +258,17 @@ class project_phase(osv.osv):
                 start = start_date
                 minimum_time_unit = 1
                 resource = phase_resource_obj
+                working_hours_per_day = 24
+                vacation = []
                 if calendar_id:
-                    working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
+                    working_hours_per_day = 8 #TODO: it should be come from calendars
                     vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id))
-
+                working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
                 def phase():
                     effort = duration
 
             project = Task.BalancedProject(Project)
+
             s_date = project.phase.start.to_datetime()
             e_date = project.phase.end.to_datetime()
             # Recalculate date_start and date_end
@@ -344,10 +297,10 @@ class project_phase(osv.osv):
                                         'date_end': end_date.strftime('%Y-%m-%d')
                                     }, context=ctx)
             # Recursive call till all the next phases scheduled
-            for phase in phase.next_phase_ids:
-               if phase.state in ['draft', 'open', 'pending']:
-                   id_cal = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
-                   self.generate_schedule(cr, uid, [phase.id], date_start, id_cal, context=context)
+            for next_phase in phase.next_phase_ids:
+               if next_phase.state in ['draft', 'open', 'pending']:
+                   id_cal = next_phase.project_id.resource_calendar_id and next_phase.project_id.resource_calendar_id.id or False
+                   self.generate_schedule(cr, uid, [next_phase.id], date_start+timedelta(days=1), id_cal, context=context)
                else:
                    continue
         return True
@@ -368,7 +321,7 @@ class project_phase(osv.osv):
                 start_date = datetime.now().strftime("%Y-%m-%d")
             resources = resources_list.get(phase.id, [])
             calendar_id = phase.project_id.resource_calendar_id.id
-            task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['open', 'draft', 'pending'] , phase.task_ids)))
+            task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['draft'] , phase.task_ids))) #reassign only task not yet started
             if task_ids:
                 task_pool.generate_schedule(cr, uid, task_ids, resources, calendar_id, start_date, context=context)
 
@@ -440,12 +393,9 @@ class project(osv.osv):
                                                   ('state', 'in', ['draft', 'open', 'pending']),
                                                   ('previous_phase_ids', '=', False)
                                                   ])
-            start_date = project.date_start
-            if not start_date:
-                start_date = datetime.now().strftime("%Y-%m-%d")
-            start_dt = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d %H:%M")
             calendar_id = project.resource_calendar_id and project.resource_calendar_id.id or False
-            phase_pool.generate_schedule(cr, uid, phase_ids, start_dt, calendar_id, context=context)
+            start_date = False
+            phase_pool.generate_schedule(cr, uid, phase_ids, start_date, calendar_id, context=context)
         return True
 
     def schedule_tasks(self, cr, uid, ids, context=None):
@@ -507,6 +457,7 @@ class project_task(osv.osv):
         """
         Schedule the tasks according to resource available and priority.
         """
+        resource_pool = self.pool.get('resource.resource')
         if not ids:
             return False
         if context is None:
@@ -535,11 +486,14 @@ class project_task(osv.osv):
             try:
                 resource = reduce(operator.or_, resources)
             except:
-                raise osv.except_osv(_('Error'), _('Should have Resources Allocation or Project Members!'))
+                raise osv.except_osv(_('Error'), _('Resources should be allocated to your phases and Members should be assigned to your Project!'))
             minimum_time_unit = 1
-            if calendar_id:            # If project has working calendar
-                working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
+            working_hours_per_day = 24
+            vacation = []
+            if calendar_id:
+                working_hours_per_day = 8 #TODO: it should be come from calendars
                 vacation = tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context))
+            working_days = resource_pool.compute_working_calendar(cr, uid, calendar_id, context=context)
             # Dynamic creation of tasks
             task_number = 0
             for openobect_task in self.browse(cr, uid, ids, context=context):
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 6b5c826eae3..ff4cfd8575b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -63,7 +63,7 @@
                     <field name="resource_id"/>
                     <field name="phase_id"/>
                     <field name="project_id"/>
-                    <field name="useability"/>
+                    <field name="useability" string="Availability"/>
                 </tree>
             </field>
         </record>
@@ -117,7 +117,7 @@
                         </group>
                         <group colspan="6" col="6">
                             <field name="date_start"/>
-                            <field name="duration"  on_change="onchange_days(project_id)" />
+                            <field name="duration"/>
                             <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
                             <field name="date_end"/>
                         </group>
@@ -127,15 +127,15 @@
                             <field colspan="4" name="resource_ids" nolabel="1">
                                  <tree editable="bottom" string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                                    <field name="date_start"/>
-                                    <field name="date_end"/>
-                                    <field name="useability"/>
+                                    <field name="date_start" readonly="1"/>
+                                    <field name="date_end" readonly="1"/>
+                                    <field name="useability" string="Availability"/>
                                   </tree>
                                   <form string="Project Resource Allocation">
                                     <field name="resource_id" context="{'project_id':parent.project_id}"/>
-                                    <field name="date_start"/>
-                                    <field name="date_end"/>
-                                    <field name="useability"/>
+                                    <field name="date_start" readonly="1"/> 
+                                    <field name="date_end" readonly="1"/>
+                                    <field name="useability" string="Availability"/>
                                   </form>
                              </field>
                             <separator string="" colspan="4"/>
@@ -148,15 +148,19 @@
                                 <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
                             </group>
                         </page>
-                        <page string="Task Detail">
-                            <field colspan="4" name="task_ids" context="{'default_project_id' :project_id}" nolabel="1">
-                                 <tree editable="bottom" string="Project's Tasks">
+                        <page string="Tasks Details">
+                            <field colspan="4" name="task_ids" readonly="1" context="{'default_project_id' :project_id}" nolabel="1">
+                                 <tree string="Project's Tasks">
                                     <field name="sequence"/>
                                     <field name="name"/>
                                     <field name="user_id"/>
+                                    <field name="date_start"/>
+                                    <field name="date_end" />
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="project_id" invisible="1"/>
                                     <field name="total_hours" sum='Total Hours'/>
+                                    <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                    <field name="state"/>
                                   </tree>
                                   <form string="Project's Tasks">
                                       <notebook colspan="4">
@@ -165,17 +169,19 @@
                                                 <field name="name"/>
                                                 <field name="project_id"/>
                                                 <field name="user_id"/>
+                                                <field name="sequence"/>
                                             </group>
                                             <group colspan="2" col="2">
                                                   <separator string="Dates" colspan="2"/>
                                                   <field name="date_start"/>
+                                                  <field name="date_end" />
                                                   <field name="date_deadline"/>
                                             </group>
                                             <group colspan="2" col="2">
                                                   <separator string="Planning" colspan="2"/>
                                                   <field name="planned_hours" widget="float_time"/>
                                                 <field name="total_hours" widget="float_time"/>
-                                                <field name="remaining_hours" widget="float_time" sum="Remaining Hours"/>
+                                                <field name="remaining_hours" widget="float_time"/>
                                                 <field name="effective_hours" invisible="1"/>
                                             </group>
                                             <group colspan="6" col="4">
@@ -187,14 +193,14 @@
                              </field>
                                <button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
-                        <page string="Other Info">
+                        <page string="Schedule and Display info">
                            <group colspan="2" col="2">
                                 <separator string="Constraints" colspan="2"/>
                                 <field name="constraint_date_start"/>
                                 <field name="constraint_date_end"/>
                             </group>
                             <group colspan="2" col="2">
-                                <separator string="Scheduling" colspan="2"/>
+                                <separator string="Displaying settings" colspan="2"/>
                                 <field name="sequence"/>
                             </group>
                            <separator colspan="4" string="Previous Phases"/>
@@ -219,6 +225,8 @@
                     <field name="project_id" on_change="onchange_project(project_id)"/>
                     <field name="responsible_id"/>
                     <field name="date_start"/>
+                    <field name="date_end"/>
+                    <field name="duration"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -268,6 +276,7 @@
                         </field>
                         <field name="responsible_id"/>
                         <field name="date_start"/>
+                        <field name="date_end"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index 351297384fd..c07f1ae81be 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -65,10 +65,11 @@ class project_compute_phases(osv.osv_memory):
             context = {}
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
-        result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase_list')
+        result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_project_phase')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['context'] = {"search_default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1}
+        result['target'] = 'current'
+        result['context'] = {"search_default_project_id":data['project_id'], "default_project_id":data['project_id'], "search_default_responsible_id":uid, "search_default_current": 1}
         return result
 
 project_compute_phases()
diff --git a/addons/project_long_term/wizard/project_compute_tasks.py b/addons/project_long_term/wizard/project_compute_tasks.py
index 0d5fa22e6a8..658350a27d2 100644
--- a/addons/project_long_term/wizard/project_compute_tasks.py
+++ b/addons/project_long_term/wizard/project_compute_tasks.py
@@ -50,13 +50,13 @@ class project_compute_tasks(osv.osv_memory):
             context = {}
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
-        result = mod_obj._get_id(cr, uid, 'project', 'action_view_task')
+        result = mod_obj._get_id(cr, uid, 'project_long_term', 'act_resouce_allocation')
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = {}
         if not id:
             return result
         result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['context'] = {"search_default_project_id":data['project_id'], "search_default_user_id":uid, "search_default_current": 1}
+        result['target'] = 'current'
         return result
 
 project_compute_tasks()
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index 1a9081b1f5d..d446ef20183 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -44,7 +44,7 @@ class project_schedule_task(osv.osv_memory):
         if context is None:
             context = {}
         if not 'active_id' in context:
-            return {}
+            return {'type': 'ir.actions.act_window_close'}
         return phase_pool.schedule_tasks(cr, uid, [context['active_id']], context=context)
 project_schedule_task()
 
diff --git a/addons/project_mailgate/i18n/de.po b/addons/project_mailgate/i18n/de.po
index 958172233f6..a0f821fbe21 100644
--- a/addons/project_mailgate/i18n/de.po
+++ b/addons/project_mailgate/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 08:16+0000\n"
+"PO-Revision-Date: 2010-12-31 10:37+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mailgate
@@ -51,7 +51,7 @@ msgstr ""
 #. module: project_mailgate
 #: view:project.task:0
 msgid "Attachments"
-msgstr ""
+msgstr "Anhänge"
 
 #. module: project_mailgate
 #: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
@@ -61,7 +61,7 @@ msgstr "Projekte Mailgateway"
 #. module: project_mailgate
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_mailgate
 #: field:project.task,message_ids:0
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
index d85ac14e12c..b0dd743ae98 100644
--- a/addons/project_mailgate/i18n/es.po
+++ b/addons/project_mailgate/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:26+0000\n"
+"PO-Revision-Date: 2010-12-28 08:35+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mailgate
diff --git a/addons/project_mailgate/i18n/lv.po b/addons/project_mailgate/i18n/lv.po
new file mode 100644
index 00000000000..89e69f4a559
--- /dev/null
+++ b/addons/project_mailgate/i18n/lv.po
@@ -0,0 +1,100 @@
+# Latvian 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-31 10:38+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: 2011-01-01 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History Information"
+msgstr "Vēstures informācija"
+
+#. module: project_mailgate
+#: model:ir.model,name:project_mailgate.model_project_task
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_mailgate
+#: model:ir.module.module,description:project_mailgate.module_meta_information
+msgid ""
+"This module is an interface that synchronises mails with OpenERP Project "
+"Task.\n"
+"\n"
+"It allows creating tasks as soon as a new mail arrives in our configured "
+"mail server.\n"
+"Moreover, it keeps track of all further communications and task states.\n"
+"    "
+msgstr ""
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Attachments"
+msgstr "Piesaistnes"
+
+#. module: project_mailgate
+#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
+msgid "Project MailGateWay"
+msgstr "Projekta MailGateWay"
+
+#. module: project_mailgate
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
+
+#. module: project_mailgate
+#: field:project.task,message_ids:0
+msgid "Messages"
+msgstr "Ziņojumi"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:0
+#, python-format
+msgid "Draft"
+msgstr "Melnraksts"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Details"
+msgstr "Sīkāka informācija"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:0
+#, python-format
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:0
+#, python-format
+msgid "Done"
+msgstr "Pabeigts"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:0
+#, python-format
+msgid "Open"
+msgstr "Atvērt"
+
+#. module: project_mailgate
+#: code:addons/project_mailgate/project_mailgate.py:0
+#, python-format
+msgid "Pending"
+msgstr "Neizlemts"
+
+#. module: project_mailgate
+#: view:project.task:0
+msgid "History"
+msgstr "Vēsture"
diff --git a/addons/project_mailgate/i18n/project_mailgate.pot b/addons/project_mailgate/i18n/project_mailgate.pot
index 69d0149689a..b19f8349cd8 100644
--- a/addons/project_mailgate/i18n/project_mailgate.pot
+++ b/addons/project_mailgate/i18n/project_mailgate.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgid "Messages"
 msgstr ""
 
 #. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:123
 #, python-format
 msgid "Draft"
 msgstr ""
@@ -66,25 +66,25 @@ msgid "Details"
 msgstr ""
 
 #. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:149
 #, python-format
 msgid "Cancel"
 msgstr ""
 
 #. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:143
 #, python-format
 msgid "Done"
 msgstr ""
 
 #. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:129
 #, python-format
 msgid "Open"
 msgstr ""
 
 #. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:135
 #, python-format
 msgid "Pending"
 msgstr ""
diff --git a/addons/project_messages/i18n/de.po b/addons/project_messages/i18n/de.po
index b5eb7c3739c..08b03bcf4be 100644
--- a/addons/project_messages/i18n/de.po
+++ b/addons/project_messages/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 09:45+0000\n"
+"PO-Revision-Date: 2010-12-31 10:23+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:55+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_messages
@@ -113,7 +113,7 @@ msgstr "Nachricht An"
 #. module: project_messages
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
 
 #. module: project_messages
 #: view:project.messages:0
@@ -135,7 +135,7 @@ msgstr "Projekt Mitteilungen"
 #. module: project_messages
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 
 #. module: project_messages
 #: model:ir.module.module,shortdesc:project_messages.module_meta_information
diff --git a/addons/project_messages/i18n/es.po b/addons/project_messages/i18n/es.po
index fc6b0a3f9b2..9c503ee6ae1 100644
--- a/addons/project_messages/i18n/es.po
+++ b/addons/project_messages/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-27 18:29+0000\n"
+"PO-Revision-Date: 2010-12-28 08:51+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_messages
diff --git a/addons/project_messages/i18n/lv.po b/addons/project_messages/i18n/lv.po
new file mode 100644
index 00000000000..8c0e5fead5b
--- /dev/null
+++ b/addons/project_messages/i18n/lv.po
@@ -0,0 +1,132 @@
+# Latvian 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-31 10:25+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: 2011-01-01 05:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_messages
+#: field:project.messages,to_id:0
+msgid "To"
+msgstr "Kam"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_messages
+msgid "project.messages"
+msgstr "project.messages"
+
+#. module: project_messages
+#: field:project.messages,from_id:0
+msgid "From"
+msgstr "No"
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+msgid "Communication Messages"
+msgstr "Sazināšanas ziņojumi"
+
+#. module: project_messages
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
+msgstr ""
+
+#. module: project_messages
+#: field:project.messages,create_date:0
+msgid "Creation Date"
+msgstr "Izveidošanas datums"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Today"
+msgstr "Šodien"
+
+#. module: project_messages
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid ""
+"An in-project messagery system permits an efficient and trackable "
+"communication between project members. The messages are kept in the system "
+"and can then be used for post-analysis."
+msgstr ""
+
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.act_project_messages
+#: model:ir.actions.act_window,name:project_messages.action_view_project_editable_messages_tree
+#: view:project.messages:0
+#: view:project.project:0
+#: field:project.project,message_ids:0
+msgid "Messages"
+msgstr "Ziņojumi"
+
+#. module: project_messages
+#: model:ir.model,name:project_messages.model_project_project
+#: view:project.messages:0
+#: field:project.messages,project_id:0
+msgid "Project"
+msgstr "Projekts"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Group By..."
+msgstr "Grupēt pēc..."
+
+#. module: project_messages
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid ""
+"\n"
+"    This module provides the functionality to send messages within a "
+"project.\n"
+"    A user can send messages individually to other user. He can even "
+"broadcast\n"
+"    it to all the users.\n"
+"    "
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message To"
+msgstr ""
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! You cannot assign escalation to the same project!"
+msgstr "Kļūda! Nedrīkst piešķirt eskalāciju uz to pašu projektu!"
+
+#. module: project_messages
+#: view:project.messages:0
+#: field:project.messages,message:0
+#: view:project.project:0
+msgid "Message"
+msgstr "Ziņa"
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Message From"
+msgstr ""
+
+#. module: project_messages
+#: view:project.messages:0
+msgid "Project Messages"
+msgstr "Projekta ziņojumi"
+
+#. module: project_messages
+#: constraint:project.project:0
+msgid "Error! project start-date must be lower then project end-date."
+msgstr "Kļūda! Projekta sākuma datumam jābūt mazākam nekā beigu."
+
+#. module: project_messages
+#: model:ir.module.module,shortdesc:project_messages.module_meta_information
+msgid "In-Project Messaging System"
+msgstr ""
diff --git a/addons/project_messages/i18n/project_messages.pot b/addons/project_messages/i18n/project_messages.pot
index ffdf87d8d0a..1b9f7e2dffb 100644
--- a/addons/project_messages/i18n/project_messages.pot
+++ b/addons/project_messages/i18n/project_messages.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgid "Communication Messages"
 msgstr ""
 
 #. module: project_messages
-#: help:project.messages,to_id:0
-msgid "Keep this empty to broadcast the message."
+#: view:project.messages:0
+msgid "Group By..."
 msgstr ""
 
 #. module: project_messages
@@ -52,8 +52,8 @@ msgid "Today"
 msgstr ""
 
 #. module: project_messages
-#: model:ir.actions.act_window,help:project_messages.messages_form
-msgid "An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis."
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
 msgstr ""
 
 #. module: project_messages
@@ -73,8 +73,8 @@ msgid "Project"
 msgstr ""
 
 #. module: project_messages
-#: view:project.messages:0
-msgid "Group By..."
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid "An in-project messaging system allows for an efficient and trackable communication between project members. The messages are stored in the system and can be used for post analysis."
 msgstr ""
 
 #. module: project_messages
diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po
index ccc28c15204..315d6313365 100644
--- a/addons/project_mrp/i18n/de.po
+++ b/addons/project_mrp/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-01 08:06+0000\n"
+"PO-Revision-Date: 2010-12-31 10:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:34+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
@@ -49,7 +49,7 @@ msgstr ""
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
@@ -59,7 +59,7 @@ msgstr "Produkt"
 #. module: project_mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: project_mrp
 #: field:product.product,project_id:0
@@ -125,6 +125,30 @@ msgid ""
 "automatically created via sale orders.\n"
 "\n"
 msgstr ""
+"\n"
+"Diese Anwendung erstellt die Verlinkung zwischen Beschaffungsaufträgen für \n"
+"Produkte der Art \"Dienstleistung\" und Aufgaben für das Projektmanagement.\n"
+"\n"
+"Durch die Installation der Anwendung wird für jede einzelne Position eines "
+"Dienstleistungsprodukts \n"
+"in Beschaffungsaufträgen automatisch eine neue Aufgabe für das "
+"Projektmanagement erstellt, \n"
+"wenn folgende Kriterien erfüllt werden:\n"
+"  * Produktart = Dienstleistung\n"
+"  * Dispositionsmethode = Disponiere von Auftrag\n"
+"  * Einkaufsmethode = Produziere\n"
+"\n"
+"Die neue Aufgabe wird zunächst ohne Projektbezug erstellt, Sie können\n"
+"ein Projekt ergänzen.\n"
+"\n"
+"Wenn die Aufgabe abgeschlossen oder abgebrochen wird, wird über den\n"
+"Workflow dann auch die korrespondierende Position des Beschaffungsauftrags "
+"aktualisiert.\n"
+"\n"
+"Diese Anwendung ist insbesondere hilfreich, wenn auf Basis von erledigten "
+"Aufgaben \n"
+"auch eine Abrechnung der geleisteten Arbeiten an den Kunden erfolgt.\n"
+"\n"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
diff --git a/addons/project_mrp/i18n/es.po b/addons/project_mrp/i18n/es.po
index ac3c513b410..857d4679ef1 100644
--- a/addons/project_mrp/i18n/es.po
+++ b/addons/project_mrp/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:11+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 13: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:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
@@ -121,6 +120,27 @@ msgid ""
 "automatically created via sale orders.\n"
 "\n"
 msgstr ""
+"\n"
+"Este módulo crea un enlace entre órdenes de abastecimiento\n"
+"conteniendo líneas de \"servicio\" y tareas de gestión de proyectos.\n"
+"\n"
+"Cuando se instala, este módulo creará una nueva tarea por cada línea\n"
+"de orden de abastecimiento, cuando el producto correspondiente\n"
+"cumpla las siguientes características:\n"
+"  * Tipo = Servicio\n"
+"  * Método abastecimiento (cubrir el pedido) = OBP (obtener bajo pedido)\n"
+"  * Método suministro/abastecimiento = Producir\n"
+"\n"
+"La nueva tarea se crea fuera de los proyectos existentes, pero\n"
+"puede ser añadida a un proyecto manualmente.\n"
+"\n"
+"Cuando la tarea de proyecto se completa o cancela, consecuentemente\n"
+"se actualiza el flujo de trabajo de la correspondiente línea de "
+"abastecimiento.\n"
+"\n"
+"Este módulo es útil para poder facturar servicios basados en tareas creadas\n"
+"automáticamente a través de pedidos de venta.\n"
+"\n"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
diff --git a/addons/project_mrp/i18n/lv.po b/addons/project_mrp/i18n/lv.po
new file mode 100644
index 00000000000..b90f62cde33
--- /dev/null
+++ b/addons/project_mrp/i18n/lv.po
@@ -0,0 +1,134 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+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: 2011-01-01 22:15+0000\n"
+"Last-Translator: Vladimirs Kuzmins <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: 2011-01-02 05:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_procuretasktask0
+msgid "For each product, on type service and on order"
+msgstr "Katram produktam uz tipu pakalpojumus un pasūtījumu"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_procuretask0
+msgid "Procurement Task"
+msgstr "Sagādes uzdevums"
+
+#. module: project_mrp
+#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
+msgid "Procurement and Project Management integration"
+msgstr "Sagādes un projektu vadības integrācija"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_createtask0
+msgid "Product type is service, then its creates the task."
+msgstr "Produkta tips ir pakalpojums, tad tas veido uzdevumu."
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_procuretask0
+msgid "if product type is 'service' then it creates the task."
+msgstr "Produkta tips ir pakalpojums, tad tas veido uzdevumu."
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
+msgstr "Produkts"
+
+#. module: project_mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Kļūda: nederīgs EAN kods"
+
+#. module: project_mrp
+#: field:product.product,project_id:0
+msgid "Project"
+msgstr "Projekts"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_procurement_order
+#: field:project.task,procurement_id:0
+msgid "Procurement"
+msgstr "Sagāde"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_mrptask0
+msgid "A task is created to provide the service."
+msgstr "Ir izveidots uzdevums, lai nodrošinātu pakalpojumu."
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_ordertask0
+msgid "Order Task"
+msgstr "Pasūtījuma uzdevums"
+
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sale Order Task"
+msgstr "Klienta pasūtījuma uzdevums"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_createtask0
+msgid "Create Task"
+msgstr "Izveidot uzdevumu"
+
+#. module: project_mrp
+#: model:ir.module.module,description:project_mrp.module_meta_information
+msgid ""
+"\n"
+"This module creates a link between procurement orders\n"
+"containing \"service\" lines and project management tasks.\n"
+"\n"
+"When installed, this module will automatically create a new task\n"
+"for each procurement order line, when the corresponding product\n"
+"meets the following characteristics:\n"
+"  * Type = Service\n"
+"  * Procurement method (Order fulfillment) = MTO (make to order)\n"
+"  * Supply/Procurement method = Produce\n"
+"\n"
+"The new task is created outside of any existing project, but\n"
+"can be added to a project manually.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly.\n"
+"\n"
+"This module is useful to be able to invoice services based on tasks\n"
+"automatically created via sale orders.\n"
+"\n"
+msgstr ""
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_ordertask0
+msgid "If procurement method is Make to order and supply method is produce"
+msgstr ""
+"Ja sagādes metode ir veidot uz pasūtījuma un piegādes metode ir ražot"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sale order"
+msgstr "Gadījumā, ja tiek pārdoti pakalpojumi uz klientu pasūtījumu"
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/project_mrp/i18n/project_mrp.pot
index bad17ead34f..0e2da82a283 100644
--- a/addons/project_mrp/i18n/project_mrp.pot
+++ b/addons/project_mrp/i18n/project_mrp.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_planning/i18n/de.po b/addons/project_planning/i18n/de.po
index 53006c23a18..a48f19b7c43 100644
--- a/addons/project_planning/i18n/de.po
+++ b/addons/project_planning/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-29 10:40+0000\n"
+"PO-Revision-Date: 2010-12-29 09:00+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_planning
@@ -54,7 +54,7 @@ msgstr "Ressourcenplanung"
 #. module: project_planning
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_planning
 #: view:board.board:0
@@ -176,7 +176,7 @@ msgstr ""
 #. module: project_planning
 #: 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: project_planning
 #: field:report_account_analytic.planning.account,plan_open:0
@@ -192,7 +192,7 @@ msgstr "Von"
 #. module: project_planning
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: project_planning
 #: field:report_account_analytic.planning.account,account_id:0
@@ -422,6 +422,22 @@ 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"
+"Diese Anwendung hilft Ihnen bei der Planung Ihrer Ressourcen.\n"
+"\n"
+"Das Modul basiert auf der Analytischen Buchhaltung und ist vollständig "
+"integriert mit\n"
+"* der Zeiterfassung\n"
+"* der Urlaubsplanung\n"
+"* dem Projektmanagement\n"
+"\n"
+"Somit weiss jeder Projektmanager zu jeder Zeit, ob ein Mitarbeiter seiner "
+"Arbeitsgruppe noch freie Zeitressourcen hat\n"
+"und somit für Projekte oder andere Aufgaben disponiert werden kann. \n"
+"\n"
+"Zum Monatsende kann der Projektmanager dann überprüfen, inwieweit die "
+"geplanten Zeiten mit tatsächlich erfassten (und abrechenbaren) Zeiten "
+"übereinstimmen oder in welcher Höhe eine Abweichung vorliegt.\n"
 
 #. module: project_planning
 #: model:ir.model,name:project_planning.model_res_company
diff --git a/addons/project_planning/i18n/lv.po b/addons/project_planning/i18n/lv.po
new file mode 100644
index 00000000000..37f69da8f05
--- /dev/null
+++ b/addons/project_planning/i18n/lv.po
@@ -0,0 +1,571 @@
+# Latvian 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-31 09:34+0000\n"
+"Last-Translator: Vladimirs Kuzmins <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: 2011-01-01 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_board_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
+msgid "Planning Statistics"
+msgstr "Plānošanas statistika"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
+#: view:report_account_analytic.planning.line:0
+msgid "Planning Line"
+msgstr "Plānošanas rinda"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Unallocated Time"
+msgstr "Neiedalītais laiks kopā"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Plānošanas nosaukums"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr "Manu projektu plānošanas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr "Darba laika uzskaites Tabele"
+
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
+msgid "Planning Management Module"
+msgstr "Plānošanas vadības modulis"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Konts"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr "Piezīmes"
+
+#. module: project_planning
+#: field:account.analytic.account,planning_ids:0
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+msgid "Plannings"
+msgstr "Plānošanas"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Projekts"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Sākt Uzdevumu"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr "Atcelts"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Total Planned (in Days)"
+msgstr "Plānots kopā (dienās)"
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+"Nekorekta plānošana! Plānotas dienas nedrīkst pārklāties vienam "
+"atbildīgajām. "
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr "Plānošana pēc konta"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without"
+msgstr "Laiks bez"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr "Aktīvas plānošanas"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analītiskais Konts"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Atstatīt uz melnrakstu"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr "Papildus Info"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr "Plānots kopā"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+msgid ""
+"This value is given by the sum of all work encoded in the timesheet(s) "
+"between the 'Date From' and 'Date To' of the planning."
+msgstr ""
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus analītiskos kontus"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_open:0
+#: field:report_account_analytic.planning.user,plan_open:0
+msgid "Time Allocation without Tasks"
+msgstr "Laika iedalīšana bez uzdevumiem"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From"
+msgstr "No"
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,account_id:0
+#: field:report_account_analytic.planning.line,account_id:0
+msgid "Analytic account"
+msgstr "Analītiskais konts"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscelleanous"
+msgstr "Dažādi"
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr "Šis iestatīts mērvienību, ko lietos plānošanā."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "HR plānošana"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Atlikušie uzdevumi"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Plānošana"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr "Laika kodēšana"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr "Neiedalīts laiks"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr "Plānošana pēc konta"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Deleģēt"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Plānošanas anlīze"
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Plānošana pēc lietotāja"
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
+msgid "Tasks"
+msgstr "Uzdevumi"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr "Plānošana pēc konta (dienās)"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Sākuma datums"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total Planned Tasks"
+msgstr "Plānotie uzdevumi kopā"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr "Brīvs kopā"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "tasks"
+msgstr "uzdevumi"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_unit:0
+msgid "Qty UoM"
+msgstr "Daudz. mērv."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Piezīme"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Melnraksts"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr "Plānošanas rindas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr "Neizlemts"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr "Plānotas dienas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Statuss"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,holiday:0
+msgid ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Lietotājs"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Remaining Tasks"
+msgstr "Atlikušie uzdevumi kopā"
+
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
+msgid ""
+"\n"
+"This module helps you to manage your plannings.\n"
+"\n"
+"This module is based on the analytic accounting and is totally integrated "
+"with\n"
+"* the timesheets encoding\n"
+"* the holidays management\n"
+"* the project management\n"
+"\n"
+"So that, each department manager can know if someone in his team has still "
+"unallocated time for a given planning (taking in consideration the validated "
+"leaves) or if he still needs to encode tasks.\n"
+"\n"
+"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 ""
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Uzņēmumi"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr "Daudzums bāzes mērv."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr "Plānotais laiks uz uzdevumiem"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Daudzums"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Kods"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Plānošanas rindas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Pabeigts"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr "Plānošana pēc lietotāja (dienās)"
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Plānošanas statistika"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Atvērts"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
+#: view:report_account_analytic.planning:0
+msgid "Planning by User"
+msgstr "Plānošana pēc lietotāja"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Informācija"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Darba dienas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Aktivizēt atkal"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,user_id:0
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible"
+msgstr "Atbildīgais"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr "Plānošanas stat."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "To"
+msgstr "Līdz"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
+msgstr "Uzdevumu laika iedalīšana"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Kopsavilkums pēc lietotāja"
+
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"With its commun system for scheduling all resources of a company (people and "
+"materials), OpenERP allows you to encode then compute automatically tasks "
+"and phases scheduling, track resources allocation and availibility."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation without Tasks"
+msgstr "Laika iedalīšana bez uzdevumiem kopā"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr "Prombūtne"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation of Tasks"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_to:0
+msgid "End Date"
+msgstr "Beigu datums"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Kopsavilkums pēc projekta"
+
+#. module: project_planning
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
+msgstr "Plānošanas laika vienība"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
+msgstr "Plānošanas uzdevumi"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,manager_id:0
+msgid "Manager"
+msgstr "Vadītājs"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr ""
diff --git a/addons/project_planning/i18n/project_planning.pot b/addons/project_planning/i18n/project_planning.pot
index 22bd2ef0e20..0f9639b6939 100644
--- a/addons/project_planning/i18n/project_planning.pot
+++ b/addons/project_planning/i18n/project_planning.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
 #. module: project_planning
 #: help:report_account_analytic.planning.account,tasks:0
 #: help:report_account_analytic.planning.user,tasks:0
@@ -67,6 +72,16 @@ msgstr ""
 msgid "Planning Management Module"
 msgstr ""
 
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid "With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability."
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total planned tasks"
+msgstr ""
+
 #. module: project_planning
 #: field:report_account_analytic.planning.stat,account_id:0
 msgid "Account"
@@ -123,11 +138,6 @@ msgstr ""
 msgid "Planning By Account"
 msgstr ""
 
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without"
-msgstr ""
-
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Current Plannings"
@@ -149,8 +159,8 @@ msgid "Extra Info"
 msgstr ""
 
 #. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
+#: report:report_account_analytic.planning.print:0
+msgid "To :"
 msgstr ""
 
 #. module: project_planning
@@ -171,8 +181,9 @@ msgid "Time Allocation without Tasks"
 msgstr ""
 
 #. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From"
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
 msgstr ""
 
 #. module: project_planning
@@ -226,6 +237,11 @@ msgstr ""
 msgid "Planning"
 msgstr ""
 
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr ""
+
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Time Encoding"
@@ -236,12 +252,6 @@ msgstr ""
 msgid "Unallocated Time"
 msgstr ""
 
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
 #. module: project_planning
 #: help:report_account_analytic.planning.user,plan_open:0
 msgid "This value is given by the sum of time allocation without task(s) linked, expressed in days."
@@ -253,8 +263,8 @@ msgid "Delegate"
 msgstr ""
 
 #. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
+#: help:report_account_analytic.planning.user,free:0
+msgid "Computed as Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)"
 msgstr ""
 
 #. module: project_planning
@@ -262,6 +272,16 @@ msgstr ""
 msgid "Set here the number of working days within this planning for one person full time"
 msgstr ""
 
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "["
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From :"
+msgstr ""
+
 #. module: project_planning
 #: field:report_account_analytic.planning,planning_user_ids:0
 msgid "Planning By User"
@@ -280,13 +300,13 @@ msgid "Planning By Account (in Days)"
 msgstr ""
 
 #. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
+#: report:report_account_analytic.planning.print:0
+msgid "Time without tasks"
 msgstr ""
 
 #. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total Planned Tasks"
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
 msgstr ""
 
 #. module: project_planning
@@ -300,13 +320,8 @@ msgid "This value is given by the sum of time allocation with the checkbox 'Assi
 msgstr ""
 
 #. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "tasks"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid "Computed as Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)"
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
 msgstr ""
 
 #. module: project_planning
@@ -326,9 +341,9 @@ msgid "Draft"
 msgstr ""
 
 #. module: project_planning
-#: view:account.analytic.account:0
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
 #: view:report_account_analytic.planning:0
-msgid "Planning Lines"
+msgid "Planning by Account"
 msgstr ""
 
 #. module: project_planning
@@ -461,7 +476,6 @@ msgstr ""
 
 #. module: project_planning
 #: field:report_account_analytic.planning,user_id:0
-#: report:report_account_analytic.planning.print:0
 msgid "Responsible"
 msgstr ""
 
@@ -470,11 +484,6 @@ msgstr ""
 msgid "Planning stat"
 msgstr ""
 
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To"
-msgstr ""
-
 #. module: project_planning
 #: field:report_account_analytic.planning.account,plan_tasks:0
 msgid "Time Allocation of Tasks"
@@ -485,11 +494,6 @@ msgstr ""
 msgid "Summary by user"
 msgstr ""
 
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid "With its commun system for scheduling all resources of a company (people and materials), OpenERP allows you to encode then compute automatically tasks and phases scheduling, track resources allocation and availibility."
-msgstr ""
-
 #. module: project_planning
 #: view:report_account_analytic.planning:0
 msgid "Total Time Allocation without Tasks"
@@ -520,6 +524,16 @@ msgstr ""
 msgid "Summary by project"
 msgstr ""
 
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible :"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "]"
+msgstr ""
+
 #. module: project_planning
 #: field:res.company,planning_time_mode_id:0
 msgid "Planning Time Unit"
diff --git a/addons/project_planning/report/report_planning.rml b/addons/project_planning/report/report_planning.rml
index 43dab8eb5b4..7d46de5e025 100644
--- a/addons/project_planning/report/report_planning.rml
+++ b/addons/project_planning/report/report_planning.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="HR Planning" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="HR Planning.pdf">
+  <template pageSize="(595.0,842.0)" title="HR Planning" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -15,7 +15,6 @@
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#808080" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#808080" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#808080" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
@@ -24,17 +23,21 @@
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-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="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-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="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -42,33 +45,24 @@
     <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica"/>
-    <paraStyle name="P2" fontName="Helvetica" alignment="RIGHT"/>
-    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="CENTER"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="14.0" leading="17"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="11.0" leading="14"/>
-    <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="11.0" leading="14"/>
-    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="11.0" leading="14" alignment="RIGHT"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="CENTER"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="11.0" leading="14" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -77,139 +71,149 @@
     <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10"/>
+    <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER"/>
+    <paraStyle name="terp_default_8_center" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="terp_default_9_right" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT"/>
+    <paraStyle name="terp_default_12_center_bold" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER"/>
+    <paraStyle name="terp_tbl_header" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="terp_tbl_header_center" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
+    <paraStyle name="terp_tbl_header_right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
+    <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3"/>
     <images/>
   </stylesheet>
   <story>
-    <para style="P1">[[ repeatIn(objects, 'o') ]]</para>
-    <para style="P1">
+    <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P1">
+    <para style="terp_header_center">HR Planning</para>
+    <para style="terp_default_8_center">[[ o.name]]</para>
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="P10">HR Planning</para>
-    <para style="Standard">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="149.0,192.0,141.0" repeatRows="1" style="Table1">
+    <blockTable colWidths="227.0,312.0" repeatRows="1" style="Table1">
       <tr>
         <td>
-          <para style="P1"><font face="Helvetica">Responsible</font>: [[ o.user_id.name ]]</para>
+          <para style="terp_default_9"><font fontName="Helvetica-Bold">Responsible : </font>[[ o.user_id.name ]]</para>
         </td>
         <td>
-          <para style="P11">[[ o.name]]</para>
-        </td>
-        <td>
-          <para style="P2"><font face="Helvetica">From</font>: [[ formatLang(o.date_from,date=True) ]]</para>
-          <para style="P2"><font face="Helvetica">To</font>: [[ formatLang(o.date_to,date=True) ]]</para>
+          <para style="terp_default_9_right"><font fontName="Helvetica-Bold">From :</font> [[ formatLang(o.date_from,date=True) ]] <font fontName="Helvetica-Bold"> To : </font>[[ formatLang(o.date_to,date=True) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P4">
-      <font color="white"> </font>
-    </para>
-    <para style="P5">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="482.0" style="Table6">
+    <blockTable colWidths="539.0" style="Table6">
       <tr>
         <td>
-          <para style="P9">Summary by user</para>
-          <para style="P9">
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_12_center_bold">Summary by user</para>
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="104.0,101.0,113.0,100.0,63.0" style="Table3">
+    <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table3">
       <tr>
         <td>
-          <para style="P7">User</para>
+          <para style="terp_tbl_header">User</para>
         </td>
         <td>
-          <para style="P7">Total Planned Tasks</para>
+          <para style="terp_tbl_header_center">Total planned tasks</para>
         </td>
         <td>
-          <para style="P7">Remaining tasks</para>
+          <para style="terp_tbl_header_center">Remaining tasks</para>
         </td>
         <td>
-          <para style="P7">Time without</para>
-          <para style="P7">tasks</para>
+          <para style="terp_tbl_header_center">Time without tasks</para>
         </td>
         <td>
-          <para style="P8">Timesheet</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P6">[[ repeatIn(o.planning_user_ids , 'u') ]] [[ u.user_id.name ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(u.plan_tasks) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(u.tasks) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(u.free) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(u.timesheet) ]]</para>
+          <para style="terp_tbl_header_center">Timesheet</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P5">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="482.0" style="Table5">
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.planning_user_ids , 'u') ]]</para>
+      <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table8">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ u.user_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(u.plan_tasks) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(u.tasks) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(u.free) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(u.timesheet) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <blockTable colWidths="539.0" style="Table5">
       <tr>
         <td>
-          <para style="P9">Summary by project</para>
-          <para style="P9">
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_12_center_bold">Summary by project</para>
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="104.0,103.0,112.0,101.0,63.0" style="Table4">
+    <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table4">
       <tr>
         <td>
-          <para style="P13">Project</para>
+          <para style="terp_tbl_header">Project</para>
         </td>
         <td>
-          <para style="P7">Total Planned Tasks</para>
+          <para style="terp_tbl_header_center">Total planned tasks</para>
         </td>
         <td>
-          <para style="P7">Remaining tasks</para>
+          <para style="terp_tbl_header_center">Remaining tasks</para>
         </td>
         <td>
-          <para style="P7">Time without</para>
-          <para style="P7">tasks</para>
+          <para style="terp_tbl_header_center">Time without tasks</para>
         </td>
         <td>
-          <para style="P8">Timesheet</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P12"><font face="Helvetica" size="11.0">[[ repeatIn(o.planning_account , 'l') ]] </font>[ [[ l.account_id.code ]] ] [[ l.account_id.name ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(l.plan_tasks) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(l.tasks) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(l.plan_open) ]]</para>
-        </td>
-        <td>
-          <para style="P6">[[ formatLang(l.timesheet) ]]</para>
+          <para style="terp_tbl_header_center">Timesheet</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P3">
-      <font color="white"> </font>
-    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.planning_account , 'l') ]] </para>
+      <blockTable colWidths="150.0,110.0,90.0,100.0,90.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_default_9">[ [[ l.account_id.code ]] ] [[ l.account_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(l.plan_tasks) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(l.tasks) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(l.plan_open) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_center">[[ formatLang(l.timesheet) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/project_retro_planning/i18n/de.po b/addons/project_retro_planning/i18n/de.po
index c9a854441fd..5753ab4dd61 100644
--- a/addons/project_retro_planning/i18n/de.po
+++ b/addons/project_retro_planning/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-01 09:46+0000\n"
+"PO-Revision-Date: 2010-12-31 10:22+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:49+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
@@ -35,16 +35,20 @@ msgid ""
 "          then the deadline date and start date for all the tasks will "
 "change accordingly  "
 msgstr ""
+"\n"
+"        - Wenn das Ende Datum eines Projekts geändert wird\n"
+"              ändert sich automatisch auch die Frist und das Start Datum für "
+"alle Aufgaben zum Projekt  "
 
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 
 #. module: project_retro_planning
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/project_retro_planning/i18n/es.po b/addons/project_retro_planning/i18n/es.po
index 1cb56aa94a4..777745ced2a 100644
--- a/addons/project_retro_planning/i18n/es.po
+++ b/addons/project_retro_planning/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 18:32+0000\n"
+"PO-Revision-Date: 2010-12-28 08:49+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/project_retro_planning.pot b/addons/project_retro_planning/i18n/project_retro_planning.pot
index 2cfcb9529b6..eb12e7c454d 100644
--- a/addons/project_retro_planning/i18n/project_retro_planning.pot
+++ b/addons/project_retro_planning/i18n/project_retro_planning.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:20+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
index 5bb4a97c82c..27ac755a1f5 100644
--- a/addons/project_scrum/i18n/de.po
+++ b/addons/project_scrum/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:45+0000\n"
-"PO-Revision-Date: 2010-12-01 09:42+0000\n"
+"PO-Revision-Date: 2010-12-31 10:27+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:06+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
@@ -69,6 +69,35 @@ msgid ""
 "    * http://controlchaos.com\n"
 "    "
 msgstr ""
+"\n"
+"    Dieses Modul implementiert alle Konzepte der Scrum-Methodik, die als\n"
+"     Management-Methodik für IT-Unternehmen definiert wurde:\n"
+"     * Projektverwaltung mit Sprints, Product Owner, Scrum Master\n"
+"     * Terminierung durch Sprints, mit täglichen Kurzbesprechungen, "
+"Feedback\n"
+"     * Produkt Backlog\n"
+"     * Sprint Backlog\n"
+"\n"
+"     Ergänzt wird das Projektmanagement durch folgende Funktionen:\n"
+"     * Mittelfristige und Langzeit Projektfahrplan (Road Map)\n"
+"     * Intensive Abstimmung funktionelle Kundenanforderungen vs technische "
+"Anforderungen\n"
+"\n"
+"     Es existieren außerdem durch diese Anwendung weitere Auswertungen, z.B. "
+"der spezifische ...:\n"
+"     * Burn-Down-Chart\n"
+"\n"
+"     Scrum-Projekte und Aufgaben werden über  normale Projekte und\n"
+"     Aufgaben abgeleitet, so dass die bestehenden Projekte und Aufgaben in "
+"üblicher Weise \n"
+"     weiterbearbeitet werden können, da die Scrum Aufgaben in das Projekt- "
+"und \n"
+"     Aufgabenmanagement nahtlos integriert sind.\n"
+"\n"
+"     Weitere detaillierte Informationen zur Methodik können Sie hier "
+"finden:\n"
+"     * http://controlchaos.com\n"
+"    "
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -178,7 +207,7 @@ msgstr ""
 #. module: project_scrum
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,name:0
@@ -207,6 +236,11 @@ msgid ""
 "this methodology, a daily meeting is organized by the scrum master with his "
 "team in order to detect the difficulties the team faced/will face."
 msgstr ""
+"Die Scrum Methodik wird sehr oft in Softwareentwicklungsprojekten "
+"angewendet. Im Rahmen der Methodik wird eine tägliche\r\n"
+"Kurzbesprechung durch den Scrum Master mit den Mitarbeitern seines Teams "
+"veranstaltet, um zeitnah Probleme und Hindernisse\r\n"
+"in einem Projekt zu erkennen."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
@@ -218,7 +252,7 @@ msgstr "Bitte geben Sie die EMail des Product Owners an"
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Scrum Meeting of %s"
-msgstr ""
+msgstr "Scrum Metting für %s"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
@@ -354,6 +388,8 @@ msgstr "Sprints"
 #, python-format
 msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
+"EMail Benachrichtigungen konnten nicht an den Produkt Owner %s gesendet "
+"werden."
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,convert_to_task:0
@@ -812,6 +848,8 @@ msgstr "Fortschritt Backlog"
 #, python-format
 msgid "Email notification could not be sent to the scrum master %s"
 msgstr ""
+"EMail Benachrichtigungen konnten nicht an den Scrum Master %s gesendet "
+"werden."
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
index 2998218308e..f9b0a3339ae 100644
--- a/addons/project_scrum/i18n/es.po
+++ b/addons/project_scrum/i18n/es.po
@@ -7,25 +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:45+0000\n"
-"PO-Revision-Date: 2010-12-05 08:10+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2011-01-01 15:01+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@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:06+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
 #: help:project.scrum.email,scrum_master_email:0
 msgid "Email Id of Scrum Master"
-msgstr ""
+msgstr "Id de correo del Scrum Master"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
 msgid "_Assign"
-msgstr ""
+msgstr "_Asignar"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,name:0
@@ -41,7 +40,7 @@ msgstr "Desde backlog crear tarea."
 #: view:project.scrum.product.backlog:0
 #: field:project.scrum.product.backlog,user_id:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: project_scrum
 #: model:ir.module.module,description:project_scrum.module_meta_information
@@ -81,7 +80,7 @@ msgstr "Que hizo desde la última reunión"
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: project_scrum
 #: model:process.node,note:project_scrum.process_node_productbacklog0
@@ -115,6 +114,8 @@ msgstr "El sprint '%s' ha sido abierto."
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
+"del proyecto."
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -130,12 +131,12 @@ msgstr "Retrospectivo"
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Send Email"
-msgstr ""
+msgstr "Enviar correo"
 
 #. module: project_scrum
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "¡Error! No se pueden crear tareas recursivas."
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.dblc_proj
@@ -146,18 +147,18 @@ msgstr "Vista backlogs del proyecto"
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Cambiar a borrador"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
 msgid "Merge Product Backlogs"
-msgstr ""
+msgstr "Fusionar pilas de producto"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_merge
 #: view:project.scrum.backlog.merge:0
 msgid "Merge Backlogs"
-msgstr ""
+msgstr "Fusionar pilas"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
@@ -168,17 +169,17 @@ msgstr "Reunión de Scrum: %s"
 #. module: project_scrum
 #: view:project.task:0
 msgid "Backlog"
-msgstr ""
+msgstr "Pila"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_email
 msgid "project.scrum.email"
-msgstr ""
+msgstr "proyecto.scrum.correoe"
 
 #. module: project_scrum
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
 
 #. module: project_scrum
 #: field:project.scrum.sprint,name:0
@@ -188,17 +189,17 @@ msgstr "Nombre del sprint"
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tarea"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Ok"
-msgstr ""
+msgstr "Aceptar"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Spent hours"
-msgstr ""
+msgstr "Horas consumidas"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_meeting_form
@@ -213,12 +214,13 @@ msgstr ""
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
+"Intruduze una dirección de correo del producto para definir el esprint."
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Scrum Meeting of %s"
-msgstr ""
+msgstr "Reunión scrum de %s"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
@@ -243,24 +245,24 @@ msgstr "Proyecto"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Start Task"
-msgstr ""
+msgstr "Iniciar tarea"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "*Blocks encountered:"
-msgstr ""
+msgstr "*Bloqueos encontrados:"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Cambiar etapa"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -287,17 +289,17 @@ msgstr "Calculado usando la suma de las tareas realizadas."
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
 msgid "Task for Today"
-msgstr ""
+msgstr "Tarea para hoy"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,state_open:0
 msgid "Open Backlog"
-msgstr ""
+msgstr "Abrir pila"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Spent Hours"
-msgstr ""
+msgstr "Total horas consumidas"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,date_start:0
@@ -308,24 +310,24 @@ msgstr "Fecha de inicio"
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
 msgid "Blocking points encountered:"
-msgstr ""
+msgstr "Puntos de bloqueo encontrados:"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Planning"
-msgstr ""
+msgstr "Planificación"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.assign.sprint:0
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.email:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,scrum_master_id:0
 msgid "The person who is maintains the processes for the product"
-msgstr ""
+msgstr "La persona que mantiene los procesos para el producto"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -337,7 +339,7 @@ msgstr "Horas planeadas"
 #. module: project_scrum
 #: field:project.scrum.email,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Asunto"
 
 #. module: project_scrum
 #: view:board.board:0
@@ -347,28 +349,29 @@ msgstr ""
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Sprints"
-msgstr ""
+msgstr "Sprints"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
+"No se pudo mandar la notificación por correo al dueño del producto %s"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Convert To Task"
-msgstr ""
+msgstr "Convertir a tarea"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Are you sure you want to merge these Backlogs?"
-msgstr ""
+msgstr "¿Seguro que desea fusionar estas pilas?"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.create.task,user_id:0
 msgid "Responsible user who can work on task"
-msgstr ""
+msgstr "Usuario responsable que puede trabajar en la tarea"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -392,36 +395,36 @@ msgstr "Scrum diario"
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "for the Sprint"
-msgstr ""
+msgstr "por el sprint"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.create.task:0
 msgid "C_onvert"
-msgstr ""
+msgstr "C_onvertir"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_product_backlog_form
 #: model:ir.ui.menu,name:project_scrum.menu_action_product_backlog_form
 #: view:project.scrum.product.backlog:0
 msgid "Product Backlogs"
-msgstr ""
+msgstr "Pilas de producto"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡ Error !"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha de creación"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Are there anything blocking you?"
-msgstr ""
+msgstr "¿Hay algo bloqueandote?"
 
 #. module: project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_scrum
@@ -432,7 +435,7 @@ msgstr "Scrum"
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Hello "
-msgstr ""
+msgstr "Hola "
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_today:0
@@ -450,32 +453,32 @@ msgstr "Tareas desde ayer"
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
 msgid "Assign sprint to backlogs"
-msgstr ""
+msgstr "Asignar sprint a pilas"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,expected_hours:0
 msgid "Estimated time to do the task."
-msgstr ""
+msgstr "Tiempo estimado para realizar la tarea."
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,task_hours:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Horas tarea"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Dates"
-msgstr ""
+msgstr "Fechas"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Scrum Master"
-msgstr ""
+msgstr "Enviar al scrum master"
 
 #. module: project_scrum
 #: selection:project.scrum.product.backlog,state:0
@@ -499,7 +502,7 @@ msgstr ""
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 msgid "Daily"
-msgstr ""
+msgstr "Diariamente"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,backlog_ids:0
@@ -509,24 +512,24 @@ msgstr "Sprint backlog"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegar"
 
 #. module: project_scrum
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Mi tablero"
 
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Postpone Backlog"
-msgstr ""
+msgstr "Postponer pila"
 
 #. module: project_scrum
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
 #: view:project.task:0
 msgid "Task Progress"
-msgstr ""
+msgstr "Progreso de la tarea"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,date:0
@@ -545,12 +548,12 @@ msgstr "Tareas"
 #. module: project_scrum
 #: field:project.scrum.email,product_owner_email:0
 msgid "Product Owner Email"
-msgstr ""
+msgstr "Correo dueño del producto"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 msgid "_Send"
-msgstr ""
+msgstr "_Enviar"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,sprint_id:0
@@ -567,7 +570,7 @@ msgstr "Calculado como: Tiempo dedicado / Tiempo total."
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_blocks:0
@@ -578,29 +581,31 @@ msgstr "Bloqueos encontrados"
 #: help:project.scrum.backlog.assign.sprint,state_open:0
 msgid "Change the state of product backlogs to open if its in draft state"
 msgstr ""
+"Cambiar el estado de las pilas de producto a abierto si está en estado "
+"borrador"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
 #: field:project.scrum.email,message:0
 msgid "Message"
-msgstr ""
+msgstr "Mensaje"
 
 #. module: project_scrum
 #: field:project.scrum.email,scrum_master_email:0
 msgid "Scrum Master Email"
-msgstr ""
+msgstr "Correo del maestro de scrum"
 
 #. module: project_scrum
 #: help:project.project,product_owner_id:0
 #: help:project.scrum.sprint,product_owner_id:0
 msgid "The person who is responsible for the product"
-msgstr ""
+msgstr "La persona que es responsable del producto"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "*Tasks since yesterday:"
-msgstr ""
+msgstr "*Tareas desde ayer:"
 
 #. module: project_scrum
 #: view:project.scrum.meeting:0
@@ -611,7 +616,7 @@ msgstr "Scrum sprint"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Product owner"
-msgstr ""
+msgstr "Dueño del producto"
 
 #. module: project_scrum
 #: view:project.scrum.sprint:0
@@ -644,14 +649,14 @@ msgstr ""
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "What do you plan to do till the next meeting?"
-msgstr ""
+msgstr "¿Qué planea hacer hasta la siguiente reunión?"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
 #: view:postpone.wizard:0
 #: view:project.scrum.product.backlog:0
 msgid "Postpone"
-msgstr ""
+msgstr "Aplazar"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -665,17 +670,17 @@ msgstr "Pendiente"
 #: view:project.scrum.meeting:0
 #: view:project.scrum.sprint:0
 msgid "Optional Info"
-msgstr ""
+msgstr "Información opcional"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
 msgid "Create Tasks from Product Backlogs"
-msgstr ""
+msgstr "Crear tareas a partir de pilas de producto"
 
 #. module: project_scrum
 #: help:project.project,sprint_size:0
 msgid "Number of days allocated for sprint"
-msgstr ""
+msgstr "Numero de días reservados para el sprint"
 
 #. module: project_scrum
 #: field:project.project,product_owner_id:0
@@ -703,12 +708,12 @@ msgstr "Backlogs"
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Thank you"
-msgstr ""
+msgstr "Gracias"
 
 #. module: project_scrum
 #: help:project.scrum.backlog.assign.sprint,convert_to_task:0
 msgid "Create Task for Product Backlog"
-msgstr ""
+msgstr "Crear tarea para la pila de producto"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,active:0
@@ -719,7 +724,7 @@ msgstr "Activo"
 #: model:ir.actions.act_window,name:project_scrum.action_meeting_form
 #: model:ir.ui.menu,name:project_scrum.menu_action_meeting_form
 msgid "Scrum Meetings"
-msgstr ""
+msgstr "Reuniones scrum"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,expected_hours:0
@@ -729,12 +734,12 @@ msgstr ""
 #. module: project_scrum
 #: help:project.scrum.backlog.merge,project_id:0
 msgid "Select project for the new product backlog"
-msgstr ""
+msgstr "Seleccione un proyecto para la nueva pila de producto"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Merge"
-msgstr ""
+msgstr "Fusionar"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
@@ -754,7 +759,7 @@ msgstr "Vista backlogs del sprint"
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "No Blocks"
-msgstr ""
+msgstr "Sin bloqueos"
 
 #. module: project_scrum
 #: field:project.scrum.meeting,question_backlog:0
@@ -766,7 +771,7 @@ msgstr "Exactitud de los backlogs"
 #: view:project.scrum.backlog.create.task:0
 #: view:project.scrum.product.backlog:0
 msgid "Convert to Task"
-msgstr ""
+msgstr "Convertir a tarea"
 
 #. module: project_scrum
 #: help:project.scrum.sprint,project_id:0
@@ -785,20 +790,20 @@ msgstr "Secuencia"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Send to Product Owner"
-msgstr ""
+msgstr "Enviar al dueño de producto"
 
 #. module: project_scrum
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
 #: view:project.scrum.product.backlog:0
 msgid "Backlog Progress"
-msgstr ""
+msgstr "Progreso pila"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Email notification could not be sent to the scrum master %s"
-msgstr ""
+msgstr "No se pudo enviar la notificación de correo al maestro de scrum %s"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -818,7 +823,7 @@ msgstr "Cancelar"
 #: view:project.scrum.product.backlog:0
 #: view:project.scrum.sprint:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
@@ -837,7 +842,7 @@ msgstr "Horas reales"
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Information"
-msgstr ""
+msgstr "Información"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
@@ -856,7 +861,7 @@ msgstr "Horas restantes"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,name:0
@@ -869,12 +874,12 @@ msgstr "Característica"
 #: view:project.scrum.sprint:0
 #: view:project.task:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "My Backlogs"
-msgstr ""
+msgstr "Mis pilas"
 
 #. module: project_scrum
 #: view:project.scrum.email:0
@@ -915,7 +920,7 @@ msgstr "Reuniones diarias"
 #. module: project_scrum
 #: view:project.scrum.sprint:0
 msgid "Expected hours"
-msgstr ""
+msgstr "Horas esperadas"
 
 #. module: project_scrum
 #: field:project.project,sprint_size:0
@@ -925,7 +930,7 @@ msgstr "Días del sprint"
 #. module: project_scrum
 #: help:project.scrum.email,product_owner_email:0
 msgid "Email Id of Product Owner"
-msgstr ""
+msgstr "Id del correo del dueño de producto"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,progress:0
@@ -948,7 +953,7 @@ msgstr ""
 #. module: project_scrum
 #: help:project.scrum.product.backlog,task_hours:0
 msgid "Estimated time of the total hours of the tasks"
-msgstr ""
+msgstr "Tiempo estimado de las horas totales de las tareas"
 
 #. module: project_scrum
 #: view:project.project:0
@@ -958,12 +963,12 @@ msgstr "Datos scrum"
 #. module: project_scrum
 #: field:project.project,scrum:0
 msgid "Is a Scrum Project"
-msgstr ""
+msgstr "Es un proyecto scrum"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,tasks_id:0
@@ -973,12 +978,12 @@ msgstr "Detalles de tareas"
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_postpone_wizard
 msgid "postpone.wizard"
-msgstr ""
+msgstr "postponer.asistente"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Total Planned Hours"
-msgstr ""
+msgstr "Horas planeadas totales"
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
@@ -986,79 +991,84 @@ msgid ""
 "This wizard merge backlogs and create one new backlog with draft state (Old "
 "backlogs Will be deleted). And it also merge old tasks from backlogs"
 msgstr ""
+"Este asistente fusiona pilas y crea una nueva pila con estado borrador (las "
+"pilas antiguas se borrarán). También fusiona las tareas antiguas de las pilas"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "*Task for Today:"
-msgstr ""
+msgstr "*Tarea para hoy:"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "Please provide email address for scrum master defined on sprint."
 msgstr ""
+"Por favor, proporcione la dirección de correo electrónico para el maestro de "
+"scrum definido en el sprint."
 
 #. module: project_scrum
 #: view:project.scrum.backlog.merge:0
 msgid "Select the project for merged backlogs"
-msgstr ""
+msgstr "Seleccione el proyecto para las pilas fusionadas"
 
 #. module: project_scrum
 #: view:board.board:0
 #: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
 msgid "My Sprint"
-msgstr ""
+msgstr "Mi sprint"
 
 #. module: project_scrum
 #: field:project.scrum.product.backlog,effective_hours:0
 msgid "Spent Hours"
-msgstr ""
+msgstr "Horas consumidas"
 
 #. module: project_scrum
 #: help:project.scrum.product.backlog,effective_hours:0
 msgid "Computed using the sum of the time spent on every related tasks"
 msgstr ""
+"Calculado usando la suma del tiempo consumido en cada tarea relacionada"
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.open_board_project_scrum
 #: model:ir.ui.menu,name:project_scrum.menu_deshboard_scurm
 msgid "Scrum Dashboard"
-msgstr ""
+msgstr "Cuadro de mandos de scrum"
 
 #. module: project_scrum
 #: model:ir.model,name:project_scrum.model_project_scrum_sprint
 msgid "Project Scrum Sprint"
-msgstr ""
+msgstr "Sprint de proyecto scrum"
 
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Feature Description"
-msgstr ""
+msgstr "Descripción característica"
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
 #, python-format
 msgid "Please select any Project."
-msgstr ""
+msgstr "Por favor, seleccione cualquier proyecto."
 
 #. module: project_scrum
 #: code:addons/project_scrum/wizard/project_scrum_email.py:0
 #, python-format
 msgid "Thank you,"
-msgstr ""
+msgstr "Gracias,"
 
 #. module: project_scrum
 #: code:addons/project_scrum/project_scrum.py:0
 #, python-format
 msgid "The sprint '%s' has been closed."
-msgstr ""
+msgstr "El sprint '%s' ha sido cerrado."
 
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint
 #: view:project.scrum.backlog.assign.sprint:0
 msgid "Assign Sprint"
-msgstr ""
+msgstr "Asignar sprint"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.create.task,user_id:0
@@ -1068,7 +1078,7 @@ msgstr "Asignar a"
 #. module: project_scrum
 #: view:postpone.wizard:0
 msgid "Are you sure to postpone Backlog ?"
-msgstr ""
+msgstr "¿ Seguro que desea postponer la pila ?"
 
 #. module: project_scrum
 #: field:project.scrum.backlog.assign.sprint,sprint_id:0
@@ -1085,7 +1095,7 @@ msgstr "Sprint"
 #: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
 #, python-format
 msgid "Please select at least two product Backlogs"
-msgstr ""
+msgstr "Por favor, seleccione al menos dos pilas de producto"
 
 #. module: project_scrum
 #: field:project.scrum.sprint,review:0
diff --git a/addons/project_scrum/i18n/project_scrum.pot b/addons/project_scrum/i18n/project_scrum.pot
index 4f08cbb9bbd..b29e9db8794 100644
--- a/addons/project_scrum/i18n/project_scrum.pot
+++ b/addons/project_scrum/i18n/project_scrum.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:01+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:01+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -73,6 +73,11 @@ msgstr ""
 msgid "What did you do since the last meeting?"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
+msgid "The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (e.g. one month) during which the team implements a list of product backlogs. The sprint review is organized when the team presents its work to the customer and product owner."
+msgstr ""
+
 #. module: project_scrum
 #: view:project.scrum.meeting:0
 #: view:project.scrum.product.backlog:0
@@ -103,7 +108,7 @@ msgid "Scrum Master"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:83
 #, python-format
 msgid "The sprint '%s' has been opened."
 msgstr ""
@@ -157,7 +162,7 @@ msgid "Merge Backlogs"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:53
 #, python-format
 msgid "Scrum Meeting : %s"
 msgstr ""
@@ -203,19 +208,20 @@ msgid "The scrum agile methodology is used in software development projects. In
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Please provide email address for product owner defined on sprint."
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:327
 #, python-format
 msgid "Scrum Meeting of %s"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
 #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
 #: view:project.scrum.product.backlog:0
 #: field:project.task,product_backlog_id:0
@@ -240,13 +246,15 @@ msgid "Start Task"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:90
+#: code:addons/project_scrum/wizard/project_scrum_email.py:93
+#: code:addons/project_scrum/wizard/project_scrum_email.py:96
 #, python-format
 msgid "None"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
 #, python-format
 msgid "*Blocks encountered:"
 msgstr ""
@@ -278,7 +286,7 @@ msgid "Computed using the sum of the task work done."
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:91
 #, python-format
 msgid "Task for Today"
 msgstr ""
@@ -299,7 +307,7 @@ msgid "Starting Date"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:94
 #, python-format
 msgid "Blocking points encountered:"
 msgstr ""
@@ -344,7 +352,7 @@ msgid "Sprints"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:314
 #, python-format
 msgid "Email notification could not be sent to the product owner %s"
 msgstr ""
@@ -383,7 +391,7 @@ msgid "Daily Scrum"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:324
 #, python-format
 msgid "for the Sprint"
 msgstr ""
@@ -401,7 +409,10 @@ msgid "Product Backlogs"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:301
+#: code:addons/project_scrum/project_scrum.py:303
+#: code:addons/project_scrum/project_scrum.py:314
+#: code:addons/project_scrum/project_scrum.py:316
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -423,7 +434,7 @@ msgid "Scrum"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:324
 #, python-format
 msgid "Hello "
 msgstr ""
@@ -434,14 +445,15 @@ msgid "Tasks for today"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:88
 #: field:project.scrum.meeting,question_yesterday:0
 #, python-format
 msgid "Tasks since yesterday"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -483,7 +495,7 @@ msgid "View project's tasks"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:56
 #, python-format
 msgid "Hello  , \n"
 "I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
@@ -590,7 +602,7 @@ msgid "The person who is responsible for the product"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
 #, python-format
 msgid "*Tasks since yesterday:"
 msgstr ""
@@ -692,7 +704,7 @@ msgid "Backlogs"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:326
 #, python-format
 msgid "Thank you"
 msgstr ""
@@ -728,18 +740,13 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid "The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a sprint of developement and can be split into several tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
 #. module: project_scrum
 #: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
 msgid "View sprint backlog"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
 #, python-format
 msgid "No Blocks"
 msgstr ""
@@ -779,7 +786,7 @@ msgid "Backlog Progress"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:301
 #, python-format
 msgid "Email notification could not be sent to the scrum master %s"
 msgstr ""
@@ -823,11 +830,6 @@ msgstr ""
 msgid "Information"
 msgstr ""
 
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid "The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (one month) on which the team implement a list of product backlogs. The sprint review is organized when the team presents his work to the customer and product owner."
-msgstr ""
-
 #. module: project_scrum
 #: view:project.scrum.product.backlog:0
 msgid "Remaining Hours"
@@ -861,6 +863,11 @@ msgstr ""
 msgid "Send Email for Scrum Meeting Details"
 msgstr ""
 
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid "The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
 #. module: project_scrum
 #: model:process.transition,name:project_scrum.process_transition_backlogtask0
 msgid "Backlog Task"
@@ -913,7 +920,7 @@ msgid "Progress (0-100)"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:324
 #, python-format
 msgid "I am sending you Daily Meeting Details of date"
 msgstr ""
@@ -964,13 +971,13 @@ msgid "This wizard merge backlogs and create one new backlog with draft state (O
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
 #, python-format
 msgid "*Task for Today:"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:303
 #, python-format
 msgid "Please provide email address for scrum master defined on sprint."
 msgstr ""
@@ -1013,19 +1020,19 @@ msgid "Feature Description"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
 #, python-format
 msgid "Please select any Project."
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:97
 #, python-format
 msgid "Thank you,"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:90
 #, python-format
 msgid "The sprint '%s' has been closed."
 msgstr ""
@@ -1058,7 +1065,7 @@ msgid "Sprint"
 msgstr ""
 
 #. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
 #, python-format
 msgid "Please select at least two product Backlogs"
 msgstr ""
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_merger.py b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
index 6672a83dc5c..c90ca26086b 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_merger.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_merger.py
@@ -97,7 +97,7 @@ class project_scrum_backlog_merge(osv.osv_memory):
         #To assing a new product backlog to merged tasks
         task_obj.write(cr, uid, task_lines, {'product_backlog_id': id_b})
         backlog_obj.unlink(cr, uid, context['active_ids'], context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 project_scrum_backlog_merge()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
index 52704fe1097..591e1d5da62 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py
@@ -62,7 +62,7 @@ class backlog_sprint_assign(osv.osv_memory):
             message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is assigned sprint:%s"%(sprint.name))
             self.log(cr, uid, backlog.id, message)
         backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 backlog_sprint_assign()
 
diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
index 3fca16e555f..ae8ba092981 100644
--- a/addons/project_scrum/wizard/project_scrum_email.py
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -103,5 +103,5 @@ class project_scrum_email(osv.osv_memory):
             tools.email_send(user_email, [data.scrum_master_email], data.subject, body, reply_to=user_email)
         if data.product_owner_email:
             tools.email_send(user_email, [data.product_owner_email], data.subject, body, reply_to=user_email)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 project_scrum_email()
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index df060defdf4..738eac50c2f 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/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:45+0000\n"
-"PO-Revision-Date: 2010-11-30 15:13+0000\n"
+"PO-Revision-Date: 2010-12-31 10:38+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
@@ -43,7 +43,7 @@ msgstr "Zeiterfassung Aufgaben"
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Suche Analytische Buchungen"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -90,17 +90,17 @@ msgstr "Stunden"
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Year "
-msgstr ""
+msgstr " Jahr "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -130,12 +130,12 @@ msgstr "Mai"
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -145,7 +145,7 @@ msgstr "Juni"
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Meine Arbeitszeiten"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
@@ -167,7 +167,7 @@ msgstr "Benutzer"
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
@@ -182,7 +182,7 @@ msgstr "Juli"
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Erweiterter Filter..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
@@ -197,7 +197,7 @@ msgstr "Abrechenbar"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Kunde"
 
 #. module: project_timesheet
 #: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -210,16 +210,23 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"        Durch diese Anwendung können Sie die direkt erfassten Zeiteinträge "
+"bei Projektaufgaben in die Liste Ihrer\n"
+"        Arbeitszeiterfassung transferieren und dort bei Bedarf in jeglicher "
+"Weise überarbeiten.\n"
+"\n"
+"    "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Account"
-msgstr ""
+msgstr "Analysekonto"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Abrechnung von Aufgaben"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
@@ -286,12 +293,12 @@ msgstr "Abrechnungsdaten"
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Finanzkonto"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month "
-msgstr ""
+msgstr " Monat "
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -317,7 +324,7 @@ msgstr "Aufgaben in Bearbeitung"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Monat-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -390,6 +397,9 @@ 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 ""
+"Diese Liste zeigt die Aufgaben, die abzurechnen sind für Rechnungen an "
+"Kunden. Wählen Sie die Positionen, für die Sie eine automatische Rechnung "
+"erstellen wollen."
 
 #, python-format
 #~ msgid "No employee defined for this user. You must create one."
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index 8af39e59da1..d1476ad5221 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/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-10-30 16:07+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-31 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:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
@@ -42,7 +41,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Buscar líneas analíticas"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -52,94 +51,96 @@ msgstr "Id de la línea de tiempos asociada"
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Trabajo tarea proyecto"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Disparar facturas desde líneas de pedidos de venta"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Horas tarea"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
 msgstr ""
+"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
+"del proyecto."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Year "
-msgstr ""
+msgstr " Año "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Factura tarea"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Trabajo de tarea"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "¡Error! No se pueden crear tareas recursivas."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Journal"
-msgstr ""
+msgstr "Diario"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -149,7 +150,7 @@ msgstr ""
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tarea"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
@@ -161,27 +162,27 @@ msgstr ""
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Usuario"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
@@ -196,7 +197,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Cliente"
 
 #. module: project_timesheet
 #: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -213,7 +214,7 @@ msgstr ""
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Account"
-msgstr ""
+msgstr "Cuenta"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
@@ -238,22 +239,22 @@ msgstr ""
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Disparar factura"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Tareas por usuario"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -269,32 +270,32 @@ msgstr ""
 #: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Proyecto"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Datos facturación"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Cuenta fin."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month "
-msgstr ""
+msgstr " Mes "
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Timesheet/Task hours Report Per Month"
-msgstr ""
+msgstr "Reporte por mes de horas de tareas/hojas de asistencia"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -305,32 +306,32 @@ msgstr "¡ Configuración errónea !"
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturación"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Trabajar en tarea"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mes-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Después que la tarea esté completada, crear su factura."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
@@ -341,7 +342,7 @@ msgstr ""
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
diff --git a/addons/project_timesheet/i18n/lv.po b/addons/project_timesheet/i18n/lv.po
index fef8564b39a..949c08a52b7 100644
--- a/addons/project_timesheet/i18n/lv.po
+++ b/addons/project_timesheet/i18n/lv.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: 2009-09-08 13:14+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2011-01-01 13:07+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-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
-msgstr ""
+msgstr "Lietotājam '%s' nav definēts darbinieks, kas obligāti jāizveido."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -36,12 +36,12 @@ msgstr ""
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
 msgid "Timesheet task"
-msgstr ""
+msgstr "Darba uzsk. tabulas uzdevums"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Meklēta analītikas rindas"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -51,151 +51,151 @@ msgstr "Saistītās hronoloģijas ID"
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
 msgid "Project Task Work"
-msgstr ""
+msgstr "Projekta uzdevuma darbs"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Februāris"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupēt pēc..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Iniciē rēķinus no klientu pasūtījumu rindām"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktobris"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,year:0
 msgid "Year"
-msgstr ""
+msgstr "Gads"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
-msgstr ""
+msgstr "Uzdevuma stundas"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Kļūda! Projekta sākuma datumam jābūt mazākam nekā beigu."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Year "
-msgstr ""
+msgstr " Gads "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Product"
-msgstr ""
+msgstr "Produkts"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
-msgstr ""
+msgstr "Marts"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusts"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
 msgid "Task invoice"
-msgstr ""
+msgstr "Uzdevuma rēķins"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_taskwork0
 msgid "Task Work"
-msgstr ""
+msgstr "Uzdevuma darbi"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Maijs"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Journal"
-msgstr ""
+msgstr "Žurnāls"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Jūnijs"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "My Entries"
-msgstr ""
+msgstr "Mani ieraksti"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Uzdevums"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
 msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Izrakstīt rēķinu par uzdevumu darbu"
 
 #. 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 "Lietotājs"
 
 #. module: project_timesheet
 #: constraint:project.project:0
 msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Kļūda! Nedrīkst piešķirt eskalāciju uz to pašu projektu!"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,name:0
 msgid "Date"
-msgstr ""
+msgstr "Datums"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Jūlijs"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Paplašinātie filtri..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Aizpildiet savu darba izsk. tabeli"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoiceable"
-msgstr ""
+msgstr "Izrakstāmi rēķini"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Customer"
-msgstr ""
+msgstr "Klients"
 
 #. module: project_timesheet
 #: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -212,47 +212,47 @@ msgstr ""
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Account"
-msgstr ""
+msgstr "Konts"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
 msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Izrakstīt rēķinus par uzdevumu darbu"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
 msgid "Timesheet Hours"
-msgstr ""
+msgstr "Darba uzsk. tabeles stundas"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_taskencoding0
 msgid "Task encoding"
-msgstr ""
+msgstr "Uzdevumu kodējums"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
 msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Uzdevuma kopsavilkums, kas nonāks darba uzsk. tabeles rindā"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvāris"
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_triggerinvoice0
 msgid "Trigger Invoice"
-msgstr ""
+msgstr "Iniciēt rēķinu"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembris"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Tasks by User"
-msgstr ""
+msgstr "Uzdevumi pēc lietotāja"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -268,27 +268,27 @@ msgstr ""
 #: view:account.analytic.line:0
 #: model:ir.model,name:project_timesheet.model_project_project
 msgid "Project"
-msgstr ""
+msgstr "Projekts"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprīlis"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Dati rēķinu izrakstišanai"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Fin. konts"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month "
-msgstr ""
+msgstr " Mēnesis "
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -304,43 +304,43 @@ msgstr "Nepareiza konfigurācija!"
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_billing
 msgid "Invoicing"
-msgstr ""
+msgstr "Rēķinu izrakstīšana"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
 msgid "Work on task"
-msgstr ""
+msgstr "Darbs pie uzdevuma"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid " Month-1 "
-msgstr ""
+msgstr " Mēnesis-1 "
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembris"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Decembris"
 
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
 msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Pēc uzdevuma pabeigšanas izveidot tam rēķinu."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
 msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mēnesis"
 
 #. module: project_timesheet
 #: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -350,12 +350,12 @@ msgstr "Projekta darbu uzskaites Tabele"
 #. module: project_timesheet
 #: model:process.transition,note:project_timesheet.process_transition_taskencoding0
 msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Iekodējiet cik daudz laika esat patērējis savam uzdevumam"
 
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
-msgstr ""
+msgstr "Izrakstīt rēķinu par uzdevuma darbu"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
@@ -371,12 +371,12 @@ msgstr ""
 #: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
 #: view:report.timesheet.task.user:0
 msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Uzdevuma stundas mēnesī"
 
 #. module: project_timesheet
 #: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
 msgid "Fill Timesheet"
-msgstr ""
+msgstr "Aizpildiet darba uzsk. tabeli"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 92b3f6d7042..f162d9ae0c6 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 14:37+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 07:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot
index 8bcf42dd13a..8006a8156f0 100644
--- a/addons/project_timesheet/i18n/project_timesheet.pot
+++ b/addons/project_timesheet/i18n/project_timesheet.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:02+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:02+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:53
 #, python-format
 msgid "No employee defined for user \"%s\". You must create one."
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:61
 #, python-format
 msgid "No journal defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
@@ -34,8 +34,8 @@ msgid "Timesheet task"
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Search Analytic Lines"
+#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
+msgid "Sign in / Sign out by project"
 msgstr ""
 
 #. module: project_timesheet
@@ -49,19 +49,18 @@ msgid "Project Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: selection:report.timesheet.task.user,month:0
-msgid "February"
+#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
 msgstr ""
 
 #. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
 #. module: project_timesheet
@@ -75,6 +74,11 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Analytic account/project"
+msgstr ""
+
 #. module: project_timesheet
 #: field:report.timesheet.task.user,task_hrs:0
 msgid "Task Hours"
@@ -91,8 +95,14 @@ msgid " Year "
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Product"
+#: model:ir.model,name:project_timesheet.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:229
+#, python-format
+msgid "Cannot delete Partner which is Assigned to project  !"
 msgstr ""
 
 #. module: project_timesheet
@@ -126,8 +136,9 @@ msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Journal"
+#: code:addons/project_timesheet/project_timesheet.py:229
+#, python-format
+msgid "Invalid action !"
 msgstr ""
 
 #. module: project_timesheet
@@ -135,11 +146,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "My Entries"
-msgstr ""
-
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
 msgid "Task"
@@ -151,7 +157,6 @@ msgid "Invoice Tasks Work"
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
@@ -172,11 +177,6 @@ msgstr ""
 msgid "July"
 msgstr ""
 
-#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Extended Filters..."
-msgstr ""
-
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
@@ -202,8 +202,8 @@ msgid "\n"
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Account"
+#: selection:report.timesheet.task.user,month:0
+msgid "February"
 msgstr ""
 
 #. module: project_timesheet
@@ -247,7 +247,7 @@ msgid "Tasks by User"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:57
 #, python-format
 msgid "No product defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
@@ -270,8 +270,8 @@ msgid "Invoicing Data"
 msgstr ""
 
 #. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Fin.Account"
+#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
+msgid "Encode how much time u spent on your task"
 msgstr ""
 
 #. module: project_timesheet
@@ -285,7 +285,10 @@ msgid "Timesheet/Task hours Report Per Month"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:52
+#: code:addons/project_timesheet/project_timesheet.py:56
+#: code:addons/project_timesheet/project_timesheet.py:60
+#: code:addons/project_timesheet/project_timesheet.py:67
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
@@ -321,8 +324,8 @@ msgid "After task is completed, Create its invoice."
 msgstr ""
 
 #. module: project_timesheet
-#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
-msgid "report.timesheet.task.user"
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sale order lines"
 msgstr ""
 
 #. module: project_timesheet
@@ -336,18 +339,13 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
-#. module: project_timesheet
-#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
-msgid "Encode how much time u spent on your task"
-msgstr ""
-
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
 msgstr ""
 
 #. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:68
 #, python-format
 msgid "No product and product category property account defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 42b9c4733ba..b6ec7d069bd 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -111,7 +111,7 @@ class project_work(osv.osv):
 
                 # Compute based on pricetype
                 amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
-                    prod_id, amount, False, unit, context=context)
+                    prod_id, amount, False, unit, vals_line['journal_id'], context=context)
                 if amount_unit and 'amount' in amount_unit.get('value',{}):
                     updv = { 'amount': amount_unit['value']['amount'] }
                     obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
@@ -158,7 +158,7 @@ class project_work(osv.osv):
                 # Compute based on pricetype
                 amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
                     prod_id=prod_id, company_id=False,
-                    unit_amount=vals_line['unit_amount'], unit=False, context=context)
+                    unit_amount=vals_line['unit_amount'], unit=False, journal_id=vals_line['journal_id'], context=context)
 
                 if amount_unit and 'amount' in amount_unit.get('value',{}):
                     vals_line['amount'] = amount_unit['value']['amount']
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 6b2f844338f..7d55ca419be 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -19,7 +19,7 @@
             </field>
         </record>
 
-	<record id="project_invoice_form_cutomer" model="ir.ui.view">
+        <record id="project_invoice_form_cutomer" model="ir.ui.view">
             <field name="name">Inherit project form : Customer</field>
             <field name="model">project.project</field>
             <field name="type">form</field>
@@ -50,10 +50,10 @@
             <field name="inherit_id" ref="account.view_account_analytic_line_filter"/>
             <field name="arch" type="xml">
                      <field name="account_id" position="replace">
-                    <field name="account_id" string="Project" />
+                    <field name="account_id" string="Analytic account/project" />
                 </field>
             </field>
-         </record>        
+         </record>
         <record id="view_account_analytic_line_form_inherit_account_id" model="ir.ui.view">
             <field name="name">account.analytic.line.form.account_id</field>
             <field name="model">account.analytic.line</field>
@@ -72,46 +72,12 @@
             <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
-                    <field name="account_id" string="Project"/>
+                    <field name="account_id" string="Analytic account/project"/>
                 </field>
             </field>
         </record>
-        <record id="view_account_analytic_line_filter_inherit_buttons" model="ir.ui.view">
-            <field name="name">account.analytic.line.inherit.select</field>
-            <field name="model">account.analytic.line</field>
-            <field name="type">search</field>
-			<field name="priority">10</field>
-            <field name="arch" type="xml">
-                <search string="Search Analytic Lines">
-                    <group col='6' colspan='4'>
-                        <field name="name"/>
-						<field name="date"/>
-                        <field name="account_id"/>
-                        <field name="user_id">
-                            <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
-                        </field>
-                    </group>
-					<newline/>
-                    <group expand="0" string="Extended Filters...">
-                        <field name="journal_id" widget="selection"/>
-                        <field name="product_id" widget="selection"/>
-                        <field name="amount" select="1"/>
-                    </group>
-                    <newline/>
-                    <group string="Group By..." expand="0">
-                        <filter string="Account" context="{'group_by':'account_id'}" groups="base.group_extended" icon="terp-folder-green"/>
-                        <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
-                        <separator orientation="vertical"/>
-                        <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
-                    </group>
-                </search>
-            </field>
-        </record>
 
- 		<!-- Menus -->
+        <!-- Menus -->
         <record id="action_project_timesheet_bill_task" model="ir.actions.act_window">
             <field name="name">Bill Tasks Works</field>
             <field name="res_model">account.analytic.line</field>
@@ -119,11 +85,10 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[]</field>
             <field name="context">{'search_default_to_invoice': 1}</field>
-			<field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
-			<field name="search_view_id" ref="view_account_analytic_line_filter_inherit_buttons"/>
+            <field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
             <field name="help">This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically.</field>
         </record>
-  		<menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
+        <menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
             id="menu_hr_timesheet_sign_in"
             groups="base.group_extended"
             parent="hr_attendance.menu_hr_attendance"
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index dbb57ef9d24..2ebbbc6f7b0 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/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:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:52+0000\n"
+"PO-Revision-Date: 2010-12-31 10:36+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -96,6 +96,7 @@ msgstr "Wollen Sie wirklich die Eingangsrechnungen erstellen ?"
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
+"Der ausgewählte Lieferant verkauft das Produkt ausschliesslich über %s"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:0
@@ -309,7 +310,7 @@ msgstr "Nettobetrag:"
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure Your Purchases Management Application"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre Anwendung für den Einkauf"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
@@ -518,7 +519,7 @@ msgstr "Rechnungserstellung"
 #. module: purchase
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: purchase
 #: field:purchase.order,partner_ref:0
@@ -606,7 +607,7 @@ msgstr "Abzurechnen"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 msgid "Pricelists"
-msgstr ""
+msgstr "Preislisten"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
@@ -635,7 +636,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Erstellte Eingangsrechnung für Beschaffungsauftrag"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -868,7 +869,7 @@ msgstr "Beschaffung"
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Rechnungen"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
@@ -996,7 +997,7 @@ msgstr "Einkaufspositionen"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1060,7 +1061,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_qty_per_product
@@ -1072,6 +1073,7 @@ msgstr "Menge nach Produkt"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: purchase
 #: help:purchase.order,date_order:0
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index cf3c9ea2e45..f7a7e6ebeb5 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/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-27 22:30+0000\n"
+"PO-Revision-Date: 2010-12-29 08:29+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-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -1168,6 +1168,17 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    El módulo de compras permite generar pedidos de compra para adquirir "
+"bienes de un proveedor.\n"
+"    Una factura de proveedor se crea para el pedido realizado en "
+"particular.\n"
+"    Cuadro de mandos para la gestión de compras que incluye:\n"
+"    * Pedidos actuales de compra.\n"
+"    * Pedidos de compra en borrador.\n"
+"    * Gráfico de cantidad y monto por mes.    \n"
+"\n"
+"    "
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -1661,6 +1672,18 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Tenga en cuenta que: \n"
+" \n"
+" Los pedidos sólo se fusionarán si: \n"
+" * Los pedidos de compra están en borrador. \n"
+" * Los pedidos pertenecen al mismo proveedor. \n"
+" * Los pedidos tienen la misma ubicación de stock y la misma lista de "
+"precios. \n"
+" \n"
+" Las líneas sólo se fusionarán si: \n"
+" * Las líneas de pedido son exactamente iguales excepto por el producto, "
+"cantidad y unidades. \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,product_uom:0
@@ -1709,6 +1732,14 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * El estado 'Borrador' se establece automáticamente cuando crea un pedido "
+"(presupuesto) de compra.                                        \n"
+"* El estado 'Confirmado' se establece automáticamente al confirmar el pedido "
+"de compra.                                        \n"
+"* El estado 'Hecho' se establece automáticamente cuando el pedido de compra "
+"se realiza.                                        \n"
+"* El estado 'Cancelado' se establece automáticamente cuando el usuario "
+"cancela un pedido de compra."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index f2618d4263b..e73811f21d0 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:03+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:03+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:22+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "The buyer has to approve the RFQ before being sent to the supplier. The R
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:282
 #, python-format
 msgid "You can not confirm purchase order without Purchase Order Lines."
 msgstr ""
@@ -39,7 +39,7 @@ msgid "Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:710
 #, python-format
 msgid "You have to select a product UOM in the same category than the purchase UOM of the product"
 msgstr ""
@@ -49,11 +49,21 @@ msgstr ""
 msgid "Date on which this document has been created"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid "You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding."
+msgstr ""
+
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr ""
+
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
@@ -80,20 +90,25 @@ msgid "Do you want to generate the supplier invoices ?"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid "Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:722
 #, python-format
 msgid "The selected supplier only sells this product by %s"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:156
 #, python-format
 msgid "Supplier Invoices"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.report:0
-msgid "Purchase Orders Statistics"
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
 msgstr ""
 
 #. module: purchase
@@ -103,7 +118,7 @@ msgid "From a Pick list"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:649
 #, python-format
 msgid "No Pricelist !"
 msgstr ""
@@ -128,11 +143,6 @@ msgstr ""
 msgid "Company"
 msgstr ""
 
-#. module: purchase
-#: help:res.company,po_lead:0
-msgid "This is the leads/security time for each purchase order."
-msgstr ""
-
 #. module: purchase
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
@@ -187,7 +197,7 @@ msgid "Partial Picking"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:286
 #, python-format
 msgid "Purchase order '%s' is confirmed."
 msgstr ""
@@ -206,19 +216,23 @@ msgid "Approved"
 msgstr ""
 
 #. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase"
+#: view:purchase.report:0
+msgid "Reference UOM"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.order:0
+msgid "Origin"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
-#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
-msgid "Receptions Analysis"
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
 msgstr ""
 
 #. module: purchase
@@ -230,7 +244,7 @@ msgid "Notes"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:649
 #, python-format
 msgid "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
@@ -301,7 +315,7 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:305
 #, python-format
 msgid "Purchase amount over the limit"
 msgstr ""
@@ -324,8 +338,8 @@ msgid "Shipping Exception"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Origin"
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
 msgstr ""
 
 #. module: purchase
@@ -355,7 +369,7 @@ msgid "Reference"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:237
 #, python-format
 msgid "Cannot delete Purchase Order(s) which are in %s State!"
 msgstr ""
@@ -366,8 +380,8 @@ msgid "Dest. Address Contact Name"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
-msgid "If you set the invoicing control on a purchase order as \"Manual\", you can track here all the purchase order lines for which you did not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu."
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: purchase
@@ -377,7 +391,7 @@ msgid "Day"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:334
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
 msgstr ""
@@ -394,8 +408,9 @@ msgid "# of Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#: code:addons/purchase/wizard/purchase_order_group.py:0
+#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -431,7 +446,7 @@ msgid "It indicates that a picking has been done"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:710
 #, python-format
 msgid "Wrong Product UOM !"
 msgstr ""
@@ -475,6 +490,11 @@ msgstr ""
 msgid "Supplier Reference"
 msgstr ""
 
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_productrecept0
 msgid "A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."
@@ -521,7 +541,7 @@ msgid "Order Lines"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:651
 #, python-format
 msgid "No Partner!"
 msgstr ""
@@ -539,11 +559,12 @@ msgstr ""
 
 #. module: purchase
 #: view:purchase.order:0
-msgid "To be Invoiced"
+msgid "Untaxed amount"
 msgstr ""
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
 msgstr ""
 
@@ -565,8 +586,10 @@ msgid "Invoices generated for a purchase order"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/wizard/purchase_line_invoice.py:122
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -617,7 +640,7 @@ msgid "Reservation Destination"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:237
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -662,6 +685,11 @@ msgstr ""
 msgid "Validated by"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid "Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it."
+msgstr ""
+
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -684,7 +712,7 @@ msgid "    Month-1    "
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:363
 #, python-format
 msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -695,7 +723,7 @@ msgid "Manual"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:400
 #, python-format
 msgid "You must first cancel all picking attached to this purchase order."
 msgstr ""
@@ -718,9 +746,13 @@ msgid "Approbation"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_res_partner
-#: field:purchase.order.line,partner_id:0
-msgid "Partner"
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid "If you set the invoicing control on a purchase order as \"Manual\", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu."
 msgstr ""
 
 #. module: purchase
@@ -749,6 +781,11 @@ msgstr ""
 msgid "Purchase Requisition"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr ""
+
 #. module: purchase
 #: view:purchase.report:0
 #: field:purchase.report,delay_pass:0
@@ -941,9 +978,8 @@ msgid "It indicates that an invoice has been paid"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_form_action
-msgid "From the Purchase Orders menu, you can track the status of your orders: products received, invoice received and controlled.\n"
-""
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
 msgstr ""
 
 #. module: purchase
@@ -988,7 +1024,7 @@ msgid "Manual Invoices"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:308
 #, python-format
 msgid "Somebody has just confirmed a purchase with an amount over the defined limit"
 msgstr ""
@@ -1004,25 +1040,20 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/wizard/purchase_line_invoice.py:123
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:408
 #, python-format
 msgid "You must first cancel all invoices attached to this purchase order."
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,help:purchase.action_invoice_pending
-msgid "Use this menu to control the invoices to be received by your supplier. OpenERP pre-generates draft of invoices based on your purchase orders or your receptions. Once you receive a supplier invoice, you can control it according to the draft of invoice and validate it."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/wizard/purchase_order_group.py:0
+#: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
 msgstr ""
@@ -1061,7 +1092,7 @@ msgid "\n"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:685
 #, python-format
 msgid "The selected supplier has a minimal quantity set to %s, you cannot purchase less."
 msgstr ""
@@ -1103,8 +1134,8 @@ msgid "Products Value"
 msgstr ""
 
 #. module: purchase
-#: help:purchase.order,amount_tax:0
-msgid "The tax amount"
+#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
+msgid "Pricelists Types"
 msgstr ""
 
 #. module: purchase
@@ -1125,8 +1156,8 @@ msgid "History"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
-msgid "Purchases"
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
 msgstr ""
 
 #. module: purchase
@@ -1312,7 +1343,7 @@ msgid "Date Approved"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:407
 #, python-format
 msgid "Could not cancel this purchase order !"
 msgstr ""
@@ -1328,17 +1359,13 @@ msgstr ""
 msgid "Delivery & Invoicing"
 msgstr ""
 
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_rfq
-msgid "With the Requests for quotation menu you can create new request for quotations, review existing one and confirm them to 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, invoice to control."
-msgstr ""
-
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
 msgid "Scheduled Date"
 msgstr ""
 
 #. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
 #: field:purchase.order,product_id:0
 #: view:purchase.order.line:0
 #: field:purchase.order.line,product_id:0
@@ -1361,8 +1388,8 @@ msgid "Description"
 msgstr ""
 
 #. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
 msgstr ""
 
 #. module: purchase
@@ -1370,6 +1397,12 @@ msgstr ""
 msgid "Expected Delivery address:"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
+
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
 msgid "The amount without tax"
@@ -1377,12 +1410,7 @@ msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_supplier_address_form
-msgid "Access your supplier records and maintain your relationship with them. You can track all your interactions with them through the history tab: emails, orders, meeting, etc."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,invoice_lines:0
-msgid "Invoice Lines"
+msgid "Access your supplier records and maintain a good relationship with your suppliers. You can track all your interactions with them through the History tab: emails, orders, meetings, etc."
 msgstr ""
 
 #. module: purchase
@@ -1398,7 +1426,6 @@ msgstr ""
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
-#: view:purchase.report:0
 msgid "Product UOM"
 msgstr ""
 
@@ -1425,7 +1452,7 @@ msgid "Total Qty and Amount by month"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:399
 #, python-format
 msgid "Could not cancel purchase order !"
 msgstr ""
@@ -1440,6 +1467,11 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Products Categories"
+msgstr ""
+
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
 #: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
@@ -1511,8 +1543,9 @@ msgid " Please note that: \n"
 msgstr ""
 
 #. module: purchase
-#: field:purchase.report,product_uom:0
-msgid "Product UoM"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
 msgstr ""
 
 #. module: purchase
@@ -1555,7 +1588,7 @@ msgid " * The 'Draft' state is set automatically when purchase order in draft st
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:414
 #, python-format
 msgid "Purchase order '%s' is cancelled."
 msgstr ""
@@ -1618,13 +1651,18 @@ msgid "The invoice is created automatically if the Invoice control of the purcha
 msgstr ""
 
 #. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,name:0
-msgid "Year"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:651
 #, python-format
 msgid "You have to select a partner in the purchase form !\n"
 "Please set one partner before choosing a product."
@@ -1641,13 +1679,14 @@ msgid "Partial Move"
 msgstr ""
 
 #. module: purchase
-#: model:ir.model,name:purchase.model_stock_move
-msgid "Stock Move"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
 msgstr ""
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 672c398dbd5..ebca800c5e3 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/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:45+0000\n"
-"PO-Revision-Date: 2010-12-21 13:34+0000\n"
+"PO-Revision-Date: 2011-01-01 13:38+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:05+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -595,7 +595,7 @@ msgstr "Счет будет выставлен"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 msgid "Pricelists"
-msgstr ""
+msgstr "Каталоги"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
@@ -616,7 +616,7 @@ msgstr ""
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Счета созданные для заказа на закупку"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -840,7 +840,7 @@ msgstr "Снабжение"
 #: view:purchase.order:0
 #: field:purchase.order,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Счета"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
@@ -1152,6 +1152,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s, you cannot purchase "
 "less."
 msgstr ""
+"Минимальное закупаемое количество у выбранного поставщика: %s. Нельзя купить "
+"меньше."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1685,7 +1687,7 @@ msgstr "Всего"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr ""
+msgstr "Версии каталогов"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index c2a01c5b846..359810fb306 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -9,15 +9,45 @@
             parent="base.menu_purchase_root" sequence="1" />
 
         <menuitem id="menu_purchase_config_purchase" name="Configuration"
+            groups="group_purchase_manager"
             parent="base.menu_purchase_root" sequence="100"/>
 
+        <menuitem 
+            id="menu_purchase_config_pricelist" name="Pricelists"
+            parent="menu_purchase_config_purchase" sequence="50"/>
+            
         <menuitem
             action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
-            parent="menu_purchase_config_purchase" sequence="2"/>
+            parent="menu_purchase_config_pricelist" sequence="20"/>
 
         <menuitem
             action="product.product_pricelist_action2" id="menu_product_pricelist_action2_purchase"
-            parent="menu_purchase_config_purchase" sequence="1"/>
+            parent="menu_purchase_config_pricelist" sequence="10"/>
+
+        <menuitem
+            action="product.product_pricelist_type_action" id="menu_purchase_product_pricelist_type"
+            parent="menu_purchase_config_pricelist" sequence="2"
+            groups="base.group_extended"/>
+
+        <menuitem 
+            id="menu_product_in_config_purchase" name="Product"
+            parent="menu_purchase_config_purchase" sequence="30"/>
+          
+        <menuitem
+            action="product.product_category_action_form" id="menu_product_category_config_purchase"
+            parent="purchase.menu_product_in_config_purchase" sequence="10"/>
+          
+        <menuitem 
+            id="menu_purchase_unit_measure_purchase" name="Units of Measure"
+            parent="purchase.menu_product_in_config_purchase"  sequence="20"/>
+            
+        <menuitem
+             action="product.product_uom_categ_form_action" id="menu_purchase_uom_categ_form_action"
+             parent="menu_purchase_unit_measure_purchase" sequence="30"/>
+             
+        <menuitem
+              action="product.product_uom_form_action" id="menu_purchase_uom_form_action"
+              parent="menu_purchase_unit_measure_purchase" sequence="30"/>
 
 
         <!--supplier addresses action-->
@@ -83,6 +113,10 @@
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Products"
           parent="base.menu_purchase_root" sequence="8"/>
+          
+      <menuitem name="Products by Category" id="menu_product_by_category_purchase_form" action="product.product_category_action"
+           parent="menu_procurement_management_product" sequence="10"/>
+          
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
           parent="menu_procurement_management_product"/>
 
@@ -99,7 +133,7 @@
                 </calendar>
             </field>
         </record>
-        <record model="ir.ui.view" id="view_purchase_order_graph">
+        <record model="ir.ui.view" id="purchase_order_graph">
             <field name="name">purchase.order.graph</field>
             <field name="model">purchase.order</field>
             <field name="type">graph</field>
@@ -155,7 +189,7 @@
                                 <field name="state" readonly="1"/>
                                 <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                                <button name="action_cancel" states="approved,except_picking,except_invoice" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
+                                <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
                                 <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
                                 <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
@@ -205,7 +239,7 @@
                     <separator orientation="vertical"/>
                     <filter icon="terp-emblem-important" name="exception" string="Exception" domain="[('state','in',('except_invoice','except_picking'))]" separator="1" help="Purchase order which are in the exception state"/>
                     <separator orientation="vertical"/>
-                    <filter icon="terp-gtk-go-back-rtl" string="To be Invoiced" domain="[('invoiced','=',1)]" separator="1" help="Purchase order to be invoiced"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="Not Invoiced" domain="[('invoice_ids','=', False)]" separator="1" help="Purchase orders that include lines not invoiced." groups="base.group_extended"/>
                     <separator orientation="vertical"/>
                     <field name="name" select="1" string="Reference"/>
                     <field name="partner_id" select="1"/>
@@ -256,10 +290,11 @@
             <field name="context">{'search_default_draft': 1}</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
-            <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>
+            <field name="help">You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding.</field>
         </record>
-        <menuitem action="purchase_rfq" id="menu_purchase_rfq" parent="menu_procurement_management"
-                sequence="6"/>
+        <menuitem action="purchase_rfq" id="menu_purchase_rfq" 
+            parent="menu_procurement_management"
+            sequence="6"/>
 
         <record id="purchase_form_action" model="ir.actions.act_window">
             <field name="name">Purchase Orders</field>
@@ -268,8 +303,7 @@
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="context">{'search_default_approved': 1,'search_default_create_uid':uid}</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
-            <field name="help">From the Purchase Orders menu, you can track the status of your orders: products received, invoice received and controlled.
-</field>
+            <field name="help">Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices.</field>
         </record>
         <menuitem action="purchase_form_action" id="menu_purchase_form_action" parent="menu_procurement_management" />
 
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index f9782edfb6d..4b143d0f961 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -131,25 +131,25 @@
   <story>
   <pto>
   <pto_header>
-    <blockTable colWidths="180.0,85.0,71.0,71.0,57.0,71.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Description</para>
+          <para style="terp_tblheader_General">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Taxes</para>
+          <para style="terp_tblheader_General">Taxes</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Date Req.</para>
+          <para style="terp_tblheader_General">Date Req.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
+          <para style="terp_tblheader_General_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
+          <para style="terp_tblheader_General_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Net Price</para>
+          <para style="terp_tblheader_General_Right">Net Price</para>
         </td>
       </tr>
     </blockTable>
@@ -251,31 +251,31 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="180.0,85.0,71.0,71.0,57.0,71.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Description</para>
+          <para style="terp_tblheader_General">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Taxes</para>
+          <para style="terp_tblheader_General">Taxes</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Date Req.</para>
+          <para style="terp_tblheader_General">Date Req.</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Qty</para>
+          <para style="terp_tblheader_General_Right">Qty</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
+          <para style="terp_tblheader_General_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Net Price</para>
+          <para style="terp_tblheader_General_Right">Net Price</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="179.0,85.0,71.0,71.0,57.0,71.0" style="Table_Order_Pur_line_Content">
+      <blockTable colWidths="180.0,70.0,60.0,80.0,60.0,85.0" style="Table_Order_Pur_line_Content">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]]</para>
@@ -284,7 +284,7 @@
             <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ formatLang( line.date_planned, date=True) ]]</para>
+            <para style="terp_default_9">[[ formatLang( line.date_planned, date=True) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] </para>
@@ -328,7 +328,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="394.0,55.0,85.0" style="Table_All_Total_Detail">
+    <blockTable colWidths="375.0,60.0,100.0" style="Table_All_Total_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -352,7 +352,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Purchase Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Purchase Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -384,4 +384,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 8c5510852ca..6b68cecf1a5 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -103,9 +103,10 @@ class purchase_report(osv.osv):
                     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,
+                    avg(100.0 * (l.price_unit*l.product_qty*u.factor) / NULLIF(t.standard_price*l.product_qty*u.factor, 0.0))::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)/NULLIF(sum(l.product_qty*u.factor),0.0))::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)
diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml
index 454580baaf4..ca089db7821 100644
--- a/addons/purchase/test/purchase_from_order.yml
+++ b/addons/purchase/test/purchase_from_order.yml
@@ -31,7 +31,6 @@
     date_order: '2010-05-11'
     invoice_method: order
     location_id: stock.stock_location_stock
-    name: PO00003
     order_line:
       - date_planned: '2010-05-13'
         name: iPod
diff --git a/addons/purchase/wizard/purchase_line_invoice.py b/addons/purchase/wizard/purchase_line_invoice.py
index f22df7aef41..3ff0ee53b6e 100644
--- a/addons/purchase/wizard/purchase_line_invoice.py
+++ b/addons/purchase/wizard/purchase_line_invoice.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-import netsvc
-import ir
 from osv import osv
 from tools.translate import _
 
@@ -52,7 +50,6 @@ class purchase_line_invoice(osv.osv_memory):
             invoices = {}
             invoice_obj=self.pool.get('account.invoice')
             purchase_line_obj=self.pool.get('purchase.order.line')
-            purchase_obj = self.pool.get('purchase.order')
             property_obj=self.pool.get('ir.property')
             account_fiscal_obj=self.pool.get('account.fiscal.position')
             invoice_line_obj=self.pool.get('account.invoice.line')
diff --git a/addons/purchase_analytic_plans/i18n/de.po b/addons/purchase_analytic_plans/i18n/de.po
index 3513a7c5d29..769f4e3b3da 100644
--- a/addons/purchase_analytic_plans/i18n/de.po
+++ b/addons/purchase_analytic_plans/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:45+0000\n"
-"PO-Revision-Date: 2010-12-01 09:34+0000\n"
+"PO-Revision-Date: 2010-12-31 10:22+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 04:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:00+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"
+"    Diese Anwendung ist die Basis für die Verteilung von analytischen "
+"Buchungen bei der Buchung von Eingangsrechnungen.\n"
+"    "
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
diff --git a/addons/purchase_analytic_plans/i18n/es.po b/addons/purchase_analytic_plans/i18n/es.po
index d50d57ec562..e8a736a784e 100644
--- a/addons/purchase_analytic_plans/i18n/es.po
+++ b/addons/purchase_analytic_plans/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 18:53+0000\n"
+"PO-Revision-Date: 2010-12-28 09:17+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/it.po b/addons/purchase_analytic_plans/i18n/it.po
index 1ae353896a9..60c17d6a572 100644
--- a/addons/purchase_analytic_plans/i18n/it.po
+++ b/addons/purchase_analytic_plans/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-09-29 08:45+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 21:55+0000\n"
+"Last-Translator: Roberto Onnis <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 04:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
@@ -29,7 +29,7 @@ msgstr "Gestione della distribuzione analitica degli acquisti"
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr ""
+msgstr "Riga Ordine di Acquisto"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
@@ -38,11 +38,16 @@ msgid ""
 "    The base module to manage analytic distribution and purchase orders.\n"
 "    "
 msgstr ""
+"\n"
+"    \\n\n"
+"    Il modulo di base per gestire le distribuzioni analitiche e gli ordini "
+"di acquisto.\\n\n"
+"    "
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Ordine di acquisto"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
diff --git a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
index 1f66b471ddf..75b4a5b2e34 100644
--- a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
+++ b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:03+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:03+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:23+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:23+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,19 +15,29 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase_analytic_plans
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
 msgid "Analytic Distribution"
 msgstr ""
 
 #. module: purchase_analytic_plans
-#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
-msgid "Purchase Analytic Distribution Management"
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase_analytic_plans
-#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
-msgid "Purchase Order Line"
+#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
+msgid "Purchase Analytic Distribution Management"
 msgstr ""
 
 #. module: purchase_analytic_plans
@@ -37,8 +47,3 @@ msgid "\n"
 "    "
 msgstr ""
 
-#. module: purchase_analytic_plans
-#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
-msgid "Purchase Order"
-msgstr ""
-
diff --git a/addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py b/addons/purchase_double_validation/__init__.py
similarity index 79%
rename from addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py
rename to addons/purchase_double_validation/__init__.py
index 9e4a5a45cb1..989850585bf 100644
--- a/addons/hr_holidays/migrations/1.5/post-00-change-requests-signs.py
+++ b/addons/purchase_double_validation/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,10 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-__name__ = "Change signs of old holiday requests"
 
-def migrate(cr, version):
-    cr.execute("DELETE FROM hr_holidays WHERE number_of_days < 0")
-    cr.execute("UPDATE hr_holidays SET number_of_days = -number_of_days, type ='remove'")
+import purchase_double_validation_installer
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py b/addons/purchase_double_validation/__openerp__.py
similarity index 58%
rename from addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
rename to addons/purchase_double_validation/__openerp__.py
index a59dbbf85eb..ca21dfc6077 100644
--- a/addons/hr_holidays/migrations/1.5/post-01-convert-limits-into-requests.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,21 +15,27 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-__name__ = "Convert the Holidays Per User limits into positive leave request"
-
-def migrate(cr, version):
-#    cr.execute("""SELECT id, employee_id, holiday_status, max_leaves, notes, create_uid
-#                    FROM hr_holidays_per_user;""")
-#    for record in cr.fetchall():
-#        cr.execute("""INSERT INTO hr_holidays 
-#            (employee_id, type, allocation_type, name, holiday_status_id, 
-#            state, number_of_days, notes, manager_id) VALUES
-#            (%s, 'add', 'company', 'imported holiday_per_user', %s,
-#            'validated', %s, %s, %s) """, (record[1],record[2],record[3],record[4],record[5]))
-    return {}
-        
 
+{
+    "name" : "purchase_double_validation",
+    "version" : "1.1",
+    "category": 'Generic Modules/Sales & Purchases',
+    "depends" : ["base","purchase"],
+    "author" : 'OpenERP SA',
+    "description": """
+	This module modifies the purchase workflow in order to validate purchases that exceeds minimum amount set by configuration wizard
+    """,
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': [
+	   'purchase_double_validation_workflow.xml',
+	   'purchase_double_validation_installer.xml'
+	    ],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
 
+}
diff --git a/addons/purchase_double_validation/i18n/purchase_double_validation.pot b/addons/purchase_double_validation/i18n/purchase_double_validation.pot
new file mode 100644
index 00000000000..bfd6d52a319
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/purchase_double_validation.pot
@@ -0,0 +1,80 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* purchase_double_validation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58:23+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:23+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.module.module,description:purchase_double_validation.module_meta_information
+msgid "\n"
+"	This module modifies the purchase workflow in order to validate purchases that exceeds minimum amount set by configuration wizard\n"
+"    "
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr ""
+
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.py b/addons/purchase_double_validation/purchase_double_validation_installer.py
new file mode 100644
index 00000000000..791d1bf6dce
--- /dev/null
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.py
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class purchase_double_validation_installer(osv.osv_memory):
+    _name = 'purchase.double.validation.installer'
+    _inherit = 'res.config'
+    _columns = {
+        'limit_amount': fields.integer('Maximum Purchase Amount', required=True, help="Maximum amount after which validation of purchase is required."),
+    }
+
+    _defaults = {
+        'limit_amount': 5000,
+    }
+
+    def execute(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, context=context)
+        if not data:
+            return {}
+        amt = data[0]['limit_amount']
+        data_pool = self.pool.get('ir.model.data')
+        transition_obj = self.pool.get('workflow.transition')
+        waiting = data_pool._get_id(cr, uid, 'purchase', 'trans_confirmed_router')
+        waiting_id = data_pool.browse(cr, uid, waiting, context=context).res_id
+        confirm = data_pool._get_id(cr, uid, 'purchase_double_validation', 'trans_waiting_confirmed')
+        confirm_id = data_pool.browse(cr, uid, confirm, context=context).res_id
+        transition_obj.write(cr, uid, waiting_id, {'condition': 'amount_total>=%s' % (amt)})
+        transition_obj.write(cr, uid, confirm_id, {'condition': 'amount_total<%s' % (amt)})
+        return {}
+
+purchase_double_validation_installer()
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/purchase_double_validation/purchase_double_validation_installer.xml b/addons/purchase_double_validation/purchase_double_validation_installer.xml
new file mode 100644
index 00000000000..c3369f68554
--- /dev/null
+++ b/addons/purchase_double_validation/purchase_double_validation_installer.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- configartion view -->
+
+        <record id="view_config_purchase_limit_amount" model="ir.ui.view">
+            <field name="name">Configure Limit Amount for Purchase</field>
+            <field name="model">purchase.double.validation.installer</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
+            <field name="arch" type="xml">
+              <data>
+                <form position="attributes">
+                  <attribute name="string">Purchase Application Configuration</attribute>
+                </form>
+                <separator string="title" position="attributes">
+                <attribute name="string">Configure Limit Amount for Purchase</attribute>
+                  </separator>
+                  <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">Define minimum amount after which puchase is needed to be validated.</attribute>
+                  </xpath>
+                <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                      <attribute name='rowspan'>15</attribute>
+                      <attribute name='string'></attribute>
+                  </xpath>
+                <group string="res_config_contents" position="replace">
+                  <field name="limit_amount"/>
+                  <newline/>
+                </group>
+              </data>
+            </field>
+        </record>
+
+        <record id="action_config_purchase_limit_amount" model="ir.actions.act_window">
+            <field name="name">Configure Limit Amount for Purchase</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">purchase.double.validation.installer</field>
+            <field name="view_id" ref="view_config_purchase_limit_amount"/>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <!-- register configuration wizard -->
+        <record id="config_wizard_step_purchase_limit_amount" model="ir.actions.todo">
+            <field name="action_id" ref="action_config_purchase_limit_amount"/>
+            <field name="restart">onskip</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/purchase_double_validation/purchase_double_validation_workflow.xml b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
new file mode 100644
index 00000000000..b4005133b60
--- /dev/null
+++ b/addons/purchase_double_validation/purchase_double_validation_workflow.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+         <record id="purchase.trans_confirmed_router" model="workflow.transition">
+            <field name="condition">amount_untaxed &gt;= 1000</field>
+            <field name="signal">purchase_approve</field>
+            <field name="group_id" ref="purchase.group_purchase_manager"/>
+        </record>
+
+        <record id="trans_waiting_confirmed" model="workflow.transition">
+            <field name="act_from" ref="purchase.act_confirmed"/>
+            <field name="act_to" ref="purchase.act_router"/>
+            <field name="condition">amount_untaxed &lt; 1000</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/purchase_requisition/i18n/de.po b/addons/purchase_requisition/i18n/de.po
index 48bb23d1d3c..9637ffd642d 100644
--- a/addons/purchase_requisition/i18n/de.po
+++ b/addons/purchase_requisition/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-01 08:38+0000\n"
+"PO-Revision-Date: 2010-12-31 10:31+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_requisition
@@ -180,6 +180,13 @@ msgid ""
 "    This new object will regroup and will allow you to easily keep track and "
 "order all your purchase orders.\n"
 msgstr ""
+"\n"
+"    Diese Anwendung ermöglicht die Verwaltung von Bedarfsmeldungen an den "
+"Einkauf.\n"
+"    Bei der Erstellung eines Beschaffungsauftrags können Sie nun wahlweise "
+"die korrespondierende Bedarfsmeldung speichern.\n"
+"    Das neue Modul bietet somit ein weiteres Kriterium für die Suche und "
+"Gruppierung von Beschaffungsaufträgen.\n"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
@@ -371,7 +378,7 @@ msgstr "Erfasse Angebot"
 #. module: purchase_requisition
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
diff --git a/addons/purchase_requisition/i18n/es.po b/addons/purchase_requisition/i18n/es.po
index 0329753c2be..6937aca97f8 100644
--- a/addons/purchase_requisition/i18n/es.po
+++ b/addons/purchase_requisition/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-12-16 12:24+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-31 10:19+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "En proceso"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
@@ -32,13 +32,13 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmar"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -53,29 +53,29 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,exclusive:0
 msgid "Requisition Type"
-msgstr ""
+msgstr "Tipo demanda"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -109,18 +109,18 @@ msgstr ""
 #: model:ir.model,name:purchase_requisition.model_product_product
 #: field:purchase.requisition.line,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Quotations"
-msgstr ""
+msgstr "Presupuestos"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: purchase_requisition
 #: help:product.product,purchase_requisition:0
@@ -132,13 +132,13 @@ msgstr ""
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,company_id:0
 #: field:purchase.requisition.line,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -153,12 +153,12 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Approved by Supplier"
-msgstr ""
+msgstr "Aprobado por proveedor"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Cambiar a borrador"
 
 #. module: purchase_requisition
 #: model:ir.module.module,description:purchase_requisition.module_meta_information
@@ -174,22 +174,22 @@ msgstr ""
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Order Reference"
-msgstr ""
+msgstr "Referencia pedido"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha inicio"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Cantidad"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
@@ -200,7 +200,7 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha final"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -226,12 +226,12 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Fecha pedido"
 
 #. module: purchase_requisition
 #: help:purchase.requisition,exclusive:0
@@ -246,45 +246,45 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel Purchase Order"
-msgstr ""
+msgstr "Cancelar pedido de compra"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_order
 #: view:purchase.requisition:0
 msgid "Purchase Order"
-msgstr ""
+msgstr "Pedido de compra"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: field:purchase.requisition.line,product_uom_id:0
 msgid "Product UoM"
-msgstr ""
+msgstr "UdM de producto"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Products"
-msgstr ""
+msgstr "Productos"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Order Date"
-msgstr ""
+msgstr "Fecha pedido"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
@@ -294,7 +294,7 @@ msgstr ""
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -309,29 +309,29 @@ msgstr ""
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
 msgid "Purchase orders"
-msgstr ""
+msgstr "Pedidos de compra"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: view:purchase.requisition:0
 #: field:purchase.requisition,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Origen"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Reference"
-msgstr ""
+msgstr "Referencia"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_procurement_order
 msgid "Procurement"
-msgstr ""
+msgstr "Abastecimiento"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Almacén"
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
@@ -341,7 +341,7 @@ msgstr ""
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Qty"
-msgstr ""
+msgstr "Ctd."
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -356,33 +356,33 @@ msgstr ""
 #. module: purchase_requisition
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Error: Codigo ean incorrecto"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Confirm Purchase Order"
-msgstr ""
+msgstr "Confirmar pedido de compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: purchase_requisition
 #: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
@@ -392,7 +392,7 @@ msgstr ""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned"
-msgstr ""
+msgstr "No asignado"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
@@ -402,4 +402,4 @@ msgstr ""
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
 msgid "Purchase Orders"
-msgstr ""
+msgstr "Pedidos de compra"
diff --git a/addons/purchase_requisition/i18n/fr_BE.po b/addons/purchase_requisition/i18n/fr_BE.po
deleted file mode 100644
index 02c91465144..00000000000
--- a/addons/purchase_requisition/i18n/fr_BE.po
+++ /dev/null
@@ -1,134 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* purchase_requisition
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 14:07:40+0000\n"
-"PO-Revision-Date: 2009-11-25 14:07:40+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: purchase_requisition
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML incorrect pour l'Architecture des Vues!"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Date End"
-msgstr "Date de fin"
-
-#. module: purchase_requisition
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'Objet doit commencer par x_ et ne pas comporter de caractères spéciaux !"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
-msgstr "Description"
-
-#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition
-#: field:purchase.order,requisition_id:0
-#: view:purchase.requisition:0
-msgid "Purchase requisition"
-msgstr "Appel d'Offre"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition
-msgid "Purchase requisitions"
-msgstr "Appels d'offre"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Open"
-msgstr "Ouvert"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_draft
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_draft
-msgid "Draft Purchase requisitions"
-msgstr "Appels d'Offre brouillons"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,state:0
-msgid "State"
-msgstr "Etat"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_open
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_open
-msgid "Open Purchase requisitions"
-msgstr "Appels d'offre ouverts"
-
-#. module: purchase_requisition
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nom de modèle incorrect pour la définition de l'action"
-
-#. module: purchase_requisition
-#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
-msgid "Purchase - Purchase requisition"
-msgstr "Achat - Appel d'offre"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,name:0
-msgid "requisition Reference"
-msgstr "Référence"
-
-#. module: purchase_requisition
-#: selection:purchase.requisition,state:0
-msgid "Close"
-msgstr "Clôturé"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,date_start:0
-msgid "Date Start"
-msgstr "Date de début"
-
-#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Quotations"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.module.module,description:purchase_requisition.module_meta_information
-msgid " This module allows you to manage your Purchase requisitions. When a purchase order is created, you now have the opportunity to save the related requisition. \n"
-"    This new object will regroup and will allow you to easily keep track and order all your purchase orders.\n"
-""
-msgstr "Ce module vous permet de gérer des appels d'offre. Quand un appel d'offre est créé, vous avez maintenant l'opportunité de conserver une trace. \n"
-"    Ce nouvel objet regroupe et conserve la trace de tous vos appels d'offre.\n"
-""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_new
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition1_new
-msgid "New Purchase requisitions"
-msgstr "Nouveaux Appels d'Offre"
-
-#. module: purchase_requisition
-#: field:purchase.requisition,purchase_ids:0
-msgid "Purchase Orders"
-msgstr "Bons d'achat"
-
diff --git a/addons/purchase_requisition/i18n/it.po b/addons/purchase_requisition/i18n/it.po
new file mode 100644
index 00000000000..5bfba50a3e9
--- /dev/null
+++ b/addons/purchase_requisition/i18n/it.po
@@ -0,0 +1,424 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+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: 2011-01-01 23:13+0000\n"
+"Last-Translator: Roberto Onnis <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: 2011-01-02 05:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "In progresso"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "No Product in Tender"
+msgstr "Nessun prodotto in offerta"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm"
+msgstr "Conferma"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsabile"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is a step before the request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to supplier. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+"Una richiesta di vendita rappresenta un passo antecedente al preventivo. In "
+"un richiesta di vendita (o offerta di vendita), è possibile registrare i "
+"prodotti che si desidera comprare ed innescare la creazione di una richiesta "
+"preventivo per il fornitore. Dopo che la negoziazione è terminata, non "
+"appena quindi tutte le offerte dei fornitori sono state valutate, è "
+"possibile confermarne alcune e cancellarne altre."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Stato"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Bozza"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "Fornitore"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipo richiesta"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Dettaglio prodotto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Data richiesta"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr "Richiesta d'acquisto"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Linea di richiesta d'acquisto"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Prodotto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Quotazioni"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descrizioni"
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr ""
+"Spuntare questa opzione se si desidera che le richieste generino richieste "
+"d'acquisto invece di creare direttamente dei preventivi."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Azienda"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "Richiedi preventivo"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "Più richieste"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Approvato dal fornitore"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Reimposta come bozza"
+
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid ""
+"\n"
+"    This module allows you to manage your Purchase Requisition.\n"
+"    When a purchase order is created, you now have the opportunity to save "
+"the related requisition.\n"
+"    This new object will regroup and will allow you to easily keep track and "
+"order all your purchase orders.\n"
+msgstr ""
+"\n"
+"    Questo modulo permette di gestire le proprie richieste di acquisto.\n"
+"    Ora, quando un ordine di acquisto viene creato, si ha l'opportunità di "
+"legare ad esso una richiesta.\n"
+"    Questo nuovo oggetto raggrupperà tutti i propri ordini di acquisto e "
+"permetterà quindi di tenerne traccia ed ordinarli facilmente.\n"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "Indirizzo"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Riferimento ordine"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Data inizio"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Quantità"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Richieste di acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Data fine"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Riferimento richiesta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Prodotti da acquistare"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Termine richiesta"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Cerca richieste d'acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Data ordine"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive):  On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple):  It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Richiesta d'acquisto(esclusiva): durante la conferma dell'ordine di acquisto "
+"cancella il rimanente ordine di acquisto.\n"
+"Richiesta d'acquisto(multipla): permette di avere diversi ordini di "
+"acquisto. Durante la conferma di un ordine di acquisto non cancella gli "
+"ordini rimanenti"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Cancella ordine di acquisto"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Ordine di Acquisto"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "Error!"
+msgstr "Errore!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "UoM prodotto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Prodotti"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Data ordine"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Cancellato"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr "["
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Partner richiesta ordine"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr "]"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Dettaglio preventivo"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Acquisto per richieste"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Ordini di acquisto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr "Origine"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Riferimento"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Approvvigionamento"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazzino"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Ultima richiesta"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Q.tà"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Richiesta d'acquisto (esclusiva)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Crea preventivo"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Errore: codice ean non valido"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "Fatto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "_Cancella"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Conferma ordine di acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase Requisition"
+msgstr "Acquisto- Richiesta d'acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Non assegnato"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Richiesta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Ordini di acquisto"
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index 5af7c176be8..56beeb7aca8 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:04+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:04+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:24+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "In Progress"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
 #, python-format
 msgid "No Product in Tender"
 msgstr ""
@@ -38,11 +38,6 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
-#. module: purchase_requisition
-#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
-msgid "A purchase requisition is a step before the request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to supplier. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others."
-msgstr ""
-
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Group By..."
@@ -105,8 +100,8 @@ msgid "Product"
 msgstr ""
 
 #. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Quotations"
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
 msgstr ""
 
 #. module: purchase_requisition
@@ -175,6 +170,11 @@ msgstr ""
 msgid "Start Date"
 msgstr ""
 
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid "A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others."
+msgstr ""
+
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_qty:0
 msgid "Quantity"
@@ -240,7 +240,7 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -323,6 +323,11 @@ msgstr ""
 msgid "Latest Requisition"
 msgstr ""
 
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr ""
+
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 msgid "Qty"
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index b0a8b453730..8dba2ab2eae 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -139,7 +139,7 @@ class purchase_requisition_partner(osv.osv_memory):
                             'order_id': purchase_id
                         })
                     order_line_obj.create(cr,uid,order_line)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 purchase_requisition_partner()
 
diff --git a/addons/report_designer/i18n/de.po b/addons/report_designer/i18n/de.po
index face1a404c5..fb4edd8dfb8 100644
--- a/addons/report_designer/i18n/de.po
+++ b/addons/report_designer/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-01 08:45+0000\n"
+"PO-Revision-Date: 2010-12-31 10: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:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_designer
@@ -32,7 +32,7 @@ msgstr "Abfrage Generator"
 #. module: report_designer
 #: view:report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. 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 ""
+"Die bereits in OpenERP vorhandene Funktion für die Anpassung von Reports "
+"kann durch folgende Anwendungen erweitert bzw. verbessert werden."
 
 #. module: report_designer
 #: view:report_designer.installer:0
 msgid "Configure Reporting Tools"
-msgstr ""
+msgstr "Konfiguration der Anwendungen für das Reportdesign"
 
 #. module: report_designer
 #: help:report_designer.installer,base_report_creator:0
@@ -88,6 +90,9 @@ msgid ""
 "OpenOffice.Once you have modified it you can upload the report using the "
 "same wizard."
 msgstr ""
+"Ergänzt einen Assistenten für den Import/Export von .sxw Dateien, die Sie "
+"einfach über OpenOffice Writer anpassen können. Anschliessend können Sie die "
+"geänderte Datei einfach wieder hochladen und den angepassten Report benutzen."
 
 #. module: report_designer
 #: model:ir.module.module,description:report_designer.module_meta_information
diff --git a/addons/report_designer/i18n/es.po b/addons/report_designer/i18n/es.po
index 1bff501da60..3f4ea9c6a72 100644
--- a/addons/report_designer/i18n/es.po
+++ b/addons/report_designer/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 18:58+0000\n"
+"PO-Revision-Date: 2010-12-28 09:04+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_designer
diff --git a/addons/report_designer/i18n/report_designer.pot b/addons/report_designer/i18n/report_designer.pot
index ff9c07bbf99..73374ea0bae 100644
--- a/addons/report_designer/i18n/report_designer.pot
+++ b/addons/report_designer/i18n/report_designer.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:04+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:04+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:24+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/report_designer/i18n/ru.po b/addons/report_designer/i18n/ru.po
index c6d35eebc5b..22435b55dad 100644
--- a/addons/report_designer/i18n/ru.po
+++ b/addons/report_designer/i18n/ru.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-11-22 07:38+0000\n"
+"PO-Revision-Date: 2011-01-01 12:53+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_designer
@@ -31,7 +31,7 @@ msgstr "Конструктор запроса"
 #. module: report_designer
 #: view:report_designer.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Настройка"
 
 #. module: report_designer
 #: view:report_designer.installer:0
@@ -68,7 +68,7 @@ msgstr ""
 #. module: report_designer
 #: view:report_designer.installer:0
 msgid "Configure Reporting Tools"
-msgstr ""
+msgstr "Инструментарий настройки отчетов"
 
 #. module: report_designer
 #: help:report_designer.installer,base_report_creator:0
diff --git a/addons/report_intrastat/i18n/de.po b/addons/report_intrastat/i18n/de.po
index 9a7ba85c31b..9062fce8198 100644
--- a/addons/report_intrastat/i18n/de.po
+++ b/addons/report_intrastat/i18n/de.po
@@ -7,20 +7,20 @@ 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-01 09:42+0000\n"
+"PO-Revision-Date: 2010-12-31 10:27+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:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Stornierte Rechnung"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
@@ -30,7 +30,7 @@ msgstr "Juni"
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "Der Code des Landes muss eindeutig sein!"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -52,6 +52,8 @@ msgstr "Preis pro Einheit"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Fehler: Die Standard Mengeneinheit sowie die Mengeneinheit für die "
+"Beschaffung muss in derselben Kategorie sein."
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
@@ -195,6 +197,11 @@ msgid ""
 "    This module gives the details of the goods traded between the countries "
 "of European Union "
 msgstr ""
+"\n"
+"    Diese Anwendung ergänzt die Finanzbuchhaltung durch die Intrastat "
+"Auswertung.\n"
+"    Diese Auswertung bietet Details über die innergemeinschaftlichen "
+"Lieferungen. "
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
@@ -204,7 +211,7 @@ msgstr "Land"
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Der Name des Landes muss eindeutig sein!"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
@@ -276,7 +283,7 @@ msgstr "Belegreferenz"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Hinweis Steuerzuordnung"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index c8aead6e999..7a7a424ee7f 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 18:59+0000\n"
+"PO-Revision-Date: 2010-12-28 08:50+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index a246cf3d8cb..c6943c9b368 100644
--- a/addons/report_intrastat/i18n/report_intrastat.pot
+++ b/addons/report_intrastat/i18n/report_intrastat.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:05+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:05+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/report_intrastat/i18n/ru.po b/addons/report_intrastat/i18n/ru.po
index af6ba8595c0..0b497da76c6 100644
--- a/addons/report_intrastat/i18n/ru.po
+++ b/addons/report_intrastat/i18n/ru.po
@@ -7,29 +7,29 @@ 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-10-30 11:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 12:50+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:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Отмененный счет"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The code of the country must be unique !"
-msgstr ""
+msgstr "Код страны должен быть уникальным !"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -51,6 +51,8 @@ msgstr "Цена за ед."
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Ошибка. ед. изм. по умолчанию и закупочные ед. изм. должны иметь одинаковую "
+"категорию."
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
@@ -60,7 +62,7 @@ msgstr "Импорт"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr ""
+msgstr "НДС:"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -80,7 +82,7 @@ msgstr "Налоги:"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
-msgstr ""
+msgstr "Март"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -91,7 +93,7 @@ msgstr "Описание"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
@@ -131,17 +133,17 @@ msgstr "База"
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Year"
-msgstr ""
+msgstr "Этот год"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
-msgstr ""
+msgstr "Январь"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
-msgstr ""
+msgstr "Июль"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -164,17 +166,17 @@ msgstr "Ссылка на партнера"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Всего (с налогами):"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
@@ -198,17 +200,17 @@ msgstr ""
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
 msgid "Country"
-msgstr ""
+msgstr "Страна"
 
 #. module: report_intrastat
 #: sql_constraint:res.country:0
 msgid "The name of the country must be unique !"
-msgstr ""
+msgstr "Название страны должно быть уникальным !"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
-msgstr ""
+msgstr "Сентябрь"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -218,7 +220,7 @@ msgstr "Налоги"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -255,12 +257,12 @@ msgstr ""
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -270,12 +272,12 @@ msgstr "Возвраты"
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Source document"
-msgstr ""
+msgstr "Документ - источник"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Замечание о системе налогообложения:"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -286,7 +288,7 @@ msgstr "Вес"
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Шаблон ТМЦ"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
@@ -296,7 +298,7 @@ msgstr ""
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -331,7 +333,7 @@ msgstr "Факс :"
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/security/ir.model.access.csv b/addons/report_intrastat/security/ir.model.access.csv
index f1a72c60072..f59d76ed536 100644
--- a/addons/report_intrastat/security/ir.model.access.csv
+++ b/addons/report_intrastat/security/ir.model.access.csv
@@ -4,4 +4,3 @@
 "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/de.po b/addons/report_webkit/i18n/de.po
index 7b7a03ac60c..55968a453bc 100644
--- a/addons/report_webkit/i18n/de.po
+++ b/addons/report_webkit/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-01 08:48+0000\n"
+"PO-Revision-Date: 2010-12-31 10:18+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit
@@ -173,7 +173,7 @@ msgstr ""
 #. module: report_webkit
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index 56fbc8ab0b4..c93aa91c50e 100644
--- a/addons/report_webkit/i18n/es.po
+++ b/addons/report_webkit/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-24 13:01+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 10:24+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit
@@ -519,6 +518,12 @@ msgid ""
 "          raise except_osv(\n"
 "                _('No header defined for this Webkit report!"
 msgstr ""
+"'))\n"
+"        header = report_xml.webkit_header.html\n"
+"        footer = report_xml.webkit_header.footer_html\n"
+"        if not header and report_xml.header:\n"
+"          raise except_osv(\n"
+"                _('Cabecera no definida para este reporte Webkit!"
 
 #. module: report_webkit
 #: help:res.company,lib_path:0
diff --git a/addons/report_webkit/i18n/pl.po b/addons/report_webkit/i18n/pl.po
index c2ad43f223c..cf6349db0b2 100644
--- a/addons/report_webkit/i18n/pl.po
+++ b/addons/report_webkit/i18n/pl.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-27 14:41+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:14+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit
diff --git a/addons/report_webkit/i18n/report_webkit.pot b/addons/report_webkit/i18n/report_webkit.pot
index 350aa630ffa..89185b2018a 100644
--- a/addons/report_webkit/i18n/report_webkit.pot
+++ b/addons/report_webkit/i18n/report_webkit.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:06+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:06+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgid "Company"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:84
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
 msgstr ""
@@ -79,7 +79,10 @@ msgid "B7  21  88 x 125 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:290
+#: code:addons/report_webkit/webkit_report.py:304
+#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:338
 #, python-format
 msgid "Webkit render"
 msgstr ""
@@ -90,7 +93,7 @@ msgid "Folio 27  210 x 330 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:67
 #, python-format
 msgid "Please install executable on your system'+\n"
 "                             ' (sudo apt-get install wkhtmltopdf) or download it from here:'+\n"
@@ -104,14 +107,14 @@ msgid "Name of Image"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:78
 #, 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
+#: code:addons/report_webkit/webkit_report.py:151
 #, python-format
 msgid "Webkit raise an error"
 msgstr ""
@@ -173,7 +176,7 @@ msgid "Type"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/wizard/report_webkit_actions.py:0
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:134
 #, python-format
 msgid "Client Actions Connections"
 msgstr ""
@@ -204,7 +207,7 @@ msgid "The header linked to the report"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:66
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
 msgstr ""
@@ -290,7 +293,7 @@ msgid "Top Margin (mm)"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:246
 #, python-format
 msgid "Please set a header in company settings"
 msgstr ""
@@ -436,7 +439,7 @@ msgid "A3  8   297 x 420 mm"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:240
 #, python-format
 msgid "'))\n"
 "        header = report_xml.webkit_header.html\n"
@@ -509,7 +512,7 @@ msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
 msgstr ""
 
 #. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:240
 #, python-format
 msgid "Webkit Report template not found !"
 msgstr ""
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index a287fd24906..8a2b259351c 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -128,7 +128,7 @@ class report_webkit_actions(osv.osv_memory):
                                 )
             if res[0]:
                 if not current.open_action:
-                    return {}
+                    return {'type': 'ir.actions.act_window_close'}
                 
                 return {
                     'name': _('Client Actions Connections'),
diff --git a/addons/report_webkit_sample/i18n/de.po b/addons/report_webkit_sample/i18n/de.po
index dd2b4d465c1..669572334d5 100644
--- a/addons/report_webkit_sample/i18n/de.po
+++ b/addons/report_webkit_sample/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-01 08:47+0000\n"
+"PO-Revision-Date: 2010-12-31 10:19+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit_sample
@@ -117,7 +117,7 @@ msgstr "Steuern"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "Amount"
-msgstr ""
+msgstr "Betrag"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
diff --git a/addons/report_webkit_sample/i18n/report_webkit_sample.pot b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
index 63e85ef71d4..bbf2c4dd3b1 100644
--- a/addons/report_webkit_sample/i18n/report_webkit_sample.pot
+++ b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:06+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:06+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,12 @@ msgid "WebKit invoice"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
 msgid "Supplier Invoice"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Unit Price"
 msgstr ""
 
@@ -48,92 +48,92 @@ msgid "Webkit Report Samples"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Disc.(%)"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
 msgid "Fax"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
 msgid "Document"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Description"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Price"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
 msgid "Invoice Date"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "QTY"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
 msgid "Base"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
 msgid "Partner Ref."
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
 msgid "Taxes"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
 msgid "Amount"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
 msgid "VAT"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
 msgid "Refund"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
 msgid "Tel"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
 msgid "E-mail"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
 msgid "Invoice"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
 msgid "Supplier Refund"
 msgstr ""
 
 #. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
 msgid "Total"
 msgstr ""
 
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 82d68f53ef4..9b9f6c7ca89 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -28,7 +28,7 @@
     "description": """
     Module for resource management
      A resource represent something that can be scheduled
-     (a developer on a task or a workcenter on manufacturing orders).
+     (a developer on a task or a work center on manufacturing orders).
      This module manages a resource calendar associated to every resource.
      It also manages the leaves of every resource.
 
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 40dccde4705..babb9dd80b9 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-01 07:43+0000\n"
+"PO-Revision-Date: 2010-12-31 10:58+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -97,12 +97,13 @@ msgstr "Abteilungsleiter"
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Working time will start from"
-msgstr ""
+msgstr "Arbeitszeit beginnt um"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Fehler ! Das Start Datum für die Abwesenheit muss vor dem Ende Datum liegen !"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -136,7 +137,7 @@ msgstr "Anfangsdatum"
 #. module: resource
 #: view:resource.calendar:0
 msgid "Search Working Time"
-msgstr ""
+msgstr "Suche Arbeitszeit"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -211,6 +212,21 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Anwendung für das Management von Ressourcen\n"
+"      Ein Ressource repräsentiert Gegenstände oder Personen deren "
+"Verfügbarkeit planbar ist\n"
+"      (z.B. ein Entwickler in einem Softwareunternehmen oder eine Maschine "
+"bei einem Fertigunsgbetrieb).\n"
+"      Diese Anwendung bietet für jede Ressource eine kalendarische Übersicht "
+"über die Verfügbarkeit bzw. der\n"
+"      Auslastung durch entsprechende Aufträge oder Aufgaben.\n"
+"      Ausserdem ist es möglich die Abwesenheit, bzw. die nicht Verfügbarkeit "
+"einer Ressource zu planen, z.B. für den\n"
+"      Fall von Urlaub, Aus- Fort- und Weiterbildung oder der planmäßigen  "
+"Wartung einer Maschine.\n"
+"\n"
+"    "
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -238,6 +254,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Bei Deaktivierung kann die Ansicht der Ressource ausgeblendet werden."
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
@@ -315,7 +332,7 @@ msgstr "Generelle Information"
 #. module: resource
 #: help:resource.calendar.attendance,hour_to:0
 msgid "Working time will end at"
-msgstr ""
+msgstr "Arbeitszeit endet um"
 
 #. module: resource
 #: view:resource.resource:0
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index 258183634a2..c1e04ac82d7 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/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-27 19:04+0000\n"
+"PO-Revision-Date: 2010-12-28 08:38+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index 43985994c8b..a539f6350bf 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:07+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:07+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:26+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -45,8 +45,6 @@ msgstr ""
 #: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
-#: view:resource.calendar.leaves:0
-#: view:resource.resource:0
 msgid "Working Time"
 msgstr ""
 
@@ -121,6 +119,11 @@ msgstr ""
 msgid "Day of week"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting date"
@@ -152,11 +155,6 @@ msgstr ""
 msgid "Search Working Period Leaves"
 msgstr ""
 
-#. module: resource
-#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
-msgid "Resources allows you to create and manage resources that should be involved in a specific project phase. It also allows you to set their efficiency level and workload based on their weekly working hours"
-msgstr ""
-
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
@@ -204,6 +202,9 @@ msgstr ""
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+#: field:resource.resource,calendar_id:0
 msgid "Working Period"
 msgstr ""
 
@@ -269,7 +270,6 @@ msgstr ""
 
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
-#: field:resource.resource,calendar_id:0
 msgid "Working time"
 msgstr ""
 
@@ -285,8 +285,8 @@ msgid "General Information"
 msgstr ""
 
 #. module: resource
-#: help:resource.calendar.attendance,hour_to:0
-msgid "Working time will end at"
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid "Resources allow you to create and manage resources that should be involved in a specific project phase. You can also set their efficiency level and workload based on their weekly working hours."
 msgstr ""
 
 #. module: resource
@@ -295,7 +295,7 @@ msgid "Inactive"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/faces/resource.py:0
+#: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
 msgstr ""
@@ -321,7 +321,7 @@ msgid "Start Date"
 msgstr ""
 
 #. module: resource
-#: code:addons/resource/resource.py:0
+#: code:addons/resource/resource.py:246
 #, python-format
 msgid " (copy)"
 msgstr ""
diff --git a/addons/resource/i18n/vi.po b/addons/resource/i18n/vi.po
new file mode 100644
index 00000000000..e30f2e9776d
--- /dev/null
+++ b/addons/resource/i18n/vi.po
@@ -0,0 +1,346 @@
+# Vietnamese 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-31 10:37+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: 2011-01-01 05:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: resource
+#: help:resource.calendar.leaves,resource_id:0
+msgid ""
+"If empty, this is a generic holiday for the company. If a resource is set, "
+"the holiday/leave is only for this resource"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Thứ sáu"
+
+#. module: resource
+#: field:resource.resource,resource_type:0
+msgid "Resource Type"
+msgstr "Kiểu tài nguyên"
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_leaves
+#: view:resource.calendar.leaves:0
+msgid "Leave Detail"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
+msgid "Resources Leaves"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,attendance_ids:0
+#: view:resource.calendar.attendance:0
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Working Time"
+msgstr "Thời gian làm việc"
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Thursday"
+msgstr "Thứ năm"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+msgid "Group By..."
+msgstr "Nhóm theo..."
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Sunday"
+msgstr "Chủ nhật"
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Search Resource"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Type"
+msgstr "Loại"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_resource_tree
+#: view:resource.resource:0
+msgid "Resources"
+msgstr "Tài nguyên"
+
+#. module: resource
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Trưởng nhóm"
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr ""
+
+#. module: resource
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar
+msgid "Resource Calendar"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar,company_id:0
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,company_id:0
+#: view:resource.resource:0
+#: field:resource.resource,company_id:0
+msgid "Company"
+msgstr "Công ty"
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Nguyên liệu"
+
+#. module: resource
+#: field:resource.calendar.attendance,dayofweek:0
+msgid "Day of week"
+msgstr "Ngày trong tuần"
+
+#. module: resource
+#: field:resource.calendar.attendance,date_from:0
+msgid "Starting date"
+msgstr "Ngày bắt đầu"
+
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Reason"
+msgstr "Lí do"
+
+#. module: resource
+#: view:resource.resource:0
+#: field:resource.resource,user_id:0
+msgid "User"
+msgstr "Người dùng"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Date"
+msgstr "Ngày"
+
+#. module: resource
+#: view:resource.calendar.leaves:0
+msgid "Search Working Period Leaves"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allows you to create and manage resources that should be involved "
+"in a specific project phase. It also allows you to set their efficiency "
+"level and workload based on their weekly working hours"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_to:0
+msgid "End Date"
+msgstr "Ngày kết thúc"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
+msgid "Closing Days"
+msgstr ""
+
+#. module: resource
+#: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
+#: view:resource.calendar.leaves:0
+#: field:resource.calendar.leaves,resource_id:0
+#: view:resource.resource:0
+msgid "Resource"
+msgstr "Tài nguyên"
+
+#. module: resource
+#: view:resource.calendar:0
+#: field:resource.calendar,name:0
+#: field:resource.calendar.attendance,name:0
+#: field:resource.calendar.leaves,name:0
+#: field:resource.resource,name:0
+msgid "Name"
+msgstr "Tên"
+
+#. module: resource
+#: model:ir.module.module,description:resource.module_meta_information
+msgid ""
+"\n"
+"    Module for resource management\n"
+"     A resource represent something that can be scheduled\n"
+"     (a developer on a task or a workcenter on manufacturing orders).\n"
+"     This module manages a resource calendar associated to every resource.\n"
+"     It also manages the leaves of every resource.\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Wednesday"
+msgstr "Thứ Tư"
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+msgid "Working Period"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_resource
+msgid "Resource Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,active:0
+msgid "Active"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,calendar_id:0
+msgid "Resource's Calendar"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,user_id:0
+msgid "Related user name for the resource to manage its access."
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,calendar_id:0
+msgid "Define the schedule of resource"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_from:0
+msgid "Work from"
+msgstr "Làm việc từ"
+
+#. module: resource
+#: field:resource.resource,code:0
+msgid "Code"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr ""
+
+#. module: resource
+#: help:resource.resource,time_efficiency:0
+msgid ""
+"This field depict the efficiency of the resource to complete tasks. e.g  "
+"resource put alone on a phase of 5 days with 5 tasks assigned to him, will "
+"show a load of 100% for this phase by default, but if we put a efficency of "
+"200%, then his load will only be 50%."
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,calendar_id:0
+#: field:resource.resource,calendar_id:0
+msgid "Working time"
+msgstr ""
+
+#. module: resource
+#: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "General Information"
+msgstr ""
+
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
+#. module: resource
+#: view:resource.resource:0
+msgid "Inactive"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/faces/resource.py:0
+#, python-format
+msgid "(vacation)"
+msgstr ""
+
+#. module: resource
+#: field:resource.resource,time_efficiency:0
+msgid "Efficiency factor"
+msgstr ""
+
+#. module: resource
+#: selection:resource.resource,resource_type:0
+msgid "Human"
+msgstr ""
+
+#. module: resource
+#: model:ir.model,name:resource.model_resource_calendar_attendance
+msgid "Work Detail"
+msgstr ""
+
+#. module: resource
+#: field:resource.calendar.leaves,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: resource
+#: code:addons/resource/resource.py:0
+#, python-format
+msgid " (copy)"
+msgstr ""
+
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Saturday"
+msgstr ""
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 19ece464eaf..30def0c2e16 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -229,7 +229,7 @@ class resource_resource(osv.osv):
         'resource_type': fields.selection([('user','Human'),('material','Material')], 'Resource Type', required=True),
         'user_id' : fields.many2one('res.users', 'User', help='Related user name for the resource to manage its access.'),
         'time_efficiency' : fields.float('Efficiency factor', size=8, required=True, help="This field depict the efficiency of the resource to complete tasks. e.g  resource put alone on a phase of 5 days with 5 tasks assigned to him, will show a load of 100% for this phase by default, but if we put a efficency of 200%, then his load will only be 50%."),
-        'calendar_id' : fields.many2one("resource.calendar", "Working time", help="Define the schedule of resource"),
+        'calendar_id' : fields.many2one("resource.calendar", "Working Period", help="Define the schedule of resource"),
     }
     _defaults = {
         'resource_type' : 'user',
@@ -299,11 +299,15 @@ class resource_resource(osv.osv):
             leave_list.sort()
         return leave_list
 
-    def compute_working_calendar(cr, uid, calendar_id, context=None):
+    def compute_working_calendar(self, cr, uid, calendar_id=False, context=None):
         """
         Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
         @param calendar_id : working calendar of the project
         """
+        if not calendar_id:
+            # Calendar is not specified: working days: 24/7
+            return [('fri', '1:0-12:0','12:0-24:0'), ('thu', '1:0-12:0','12:0-24:0'), ('wed', '1:0-12:0','12:0-24:0'), 
+                   ('mon', '1:0-12:0','12:0-24:0'), ('tue', '1:0-12:0','12:0-24:0'), ('sat', '1:0-12:0','12:0-24:0'), ('sun', '1:0-12:0','12:0-24:0')]
         resource_attendance_pool = self.pool.get('resource.calendar.attendance')
         time_range = "8:00-8:00"
         non_working = ""
@@ -321,8 +325,8 @@ class resource_resource(osv.osv):
             if week_days.has_key(week['dayofweek']):
                 day = week_days[week['dayofweek']]
                 wk_days[week['dayofweek']] = week_days[week['dayofweek']]
-            hour_from_str = convert_timeformat(cr, uid, week['hour_from'])
-            hour_to_str = convert_timeformat(cr, uid, week['hour_to'])
+            hour_from_str = convert_timeformat(week['hour_from'])
+            hour_to_str = convert_timeformat(week['hour_to'])
             res_str = hour_from_str + '-' + hour_to_str
             wktime_list.append((day, res_str))
         # Convert into format like [('mon', '8:00-12:00', '13:00-18:00')]
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 61b14c3614d..424955d0584 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -26,7 +26,7 @@
                         <separator orientation="vertical" groups="base.group_multi_company"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <separator orientation="vertical" />
-                        <filter string="Working Time" icon="terp-go-today" domain="[]" context="{'group_by':'calendar_id'}"/>
+                        <filter string="Working Period" icon="terp-go-today" domain="[]" context="{'group_by':'calendar_id'}"/>
                     </group>
                </search>
             </field>
@@ -57,7 +57,7 @@
                        <field name="name" string="Reason"/>
                        <field name="resource_id" string="Resource"/>
                        <field name="company_id" string="Company" widget="selection" groups="base.group_multi_company"/>
-                       <field name="calendar_id" string="Working Time" widget="selection"/>
+                       <field name="calendar_id" string="Working Period" widget="selection"/>
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
@@ -179,7 +179,7 @@
                    </group>
                    <notebook colspan="4">
                      <page string="General Information">
-                       <field name="calendar_id" widget="selection"/>
+                       <field name="calendar_id" string="Working Period"/>
                        <field name="time_efficiency" groups="base.group_extended"/>
                      </page>
 	           </notebook>
@@ -197,7 +197,7 @@
                     <field name="user_id" />
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="resource_type" />
-                    <field name="calendar_id" />
+                    <field name="calendar_id" string="Working Period"/>
                     <field name="time_efficiency" groups="base.group_extended"/>
                 </tree>
             </field>
@@ -225,7 +225,7 @@
                        </group>
                        <group colspan="2" col="2">
                            <field name="date_from"/>
-                           <field name="calendar_id"/>
+                           <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
                        <group colspan="2" col="2">
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 7c2ae788bf7..f40cebed684 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -10,7 +10,7 @@
             <field name="model">board.board</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Sales Manager Dashboard">
+                <form string="Sales Dashboard">
                     <hpaned position="100">
                         <child1>
                             <action  name="%(sale.action_quotation_for_sale)d" string="Quotations"/>
@@ -27,7 +27,7 @@
         </record>
 
         <record id="open_board_sales_manager" model="ir.actions.act_window">
-            <field name="name">Sales Manager Dashboard</field>
+            <field name="name">Sales Dashboard</field>
             <field name="res_model">board.board</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index b9a11ec9701..24f2ac1f37c 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -8,14 +8,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-14 21:47+0000\n"
+"PO-Revision-Date: 2010-12-31 11:02+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.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: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -59,13 +59,13 @@ msgstr "Auftrag stornieren"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr ""
+msgstr "Logistik für Verkaufsaufträge konfigurieren"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
+msgstr "Das Angebot '%s' wurde in einen Verkaufsauftrag konvertiert."
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -87,6 +87,8 @@ msgstr "USt."
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
 msgstr ""
+"Automatische Erstellung von Beschaffungsaufträgen für jede "
+"Verkaufsauftragsposition."
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -183,7 +185,7 @@ msgstr "Beauftragte Menge"
 #: model:ir.actions.act_window,name:sale.action_sales_by_salesman
 #: view:sale.report:0
 msgid "Sales by Salesman"
-msgstr ""
+msgstr "Verkäufe pro Verkäufer"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
@@ -232,7 +234,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Verkauf erstellt Rechnung"
 
 #. module: sale
 #: view:sale.order:0
@@ -267,7 +269,7 @@ msgstr "Produkte Verpackungen"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "Durch einen Verkaufsauftrag"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -309,6 +311,16 @@ msgid ""
 "  - The 'Invoice From The Picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Die Abrechnungsbedingung bei einem Auftrag steuert und synchronisiert die "
+"zeitliche Abfolge von Lieferung und Rechnung.\n"
+"  - Durch \"Zahlung vor Lieferung\" wird zuerst die Rechnung generiert, dann "
+"erst erfolgt ein Lieferauftrag aufgrund der Zahlung.\n"
+"  - Durch \"Lieferung & Manuelle Rechnung\" ist der Lieferauftrag "
+"unmittelbar verfügbar. Die Rechnung muss noch manuell erstellt werden.\n"
+"  - Durch \"Rechnung durch Auftrag\" erfolgt eine automatische Rechnung im "
+"Zustand Entwurf, wenn die Lieferung vollständig abgeschlossen wurde.\n"
+"  - Durch \"Rechnung durch Lieferung\" kann bei Abschluss einer Lieferung "
+"die Rechnung gleich mit erstellt werden."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -323,12 +335,13 @@ msgstr ""
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurieren"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -345,7 +358,7 @@ msgstr "Juni"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "Kann diesen Verkaufsauftrag nicht abbrechen."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
@@ -355,7 +368,7 @@ msgstr "Statistik Verkaufsauftrag"
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "Das analytische Konto zu diesem Verkaufsauftrag."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -365,12 +378,12 @@ msgstr "Oktober"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Lieferadresse für diesen Verkaufsauftrag."
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Preisliste für diesen Verkaufsauftrag."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -423,12 +436,17 @@ msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
 msgstr ""
+"Der Verkäufer bestätigt den Verkaufsauftrag. Der Status des "
+"Verkaufsauftrages wechselt entweder auf  'In Bearbeitung' oder auf  'Manuell "
+"in Bearbeitung'."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
+"Sie müssen zuerst alle Lieferungen für diese Verkaufsauftragsposition "
+"abbrechen."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -458,6 +476,8 @@ msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
+"Sie können keine Anzahlung für Aufträge erfassen, wenn als "
+"Abrechnungsbedingung 'Rechnung durch Lieferung' hinterlegt wurde."
 
 #. module: sale
 #: view:sale.order:0
@@ -470,12 +490,13 @@ msgstr "Bemerkungen"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Rechnungsadresse für diesen Verkaufsauftrag."
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Enhance your core Sales Application with additional functionalities."
 msgstr ""
+"Erweitern Sie Ihre Anwendung für den Verkauf durch weitere Funktionen."
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
@@ -506,7 +527,7 @@ msgstr "März"
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "Gesamtsumme."
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -524,11 +545,13 @@ msgid ""
 "For every sales order line, a procurement order is created to supply the "
 "sold product."
 msgstr ""
+"Für jede Verkaufsauftragsposition, wird automatisch ein Beschaffungsauftrag "
+"für den Einkauf des Produkts erstellt."
 
 #. module: sale
 #: view:board.board:0
 msgid "Sales by Customer"
-msgstr ""
+msgstr "Verkäufe pro Kunde"
 
 #. module: sale
 #: help:sale.order,incoterm:0
@@ -536,6 +559,9 @@ msgid ""
 "Incoterm which stands for 'International Commercial terms' implies its a "
 "series of sales terms which are used in the commercial transaction."
 msgstr ""
+"Der Begriff Incoterm steht für  'International Commercial terms' und "
+"impliziert eine Reihe von Bedingungen für den Verkauf und die Lieferung im "
+"internationalen Handel."
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -561,18 +587,18 @@ msgstr "# Positionen"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "Offene Ausgangsrechnungen"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Auftragsposition"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Setup your sales workflow and default values."
-msgstr ""
+msgstr "Verkaufsabfolge und Vorgabewerte einrichten"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
@@ -663,7 +689,7 @@ msgstr "Alle Angebote"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice On Order After Delivery"
-msgstr ""
+msgstr "Rechnung durch Auftrag nach Lieferung"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -712,7 +738,7 @@ msgstr "Verkäufe nach Monaten"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "Konnte Auftragsposition nicht stornieren!"
 
 #. module: sale
 #: field:res.company,security_lead:0
@@ -740,6 +766,9 @@ msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
 msgstr ""
+"Hier wird angezeigt, ob der Auftrag bereits ausgeliefert wurde. Dieses Feld "
+"wird immer nach Durchführung der automatischen Beschaffungsdisposition "
+"aktualisiert."
 
 #. module: sale
 #: view:sale.report:0
@@ -772,12 +801,36 @@ msgid ""
 "    * Graph of cases of the month\n"
 "    "
 msgstr ""
+"\n"
+"    Das Basismodul für die Angebotserstellung und das Management von "
+"Verkaufsaufträgen.\n"
+"\n"
+"     * Verkaufsvorgang über eine schrittweise Abfolge:\n"
+"         - Angebot -> Kundenauftrag -> Rechnung\n"
+"     * Verschiedene Abrechnungsmethoden:\n"
+"         - Rechnung durch Auftrag (vor oder nach der Auslieferung)\n"
+"         - Rechnung durch Lieferung\n"
+"         - Rechnung durch Zeiterfassung\n"
+"         - Anzahlungsrechnung\n"
+"     * Verwaltung der Partner Präferenzen (Versand, Rechnungsstellung, "
+"incoterm, ...)\n"
+"     * Produkte Bestände und Preise\n"
+"     * Lieferbedingungen:\n"
+"         - Komplettlieferung, Teillieferung\n"
+"         - Berechnung von Versandkosten\n"
+"     * Pinnwand für den Verkäufer mit folgenden Inhalten:\n"
+"     * Offene Angebote des Verkäufers\n"
+"     * Top 10 Verkäufe des Monats\n"
+"     * Statistiken zu Vertriebsvorgängen\n"
+"     * Grafik des Umsatz nach Produkten\n"
+"     * Grafik der Vertriebsvorgänge des Monats\n"
+"    "
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Verkaufsshop"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
@@ -840,6 +893,7 @@ msgstr ""
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
 msgstr ""
+"Sie können keinen Verkaufsauftrag stornieren, der bereits abgerechnet wurde."
 
 #. module: sale
 #: view:sale.order:0
@@ -898,7 +952,7 @@ msgstr "Berechne Umsatzsteuer"
 #: model:ir.actions.act_window,name:sale.action_sales_by_partner
 #: view:sale.report:0
 msgid "Sales by Partner"
-msgstr ""
+msgstr "Verkäufe pro Partner"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
@@ -958,7 +1012,7 @@ msgstr "Lieferanschrift:"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr ""
+msgstr "Entwurf Zustand des Verkaufsauftrags"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
@@ -998,7 +1052,7 @@ msgstr "Bestätige Angebot"
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
-msgstr ""
+msgstr "Referenz zu Beleg, der den Verkaufsauftrag ausgelöst hat"
 
 #. module: sale
 #: view:sale.order:0
@@ -1079,6 +1133,9 @@ msgid ""
 "The same sales order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Diese Liste beinhaltet alle Rechnungen für diesen Auftrag. Der gleiche "
+"Auftrag könnte mehrere Rechnungen verursacht haben, z.B. bei bereits "
+"erfolgter Abrechnung einzelner Positionen."
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -1088,7 +1145,7 @@ msgstr "Abrechnungsbedingung"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Datum der Auftragserstellung"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
@@ -1147,7 +1204,7 @@ msgstr "Fehler !"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "Verkaufsauftrag konnte nicht storniert werden"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1195,7 +1252,7 @@ msgstr "Verkauf"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice From The Picking"
-msgstr ""
+msgstr "Rechnung durch Lieferung"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
@@ -1316,6 +1373,9 @@ msgid ""
 "You have to select a customer in the sales form !\n"
 "Please set one customer before choosing a product."
 msgstr ""
+"Sie sollten eine Kunden im Verkaufsauftrag auswählen ! Bitte wählen Sie "
+"einen Kunden vor der Auswahl\n"
+"einzelner Produkte bei den Auftragspositionen aus."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -1325,7 +1385,7 @@ msgstr "Lieferauftrag & Auslieferung"
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Belegreferenz"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1345,18 +1405,18 @@ msgstr "Beleg der Auslieferung an Kunden"
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "Nettobetrag"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
+msgstr "Zuerst müssen Sie alle Lieferungen zu diesem Auftrag stornieren."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Anzahlungsrechnung"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1396,6 +1456,16 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the date 'Ordered Date'."
 msgstr ""
+"Zeigt den Zustand des Verkaufsauftrags:\n"
+"\n"
+"Der Fehlerzustand wird automatisch zugewiesen, wenn bei der "
+"Auftragsabwicklung bei der Erstellung der Lieferbelege oder der Erstellung "
+"von Rechnungsbelegen ein Fehler aufgetreten ist und somit eine vorherige  "
+"Überarbeitung erforderlich ist.\n"
+"\n"
+"Der Wartezustand wird automatisch zugewiesen wenn eine Rechnung bereits "
+"bestätigt wurde, zunächst aber ein weiterer Dispositionslauf für das "
+"Bestelldatum durchgeführt werden sollte."
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1438,11 +1508,12 @@ msgstr "Auftrag"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
+"Es ist kein Erlöskonto für das folgende Produkt definiert:: \"%s\" (id:%d)"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr ""
+msgstr "Ignoriere den Ausnahmefehler"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1452,6 +1523,11 @@ msgid ""
 "generates an invoice or a delivery order as soon as it is confirmed by the "
 "salesman."
 msgstr ""
+"Abhängig vom Abrechnungsumfang eines Verkaufsauftrags, kann die Rechnung auf "
+"Basis der beauftragten Mengen oder der ausgelieferten Mengen erfolgen. "
+"Hierdurch kann die Rechnungserstellung schon bei der Auftragserteilung so "
+"gesteuert werden, dass eine frühestmögliche Abrechnung durch den Vertriebler "
+"optional vorgesehen werden kann."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1489,6 +1565,8 @@ msgstr "Bruttobetrag"
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
+"Es wurde für das Unternehmen \"%s\" (id:%d) kein explizites Verkaufsjournal "
+"definiert."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1505,7 +1583,7 @@ msgstr ""
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "Auftragspositionen, die %s sind, können nicht gelöscht werden!"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1523,7 +1601,7 @@ msgstr "Abzurechnen"
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Datum der Auftragsbestätigung"
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1555,6 +1633,7 @@ msgstr "Abrechnungsfehler"
 msgid ""
 "This is a list of picking that has been generated for this sales order."
 msgstr ""
+"Diese Liste beinhaltet die Lieferaufträge für diesen Verkaufsauftrag."
 
 #. module: sale
 #: help:sale.installer,sale_margin:0
@@ -1612,7 +1691,7 @@ msgstr "Warnung"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 msgid "Sales by Month"
-msgstr ""
+msgstr "Verkäufe pro Monat"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1624,6 +1703,10 @@ msgid ""
 "\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"Sie haben %d Einheiten ausgewählt.\n"
+"Dies passt aber nicht zum ausgewählten Paket.\n"
+"Hier ist ein Vorschlag der zum Paket passt:\n"
+"EAN: %s Anzahl: %s Einheit: %s"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1648,6 +1731,12 @@ msgid ""
 "parts to the sales order. There is 1 pick list by sales order line which "
 "evolves with the availability of parts."
 msgstr ""
+"Die Erstellung des Lieferauftrags erfolgt unmittelbar auf eine "
+"Auftragsbestätigung, zeitgleich mit der Erstellung des  "
+"Beschaffungsauftrags. Der Lieferauftrag repräsentiert die zum "
+"Verkaufsauftrag einzupackenden Artikel. Hierzu gibt es einen Packauftrag mit "
+"allen Auftragsposition für den Kunden. Der Zustand des Packauftrags kann "
+"sich je nach der Verfügbarkeit von Teilen verändern."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1662,7 +1751,7 @@ msgstr "Bestätigen"
 #. module: sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: sale
 #: view:sale.order:0
@@ -1720,6 +1809,10 @@ msgid ""
 "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
+"Die Ausgangsrechnung kann für den Verkaufsauftrag aus folgendem Grund "
+"aktuell nicht erstellt werden:\n"
+"1. Der Status ist entweder \"In Entwurf\" oder \"Abgebrochen\"\n"
+"2. Der Verkaufsauftrag wurde bereits abgerechnet"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1752,6 +1845,10 @@ msgid ""
 "production of products regarding to the rules and to the sales order's "
 "parameters. "
 msgstr ""
+"Ein Beschaffungsauftrag wird spätestens dann ausgelöst, wenn ein "
+"Verkaufsauftrag bestätigt wird oder eine Ausgangsrechnung bezahlt wird. "
+"Einkauf und die Fertigung sind dabei abhängig von den Einstellungen beim "
+"Verkaufsauftrag selbst. "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1792,7 +1889,7 @@ msgstr "Anzahlungsrechnung"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "Der Auftrag '%s' wurde abgebrochen."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1812,16 +1909,26 @@ msgid ""
 "            \n"
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
+"* Der \"Entwurf\" Zustand wird gesetzt, wenn der entsprechenden "
+"Kundenauftrag im Entwurf Status ist.\n"
+"* Der \"Bestätigt\" Zustand wird gesetzt, wenn ein entsprechender "
+"Kundenauftrag bestätigt wird.\n"
+"* Die \"Ausnahme\" Stand wird gesetzt, wenn die entsprechenden Kundenauftrag "
+"als Ausnahme festgelegt wird.\n"
+"* Die 'Fertig' Zustand wird gesetzt, wenn ein Kundenauftrag fertig verpackt "
+"wurde.\n"
+"* Die 'Abbrechen ' Zustand wird gesetzt, wenn ein Benutzer versucht den "
+"Kundenauftrag und dessen Verbindung abbrechen will."
 
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "Steuerbetrag"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "Verpackungen"
 
 #. module: sale
 #: field:sale.config.picking_policy,progress:0
@@ -1878,6 +1985,8 @@ msgstr "Ihre Rechnung wurde erfolgreich generiert!"
 #, python-format
 msgid "You must first cancel all invoices attached to this sales order."
 msgstr ""
+"Zuerst sollten Sie alle existierenden Rechnungen zu diesem Verkaufsauftrag "
+"stornieren."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1887,7 +1996,7 @@ msgstr "Januar"
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure Your Sales Management Application"
-msgstr ""
+msgstr "Konfigurieren Sie Ihre Anwendungen für den Verkauf"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
@@ -1917,6 +2026,8 @@ msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
 msgstr ""
+"Ein Beschaffungsauftrag je Verkaufsauftragsposition und jede "
+"Produktkomponente."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -1931,19 +2042,19 @@ msgstr "Auftragsdatum"
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Bestätigte Verkaufsaufträge zur Abrechnung"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr ""
+msgstr "Bereits bestätigte Verkaufsaufträge können nicht gelöscht werden !"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "Der Auftrag '%s' wurde in den Zustand Entwurf versetzt"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1974,17 +2085,17 @@ msgstr "Nicht genügend Lagerware!"
 #. module: sale
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Layout Sequence"
-msgstr ""
+msgstr "Reihenfolge Auftragslayout"
 
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "Hier wird angezeigt, ob eine Rechnung bezahlt wurde."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -1994,6 +2105,12 @@ msgid ""
 "or sale order, it has to be linked to a shop. The shop also defines the "
 "warehouse from which the products will be delivered for each particular sale."
 msgstr ""
+"Wenn Sie mehr als einen Verkaufsshop für den Vertrieb Ihrer Produkte "
+"betreiben, können Sie Ihre Verkaufsshops hier erstellen und verwalten. Wann "
+"immer Sie ein Angebot oder einen neuen Verkaufsauftrag erstellen muss dieser "
+"zwingend einem Verkaufsshop zugeordnet sein. Einem Verkaufsshop wird auch "
+"ein Lager zugeordnet,wodurch der Lagerort bestimmt wird, von dem die "
+"Produkte an Kunden ausgeliefert werden."
 
 #. module: sale
 #: report:sale.order:0
@@ -2047,7 +2164,7 @@ msgstr "Finanzbuchhaltung"
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "Abfolge für die Auslieferung"
 
 #. module: sale
 #: view:sale.order:0
@@ -2058,7 +2175,7 @@ msgstr "Suche Verkaufsaufträge"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr ""
+msgstr "Anfrage Verkaufsauftrag"
 
 #. module: sale
 #: report:sale.order:0
@@ -2083,6 +2200,12 @@ msgid ""
 "having invoiced yet. If you want to analyse your turnover, you should use "
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Diese Auswertung analysiert Ihre Angebote und Verkaufsaufträge. Hierbei "
+"werden Ihre Verkaufsumsätze  ausgewertet und nach verschiedenen Kriterien "
+"gruppiert (Verkäufer, Partner, Produkt, etc). Benutzen Sie diese Auswertung "
+"außerdem, um noch nicht in Rechnung gestellte Verkaufsaufträge zu "
+"analysieren. Wenn Sie Ihren Umsatz analysieren möchten, nutzen Sie bitte die "
+"Statistik für die Umsatzerlöse in der Finanzbuchhaltung."
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 97aaecbc18e..b424b841bf7 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 13:49+0000\n"
+"PO-Revision-Date: 2010-12-28 08:59+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index f0df9f0f627..eba3ba00864 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 23:16+0000\n"
+"PO-Revision-Date: 2010-12-28 07:26+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index e58aa5ab72a..1b9ba1dc12e 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -7,20 +7,20 @@ 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-14 21:43+0000\n"
+"PO-Revision-Date: 2010-12-29 14:33+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
-"Language-Team: Vinteh\n"
+"Language-Team: Vinteh <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"
 
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
+msgstr "Dozvoljava izračun troškova dostave prema ponudama."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -28,7 +28,7 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
-"Prihvaćate li djelomičnu isporuku ako nematu na raspolaganju dovoljno robe "
+"Prihvaćate li djelomičnu isporuku ako nemate na raspolaganju dovoljno robe "
 "na zalihi?"
 
 #. module: sale
@@ -37,7 +37,7 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Ponude"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -49,24 +49,24 @@ msgstr "Količina"
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "Otkaži Narudžbu"
+msgstr "Otkaži narudžbu"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr ""
+msgstr "Promijeni postavke narudžbi logistike"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
+msgstr "Ponuda '%s' je promijenjena u narudžbu."
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -77,7 +77,7 @@ msgstr "Plaćanje prije isporuke"
 #: code:addons/sale/wizard/sale_make_invoice.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Upozorenje !"
 
 #. module: sale
 #: report:sale.order:0
@@ -87,7 +87,7 @@ msgstr "PDV"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
-msgstr ""
+msgstr "Izvršava postavke nabave za svaku stavku narudžbe."
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -105,18 +105,18 @@ msgstr "Analitički konto"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr ""
+msgstr "Narudžba nabave"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Line"
-msgstr "Linija Narudžbe"
+msgstr "Stavka narudžbe"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -127,6 +127,10 @@ msgid ""
 "the product is a service, shipped quantities means hours spent on the "
 "associated tasks."
 msgstr ""
+"Narudžba će automatski kreirati prijedlog fakture (nacrt fakture). Naručene "
+"i poslane količine se mogu razlikovati. Morate odlučiti želite li fakture "
+"temeljene na naručenim ili poslanim količinama. Ako je proizvod usluga, "
+"poslane količine označavaju sate utrošene na zajedničke zadatke."
 
 #. module: sale
 #: view:sale.report:0
@@ -142,7 +146,7 @@ msgstr "Standardan uvjet plaćanja"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr ""
+msgstr "Promijeni pravila odabira za narudžbu"
 
 #. module: sale
 #: view:sale.order:0
@@ -150,7 +154,7 @@ msgstr ""
 #: field:sale.order.line,state:0
 #: view:sale.report:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: sale
 #: report:sale.order:0
@@ -165,40 +169,40 @@ msgstr "Prisilno dodijeljivanje"
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "Označite kućicu za grupiranje faktura istih kupaca"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Ordered Quantities"
-msgstr "Količine Narudžbe"
+msgstr "Naručene količine"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_by_salesman
 #: view:sale.report:0
 msgid "Sales by Salesman"
-msgstr ""
+msgstr "Prodaje po prodavaču"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
 msgid "Inventory Moves"
-msgstr "Premještanje Zaliha"
+msgstr "Premještanje zaliha"
 
 #. module: sale
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
 msgid "Order Reference"
-msgstr "Referenca Narudžbe"
+msgstr "Referenca narudžbe"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Ostali podaci"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_line_tree2
@@ -208,6 +212,10 @@ msgid ""
 "this list if you invoice based on the delivery orders or if you invoice "
 "sales totally."
 msgstr ""
+"Ovdje je lista svih stavki narudžbe koju treba fakturirati. Ovaj pogled "
+"omogućava da se narudžba djelomično fakturira prema stavkama narudžbe. Ova "
+"lista nije potrebna ako se fakturira prema dostavnicama ili ako se fakturira "
+"ukupna prodaja."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -215,16 +223,18 @@ msgid ""
 "The invoice is created automatically if the shipping policy is 'Invoice from "
 "pick' or 'Invoice on order after delivery'."
 msgstr ""
+"Faktura se kreira automatski ako je način dostave 'Faktura iz načina "
+"slaganja robe' ili 'Faktura na narudžbu nakon dostave'."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Faktura obavljene prodaje"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr ""
+msgstr "Ponovno izradi pakiranje"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -235,14 +245,14 @@ msgstr "Popust (%)"
 #: help:res.company,security_lead:0
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
-msgstr ""
+msgstr "Sigurnosni dani dodani na broj dana dogovorenih sa kupcima"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
 msgid "Sales Manager Dashboard"
-msgstr ""
+msgstr "Upravljačka ploča upravitelja prodaje"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
@@ -252,23 +262,23 @@ msgstr "Pakiranje"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "Iz narudžbe"
 
 #. module: sale
 #: field:sale.shop,name:0
 msgid "Shop Name"
-msgstr "Ime dućana"
+msgstr "Naziv prodavaonice"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "No Customer Defined !"
-msgstr ""
+msgstr "Nije definiran kupac !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
-msgstr "Prodaje u Iznimki"
+msgstr "Prodaje u iznimci"
 
 #. module: sale
 #: view:sale.order:0
@@ -278,7 +288,7 @@ msgstr "Postavi na Nacrt"
 #. module: sale
 #: view:sale.order:0
 msgid "Conditions"
-msgstr ""
+msgstr "Uvjeti"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -294,6 +304,15 @@ msgid ""
 "  - The 'Invoice From The Picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Pravila otpremanja se koriste za usklađivanje fakture i postupaka dostave.\n"
+"  - 'Platiti prije dostave' izbor će prvo generirati fakturu, a zatim "
+"narudžbu za odabir nakon plaćanja ove fakture.\n"
+"  - 'Otprema i ručno napravljena faktura' će izravno napraviti narudžbu za "
+"odabir i čekati da korisnik ručno pokrene kreiranje nacrta fakture klikom na "
+"gumb 'Faktura'.\n"
+"  - 'Faktura na narudžbu nakon dostave' će napraviti nacrt fakture temeljen "
+"na narudžbi nakon što su sve liste odabira završene.\n"
+"  - 'Faktura iz odabira' će kreirati fakturu za vrijeme postupka odabira."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -302,63 +321,65 @@ msgid ""
 "There is no income category account defined in default Properties for "
 "Product Category or Fiscal Position is not defined !"
 msgstr ""
+"Nije definiran konto kategorije dohotka u standardnim značajkama za "
+"kategoriju proizvoda ili Fiskalna pozicija nije definirana !"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Promijeni postavke"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "invalid mode for test_state"
-msgstr ""
+msgstr "Neispravan način za test_state"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Lipanj"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "Nije moguće otkazati ovu narudžbu !"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "Statistika prodaje"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "Konto povezan sa narudžbom."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Listopad"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Adresa otpreme za trenutnu narudžbu."
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Cjenik za trenutnu narudžbu."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Delivery Order Only"
-msgstr "Samo Nalog za Isporuku"
+msgstr "Samo otpremnica"
 
 #. module: sale
 #: report:sale.order:0
@@ -370,34 +391,34 @@ msgstr "TVA :"
 msgid ""
 "Number of days between the order confirmation the shipping of the products "
 "to the customer"
-msgstr ""
+msgstr "Broj dana između potvrde narudžbe i otpremanja proizvoda kupcu"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "Datum ponude"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
 msgid "Fiscal Position"
-msgstr "Porezna Pozicija"
+msgstr "Porezna pozicija"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "UoM"
-msgstr "UoM"
+msgstr "JM"
 
 #. module: sale
 #: field:sale.order.line,number_packages:0
 msgid "Number Packages"
-msgstr "Broj Paketa"
+msgstr "Broj paketa"
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
-msgstr "U razvoju"
+msgstr "U tijeku"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -405,18 +426,20 @@ msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
 msgstr ""
+"Prodavač potvrđuje ponudu. Stanje narudžbe postaje 'U tijeku' ili 'Ručni "
+"postupak u tijeku'."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
+msgstr "Morate prije otkazati sve premještaje zalihe vezane uz ovu narudžbu."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "(n/a)"
-msgstr ""
+msgstr "(n/a)"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
@@ -424,6 +447,8 @@ msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
 msgstr ""
+"Odaberite proizvod tipa usluga koji se zove 'Proizvod predujma'. Možda ćete "
+"ga morati kreirati i postaviti kao standardnu vrijednost na ovom polju."
 
 #. module: sale
 #: report:sale.order:0
@@ -437,6 +462,8 @@ msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
+"Ne možete napraviti predujam prema narudžbi                              to "
+"je definirano kao 'Automatska faktura nakon dostave'."
 
 #. module: sale
 #: view:sale.order:0
@@ -449,43 +476,43 @@ msgstr "Bilješke"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Adresa fakture za trenutnu narudžbu."
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Enhance your core Sales Application with additional functionalities."
-msgstr ""
+msgstr "Poboljšajte aplikaciju za prodaju sa dodatnim funkcionalnostima."
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
-msgstr "Izdan Račun"
+msgstr "Fakturirano"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
 msgid "Delivery Order"
-msgstr "Isporuka narudžbe"
+msgstr "Otpremnica"
 
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Datum potvrde"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
-msgstr "Dodjeljeni Partner"
+msgstr "Dodjeljeni partner"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "Ukupan iznos."
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -495,7 +522,7 @@ msgstr "Međuzbroj"
 #. module: sale
 #: report:sale.order:0
 msgid "Invoice address :"
-msgstr "Adresa Računa :"
+msgstr "Adresa fakture :"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -503,11 +530,13 @@ msgid ""
 "For every sales order line, a procurement order is created to supply the "
 "sold product."
 msgstr ""
+"Za svaku stavku narudžbe kreira se zahtjev za nabavom da dopuni prodani "
+"proizvod."
 
 #. module: sale
 #: view:board.board:0
 msgid "Sales by Customer"
-msgstr ""
+msgstr "Prodaje po kupcu"
 
 #. module: sale
 #: help:sale.order,incoterm:0
@@ -515,16 +544,18 @@ msgid ""
 "Incoterm which stands for 'International Commercial terms' implies its a "
 "series of sales terms which are used in the commercial transaction."
 msgstr ""
+"Incoterm (akronim za 'International Commercial terms') ukazuje da se radi o "
+"nizu komercijalnih izraza koji se koriste pri komercijalnim transakcijama."
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
-msgstr "Adresa Računa"
+msgstr "Adresa fakture"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "Pretraži nefakturirane stavke"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
@@ -535,23 +566,23 @@ msgstr "Ponuda / Narudžba"
 #: view:sale.report:0
 #: field:sale.report,nbr:0
 msgid "# of Lines"
-msgstr "# Linija"
+msgstr "# linija"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "Otvorena faktura"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Stavka narudžbe"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Setup your sales workflow and default values."
-msgstr ""
+msgstr "Podesi radni slijed i standardne vrijednosti."
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
@@ -566,33 +597,33 @@ msgstr "Narudžba broj"
 #. module: sale
 #: field:sale.order,order_line:0
 msgid "Order Lines"
-msgstr "Vezane Prodajne Narudžbe"
+msgstr "Stavke narudžbe"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Untaxed amount"
-msgstr "Neoporeziv iznos"
+msgstr "Iznos bez poreza"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Lines to Invoice"
-msgstr ""
+msgstr "Stavke u fakturu"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
 msgid "Quantity (UoM)"
-msgstr "Količina (UoM)"
+msgstr "Količina (JM)"
 
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Datum kreiranja"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr "Neobračunate i isporučene linije"
+msgstr "Nefakturirane i dostavljene stavke"
 
 #. module: sale
 #: report:sale.order:0
@@ -602,13 +633,13 @@ msgstr "Ukupno :"
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "Moje prodaje"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Neispravna akcija !"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
@@ -621,39 +652,39 @@ msgstr "Cjenik"
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# količine"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Datum narudžbe"
 
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.report,shipped:0
 msgid "Shipped"
-msgstr ""
+msgstr "Otpremljeno"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 msgid "All Quotations"
-msgstr "Sve Ponude"
+msgstr "Sve ponude"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice On Order After Delivery"
-msgstr ""
+msgstr "Faktura na narudžbu nakon dostave"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Rujan"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Kategorija proizvoda"
 
 #. module: sale
 #: report:sale.order:0
@@ -663,50 +694,50 @@ msgstr "Porezi :"
 #. module: sale
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr "Premiještanje zaliha"
+msgstr "Premještaj zalihe"
 
 #. module: sale
 #: view:sale.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Godina  "
 
 #. module: sale
 #: field:sale.order,state:0
 #: field:sale.report,state:0
 msgid "Order State"
-msgstr "Stanje Narudžbe"
+msgstr "Stanje narudžbe"
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Želite li zaista kreirati fakturu(e)?"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales By Month"
-msgstr ""
+msgstr "Prodaje po mjesecu"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "Nije moguće otkazati stavke narudžbe !"
 
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "Sigurnosni dani"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr ""
+msgstr "Nabava prodanog materijala"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Create Final Invoice"
-msgstr ""
+msgstr "Napravi konačnu fakturu"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -719,11 +750,13 @@ msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
 msgstr ""
+"Pokazatelj da je narudžba dostavljena. Ovo polje se ažurira samo nakon "
+"pokretanja planera."
 
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filteri..."
 
 #. module: sale
 #: model:ir.module.module,description:sale.module_meta_information
@@ -751,22 +784,44 @@ msgid ""
 "    * Graph of cases of the month\n"
 "    "
 msgstr ""
+"\n"
+"    Osnovni modul za upravljanje ponudama i narudžbama.\n"
+"\n"
+"    * Radni slijed sa koracima provjere:\n"
+"        - Ponuda -> Narudžba -> Faktura\n"
+"    * Načini fakturiranja:\n"
+"        - Faktura prema narudžbi (prije ili poslije otpremanja)\n"
+"        - Faktura prema dostavi\n"
+"        - Faktura prema vremenskom rasporedu\n"
+"        - Faktura predujma\n"
+"    * Postavke partnera (otpremanje, fakturiranje,incoterm, ...)\n"
+"    * Zalihe i cijene proizvoda\n"
+"    * Načini dostavljanja:\n"
+"        - Sve odjednom, više pošiljki\n"
+"        - troškovi dostave\n"
+"    * Upravljačka ploča za prodavača uključuje:\n"
+"    * Vaše otvorene ponude\n"
+"    * Top 10 prodaja mjeseca\n"
+"    * Statistike pakiranja\n"
+"    * Graf prodaje po kutijama\n"
+"    * Graf kutija po mjesecu\n"
+"    "
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Prodavaonica"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Tvrtke"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Studeni"
 
 #. module: sale
 #: view:sale.order:0
@@ -776,7 +831,7 @@ msgstr "Povijest"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "Postavljena pravila odabira"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_form
@@ -790,23 +845,30 @@ msgid ""
 "generated so that you just have to confirm it when you want to bill your "
 "customer."
 msgstr ""
+"Forma narudžbi pomaže kod upravljanja ponudama i narudžbama za vaše kupce. "
+"OpenERP predlaže da započnete sa kreiranjem ponude. Jednom kada se obavi "
+"naručivanje, ponuda se pretvara u narudžbu. OpenERP može upravljati sa "
+"nekoliko tipova proizvoda tako da narudžba može pokrenuti zadatke, "
+"otpremnice, narudžbe proizvodnje, kupovine, idt. Temeljeno na postavkama "
+"narudžbe, nacrt fakture će se kreirati tako da ju je samo potrebno potvrditi "
+"kada želite naplatiti klijentu."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Your Reference"
-msgstr "Vaša Referenca"
+msgstr "Vaša referenca"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
 msgid ""
 "The name and address of the contact who requested the order or quotation."
-msgstr ""
+msgstr "Ime i adresa kontakta koji je zahtijevao narudžbu ili ponudu."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
-msgstr ""
+msgstr "Ne možete otkazati stavku narudžbe koja je već fakturirana !"
 
 #. module: sale
 #: view:sale.order:0
@@ -817,7 +879,7 @@ msgstr "Količina"
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "Reference"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -833,7 +895,7 @@ msgstr "Odustani"
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "Datumi naručivanja"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -849,12 +911,12 @@ msgstr "Jedinična cijena"
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Margine u narudžbama"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "Ukupan izuzeti porez"
 
 #. module: sale
 #: view:sale.order:0
@@ -865,7 +927,7 @@ msgstr "Izračunaj"
 #: model:ir.actions.act_window,name:sale.action_sales_by_partner
 #: view:sale.report:0
 msgid "Sales by Partner"
-msgstr ""
+msgstr "Prodaje po partneru"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
@@ -876,7 +938,7 @@ msgstr "Osoba za kontakt kod naručivanja"
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
 #: view:sale.open.invoice:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Otvorena faktura"
 
 #. module: sale
 #: report:sale.order:0
@@ -889,7 +951,7 @@ msgstr "Cijena"
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "Sales Application Configuration"
-msgstr ""
+msgstr "Konfiguracija aplikacije"
 
 #. module: sale
 #: view:sale.report:0
@@ -900,17 +962,17 @@ msgstr "Ukupna cijena"
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "on order"
-msgstr "Po Narudžbi"
+msgstr "Po narudžbi"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
+msgstr "Temeljeno na otpremljenim ili naručenim količinama."
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr ""
+msgstr "Pripadajući odabir"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
@@ -920,37 +982,37 @@ msgstr "Ime"
 #. module: sale
 #: report:sale.order:0
 msgid "Shipping address :"
-msgstr "Adresa Otpreme"
+msgstr "Adresa otpreme"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr ""
+msgstr "Narudžba u stanju nacrta"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr ""
+msgstr "Napravi otpremnicu"
 
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Troškovi dostave"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Ukupan uračunati porez"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr ""
+msgstr "Napravi listu odabira"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Product Category"
-msgstr ""
+msgstr "Prodaje po kategoriji proizvoda"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -960,30 +1022,30 @@ msgstr "Djelomična isporuka"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_confirmquotation0
 msgid "Confirm Quotation"
-msgstr "Potvrdite Ponudu"
+msgstr "Potvrdite ponudu"
 
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
-msgstr ""
+msgstr "Referenca na dokument koji je generirao ovu narudžbenicu."
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "grupiraj po..."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Invoice"
-msgstr "Ponovo izradi Račun"
+msgstr "Ponovno izradi fakturu"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Otpremnice u fakturu"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -994,28 +1056,28 @@ msgstr "Raspored čekanja"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Metoda nabave"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "title"
-msgstr ""
+msgstr "naslov"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr ""
+msgstr "Lista odabira"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Datum narudžbe"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Dokument premještaja na izlaz ili kod kupca."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1025,12 +1087,12 @@ msgstr "Ovjeri"
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Order"
-msgstr "Potvrdite Narudžbu"
+msgstr "Potvrdite narudžbu"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "Napravi zahtjev za nabavom"
 
 #. module: sale
 #: view:sale.order:0
@@ -1046,6 +1108,8 @@ msgid ""
 "The same sales order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Ovo je lista faktura koje su generirane za ovu narudžbu. Ista narudžba može "
+"biti fakturirana više puta (npr. prema stavkama)."
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -1055,18 +1119,18 @@ msgstr "Pravila otpreme"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Datum kreiranja narudžbe"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Premještaj zalihe"
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Napravi fakture"
 
 #. module: sale
 #: view:sale.order:0
@@ -1076,50 +1140,50 @@ msgstr "Dodatne informacije"
 #. module: sale
 #: report:sale.order:0
 msgid "Fax :"
-msgstr "Fax:"
+msgstr "Faks:"
 
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr ""
+msgstr "Iznos predujma"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_product_total_price
 msgid "Sales by Product's Category"
-msgstr ""
+msgstr "Prodaje po kategoriji proizvoda"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
-msgstr "Količine Otpreme"
+msgstr "Otpremljene količine"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr "Račun temeljen na Prodajnim Narudžbama"
+msgstr "Faktura na temelju narudžbi"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Lista odabira"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Pogreška !"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "Nije moguće otkazati narudžbu !"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Srpanj"
 
 #. module: sale
 #: field:sale.order.line,procurement_id:0
@@ -1130,23 +1194,23 @@ msgstr "Nabava"
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Shipping Exception"
-msgstr "Izuzetak kod Otpreme"
+msgstr "Izuzetak kod otpreme"
 
 #. module: sale
 #: field:sale.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr "Grupa računa"
+msgstr "Grupiraj fakture"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Shipping & Manual Invoice"
-msgstr "Otprema i ručno izdan Račun"
+msgstr "Otprema i ručno napravljena faktura"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Picking Information !"
-msgstr ""
+msgstr "Informacija odabira !"
 
 #. module: sale
 #: view:sale.report:0
@@ -1157,28 +1221,28 @@ msgstr "Mjesec"
 #. module: sale
 #: model:ir.module.module,shortdesc:sale.module_meta_information
 msgid "Sales Management"
-msgstr "Upravljanje Prodajom"
+msgstr "Upravljanje prodajom"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice From The Picking"
-msgstr ""
+msgstr "Faktura iz odabira"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Potreban pregled od strane računovođe."
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create invoices"
-msgstr "Napravi Račune"
+msgstr "Napravi fakture"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Sale OrderLine Make_invoice"
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1188,11 +1252,15 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
+"Uobičajeno, OpenERP može upravljati kompleksnim rutiranjem i putevima "
+"proizvoda u vašem skladištu i na partnerskim lokacijama. Ovo će definirati "
+"uobičajene i jednostavne metode za dostavu proizvoda kupcu sa jednom do "
+"dvije akcije radnika."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Stare ponude"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1204,7 +1272,7 @@ msgstr "Plaćeno"
 #: model:ir.ui.menu,name:sale.menu_report_product_all
 #: view:sale.report:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "Analiza prodaje"
 
 #. module: sale
 #: field:sale.order.line,property_ids:0
@@ -1225,12 +1293,15 @@ msgid ""
 "is 'Shipping and Manual in Progress'. The invoice is created automatically "
 "if the shipping policy is 'Payment before Delivery'."
 msgstr ""
+"Prodavač kreira fakturu ručno, ako je pravilo otpremanja narudžbe "
+"'Otpremanje i ručni postupak u tijeku'. Faktura se kreira automatski ako je "
+"postavljeno pravilo otpremanja 'Plaćanje prije dostave'."
 
 #. module: sale
 #: help:sale.config.picking_policy,order_policy:0
 msgid ""
 "You can generate invoices based on sales orders or based on shippings."
-msgstr ""
+msgstr "Možete napraviti fakture prema narudžbama ili otpremnicama."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -1247,7 +1318,7 @@ msgstr "Prodaje"
 #: view:sale.advance.payment.inv:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
-msgstr "Napravi Račun"
+msgstr "Napravi fakturu"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1255,18 +1326,18 @@ msgstr "Napravi Račun"
 #: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Done"
-msgstr "Gotovo"
+msgstr "Završeno"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
 msgid "sale.installer"
-msgstr ""
+msgstr "sale.installer"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
 #: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
-msgstr "Račun"
+msgstr "Faktura"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1275,52 +1346,54 @@ msgid ""
 "You have to select a customer in the sales form !\n"
 "Please set one customer before choosing a product."
 msgstr ""
+"Morate odabrati kupca na formi prodaje !\n"
+"Odaberite kupca prije odabira proizvoda."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr ""
+msgstr "Lista odabira i otpremnice"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
-msgstr ""
+msgstr "Za napraviti"
 
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Picking Policy"
-msgstr ""
+msgstr "Pravila odabira"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Dokument premještaja kod kupca."
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "Iznos bez poreza."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
+msgstr "Morate prije otkazati sve odabire vezane uz ovu narudžbu."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Faktura za predujam plaćanja"
 
 #. module: sale
 #: field:sale.order,incoterm:0
 msgid "Incoterm"
-msgstr "Inkoterm"
+msgstr "Incoterm"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1333,7 +1406,7 @@ msgstr "Proizvod"
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturiranje"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
@@ -1355,11 +1428,16 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the date 'Ordered Date'."
 msgstr ""
+"Daje stanje ponude ili narudžbe.\n"
+"Stanje iznimke se postavlja automatski pri otkazivanju u validaciji fakture "
+"(Iznimka fakture) ili u procesu liste odabira (Iznimka otpreme).\n"
+"Stanje 'Čeka raspored' se postavlja kada je faktura potvrđena, ali čeka da "
+"planer pokrene akciju na datum 'Datum naručivanja'"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
-msgstr "Račun za"
+msgstr "Faktura za"
 
 #. module: sale
 #: report:sale.order:0
@@ -1369,7 +1447,7 @@ msgstr "Datum narudžbe"
 #. module: sale
 #: field:sale.order.line,product_uos:0
 msgid "Product UoS"
-msgstr "Proizvod UoS"
+msgstr "Proizvod - jedinica prodaje"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1380,12 +1458,12 @@ msgstr "Ručni postupak u tijeku"
 #. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Product UoM"
-msgstr "Proizvod UoM"
+msgstr "Proizvod JM"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Logistic"
-msgstr ""
+msgstr "Logistika"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1396,12 +1474,12 @@ msgstr "Narudžba"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Ne postoji konto dohotka definiran za ovaj proizvod: \"%s\" (id:%d)"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr ""
+msgstr "Zanemari iznimku"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1411,6 +1489,9 @@ msgid ""
 "generates an invoice or a delivery order as soon as it is confirmed by the "
 "salesman."
 msgstr ""
+"U ovisnosti o kontroli fakturiranja, faktura može biti temeljena na "
+"dostavljenim ili na naručenim količinama. Tako, narudžba može generirati "
+"fakturu ili otpremnicu onog trenutka kada je prodavač potvrdi."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1419,6 +1500,8 @@ msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
 "The real stock is %.2f %s. (without reservations)"
 msgstr ""
+"Planirate prodati %.2f %s ali vam je raspoloživo samo %.2f %s !\n"
+"Prava zaliha je %.2f %s. (bez rezervacija)"
 
 #. module: sale
 #: view:sale.order:0
@@ -1428,12 +1511,12 @@ msgstr "Stanja"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Referenca kupca"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -1445,7 +1528,7 @@ msgstr "Ukupno"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "ne postoji dnevnik prodaje definiran za ovu tvrtku: \"%s\" (id:%d)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1454,30 +1537,32 @@ msgid ""
 "output area and the customer is done through the Delivery Order manually or "
 "automatically."
 msgstr ""
+"U ovisnosti o postavkama izlazne lokacije, premještaj između izlaznog "
+"područja i kupca se izvršava preko otpremnice ručno ili automatski."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "Ne možete pobrisati stavku narudžbe koja je %s !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
 #: view:sale.order:0
 msgid "Make Invoices"
-msgstr ""
+msgstr "Napravi fakture"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Za fakturirati"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Datum potvrde narudžbe"
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1486,29 +1571,29 @@ msgstr ""
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Tvrtka"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum fakture"
 
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "Iznos za fakturiranje unaprijed."
 
 #. module: sale
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Invoice Exception"
-msgstr "Izuzetak u izdavanju Računa"
+msgstr "Iznimka fakture"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is a list of picking that has been generated for this sales order."
-msgstr ""
+msgstr "Ovo je lista odabira koju je napravila narudžba."
 
 #. module: sale
 #: help:sale.installer,sale_margin:0
@@ -1516,6 +1601,8 @@ msgid ""
 "Gives the margin of profitability by calculating the difference between Unit "
 "Price and Cost Price."
 msgstr ""
+"Daje marginu profitabilnosti izračunom razlike prodajne cijene i cijene "
+"troška."
 
 #. module: sale
 #: report:sale.order:0
@@ -1536,35 +1623,35 @@ msgstr "Otkazano"
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
 msgid "Shop"
-msgstr "Dućan"
+msgstr "Prodavaonica"
 
 #. module: sale
 #: view:sale.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mjesec   "
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,uom_name:0
 msgid "Default UoM"
-msgstr ""
+msgstr "Standardna JM"
 
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr ""
+msgstr "Datum potvrde"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Upozorenje"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 msgid "Sales by Month"
-msgstr ""
+msgstr "Prodaje po mjesecu"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1576,6 +1663,11 @@ msgid ""
 "\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"Odabrali ste %d jedinica.\n"
+"Ali nije kompatibilno sa odabranim pakiranjem\n"
+"Prijedlog količina prema pakiranju:\n"
+"\n"
+"EAN: %s Količina: %s Vrsta ul: %s"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1585,12 +1677,12 @@ msgstr ""
 #: view:sale.order:0
 #: field:stock.picking,sale_id:0
 msgid "Sales Order"
-msgstr ""
+msgstr "Narudžba"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
 msgid "Quantity (UoS)"
-msgstr "Količina (Uos)"
+msgstr "Količina (JP)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_packing0
@@ -1600,38 +1692,42 @@ msgid ""
 "parts to the sales order. There is 1 pick list by sales order line which "
 "evolves with the availability of parts."
 msgstr ""
+"Forma sa listom odabira se kreira kada je narudžba potvrđena, kada i zahtjev "
+"za nabavom. Predstavlja pridruživanje dijelova narudžbi. Postoji jedna lista "
+"odabira za svaku stavku narudžbe koje se proširuje ovisno o dostupnosti "
+"dijelova."
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Confirmed"
-msgstr "Potvrđen"
+msgstr "Potvrđeno"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
 msgid "Confirm"
-msgstr "Potvrdite"
+msgstr "Potvrdi"
 
 #. module: sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Pogreška! Ne možete kreirati rekurzivne tvrtke."
 
 #. module: sale
 #: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
-msgstr "Vezani Računi"
+msgstr "Stavke fakture"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
-msgstr "vezane Prodajne Narudžbe"
+msgstr "Stavke narudžbe"
 
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Glavno vrijeme dostave"
 
 #. module: sale
 #: view:res.company:0
@@ -1641,12 +1737,12 @@ msgstr "Konfiguracija"
 #. module: sale
 #: selection:sale.order,picking_policy:0
 msgid "Complete Delivery"
-msgstr "Zaključite Isporuku"
+msgstr "Zaključite isporuku"
 
 #. module: sale
 #: view:sale.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mjesec-1    "
 
 #. module: sale
 #: help:sale.config.picking_policy,picking_policy:0
@@ -1655,11 +1751,14 @@ msgid ""
 "soon as possible when one product is available or you wait that all products "
 "are available.."
 msgstr ""
+"Pravila otpremanja se koriste za definiranje (prema pojedinoj narudžbi) "
+"želite li da se roba dostavlja čim je jedan proizvod dostupan ili će se "
+"čekati dostupnost svih proizvoda."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Kolovoz"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:0
@@ -1670,6 +1769,9 @@ msgid ""
 "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
+"Faktura se ne može kreirati za ovu stavku narudžbe iz sljedećih razloga:\n"
+"1.Stanje ove stavke je \"Nacrt\" ili \"Otkazano\"!\n"
+"2.Stavka je već fakturirana!"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1681,18 +1783,18 @@ msgstr "Težina"
 #: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
-msgstr "Računi"
+msgstr "Fakture"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Prosinac"
 
 #. module: sale
 #: field:sale.config.picking_policy,config_logo:0
 #: field:sale.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
@@ -1702,11 +1804,14 @@ msgid ""
 "production of products regarding to the rules and to the sales order's "
 "parameters. "
 msgstr ""
+"Narudžba nabave se automatski kreira čim je narudžbenica potvrđena ili je "
+"faktura plaćena. Pokreće kupovinu i proizvodnju prema pravilima i "
+"parametrima kreiranja narudžbi. "
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "Nefakturirano"
 
 #. module: sale
 #: report:sale.order:0
@@ -1722,12 +1827,12 @@ msgstr "Prodavač"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "Izvršava nabavu i fakturiranje"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Iznos bez Poreza"
+msgstr "Iznos bez poreza"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:0
@@ -1736,13 +1841,13 @@ msgstr "Iznos bez Poreza"
 #: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
-msgstr "Račun predujma"
+msgstr "Faktura predujma"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "Narudžba '%s' je otkazana."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1762,111 +1867,120 @@ msgid ""
 "            \n"
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
+"* Stanje 'Nacrt' se postavlja kada je narudžba u stanju nacrta.              "
+"       \n"
+"* Stanje 'Potvrđeno' se postavlja kada je narudžba potvrđena.                "
+"     \n"
+"* Stanje 'Iznimka' se postavlja kada je narudžba postavljena kao iznimka.    "
+"                 \n"
+"* Stanje 'Završeno' se postavlja kada se proizvod stavke priprema za "
+"otpremanje.                     \n"
+"* Stanje 'Otkazano' se postavlja kada korisnik otkaže narudžbu."
 
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "Iznos poreza."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "Pakiranja"
 
 #. module: sale
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Tijek konfiguracije"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 msgid "Product sales"
-msgstr "Prodaje Proizvoda"
+msgstr "Prodaje proizvoda"
 
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Ordered Date"
-msgstr ""
+msgstr "Datum naručivanja"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
 #: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
-msgstr "Prodajne Narudžbe"
+msgstr "Narudžbe"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
 msgid "Direct Delivery"
-msgstr "Izravna Isporuka"
+msgstr "Izravna isporuka"
 
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "Dnevnici fakturiranja"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
-msgstr "Proslijediti Proizvod"
+msgstr "Proizvod predujma"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped Qty"
-msgstr ""
+msgstr "Otpremljena količina"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "Vaša faktura je uspješno kreirana!"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
+msgstr "Morate prije otkazati sve fakture vezane uz ovu narudžbu."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Siječanj"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure Your Sales Management Application"
-msgstr ""
+msgstr "Promijeni postavke aplikacije za upravljanje prodajom"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
-msgstr "Prodajne Narudžbe u tijeku"
+msgstr "Narudžbe u tijeku"
 
 #. module: sale
 #: field:sale.installer,sale_layout:0
 msgid "Sales Order Layout Improvement"
-msgstr ""
+msgstr "Poboljšanje redoslijeda rasporeda"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Pogreška"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+msgstr "Odgoda obveze"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
 msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
-msgstr ""
+msgstr "Jedan zahtjev za nabavom za svaku narudžbu i za svaku komponentu."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -1876,24 +1990,24 @@ msgstr "Dodijeli"
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Datum narudžbe"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Potvrđene narudžbe u fakture"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete Sales Order(s) which are already confirmed !"
-msgstr ""
+msgstr "Ne možete pobrisati narudžbe koje su već potvrđene !"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "Narudžba '%s' je postavljena u stanje nacrta."
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1903,7 +2017,7 @@ msgstr "Iz zalihe"
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr "Uobičajena politika Pakiranja"
+msgstr "Uobičajena pravila otpreme"
 
 #. module: sale
 #: view:sale.open.invoice:0
@@ -1913,28 +2027,28 @@ msgstr "Zaključi"
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
-msgstr ""
+msgstr "Dostavljeno"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "Nema dovoljno robe na zalihi !"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Layout Sequence"
-msgstr ""
+msgstr "Redoslijed rasporeda"
 
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "Pokazatelj da je faktura plaćena."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -1944,6 +2058,10 @@ msgid ""
 "or sale order, it has to be linked to a shop. The shop also defines the "
 "warehouse from which the products will be delivered for each particular sale."
 msgstr ""
+"Ako više od jedne prodavaonice preprodaje proizvode vaše tvrtke, možete ih "
+"kreirati i upravljati njima odavde. Kada kreirate novu ponudu ili narudžbu, "
+"mora biti povezana sa prodavaonicom. Prodavaonica također određuje skladište "
+"iz kojeg će se proizvodi dostavljati za svaku prodaju."
 
 #. module: sale
 #: report:sale.order:0
@@ -1954,24 +2072,24 @@ msgstr "Opis"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Svibanj"
 
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
 msgid "Adds commitment, requested and effective dates on Sales Orders."
-msgstr ""
+msgstr "Dodaje obvezu, zahtjevane i važeće datume na narudžbe."
 
 #. module: sale
 #: view:sale.order:0
 #: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
-msgstr "Stranka"
+msgstr "Kupac"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Veljača"
 
 #. module: sale
 #: help:sale.installer,sale_journal:0
@@ -1979,11 +2097,13 @@ msgid ""
 "Allows you to group and invoice your delivery orders according to different "
 "invoicing types: daily, weekly, etc."
 msgstr ""
+"Dozvoljava grupiranje i fakturiranje narudžbi prema različitim tipovima "
+"faktura: dnevno, tjedno, itd."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Travanj"
 
 #. module: sale
 #: view:sale.shop:0
@@ -1993,18 +2113,18 @@ msgstr "Računovodstvo"
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "Koraci za dostavu narudžbe"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Pretraži narudžbe"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr ""
+msgstr "Zahtjev za narudžbom"
 
 #. module: sale
 #: report:sale.order:0
@@ -2016,7 +2136,7 @@ msgstr "Uvjet plaćanja"
 #: help:sale.installer,sale_layout:0
 msgid ""
 "Provides some features to improve the layout of the Sales Order reports."
-msgstr ""
+msgstr "Omogućuje svojstva za poboljšavanje rasporeda izvještaja narudžbi."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2027,11 +2147,17 @@ msgid ""
 "having invoiced yet. If you want to analyse your turnover, you should use "
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Ovaj izvještaj radi analizu vaših ponuda i narudžbi. Analiza provjerava "
+"dohotke od prodaje i sortira ih prema različitim kriterijima grupiranja "
+"(prodavač, partner, proizvod, itd.) Koristite ovaj izvještaj za izvođenje "
+"analize na prodajama koje još nisu fakturirane. Ako želite analizirati "
+"promet, trebali bi koristiti Izvještaj analize faktura u knjigovodstvenoj "
+"aplikaciji."
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
-msgstr "Ponuda Broj"
+msgstr "Ponuda broj"
 
 #. module: sale
 #: field:sale.order,picked_rate:0
@@ -2043,12 +2169,12 @@ msgstr "Odabran"
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
-msgstr "Račun na temelju dostava"
+msgstr "Faktura na temelju dostava"
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "Postavite Dobavu"
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index a0884a88151..f48780a6536 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -7,19 +7,19 @@ 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-15 18:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 22:14+0000\n"
+"Last-Translator: Roberto Onnis <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:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
+msgstr "Permette di calcolare i costi di consegna sul preventivo."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -27,8 +27,8 @@ msgid ""
 "If you don't have enough stock available to deliver all at once, do you "
 "accept partial shipments or not?"
 msgstr ""
-"Se non hai disponibile a magazzino tutto il materiale da consegnare in una "
-"sola volta, accetti la spedizione parziale o no?"
+"Se non si ha disponibile a magazzino tutto il materiale da consegnare in una "
+"sola volta, si accetta comunque la spedizione parziale oppure no?"
 
 #. module: sale
 #: view:board.board:0
@@ -59,13 +59,13 @@ msgstr "Annulla Ordine"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr ""
+msgstr "(?)Configura la logistica dell'ordine di vendita"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
+msgstr "Il preventivo '%s' è stato trasformato in un ordine di vendita"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -87,6 +87,7 @@ msgstr "IVA"
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
 msgstr ""
+"Imposta gli ordini di approvvigionamento per ogni linea d'ordine di vendita"
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -104,7 +105,7 @@ msgstr "Contabilità Analitica"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr ""
+msgstr "Ordine di approvvigionamento"
 
 #. module: sale
 #: view:sale.report:0
@@ -146,7 +147,7 @@ msgstr "Scadenza Pagamento Predefinita"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr ""
+msgstr "Configura il metodo di approvvigionamento per l'ordine di vendita"
 
 #. module: sale
 #: view:sale.order:0
@@ -170,6 +171,7 @@ msgstr "Forza Assegnazione"
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr ""
+"Spuntare il box per raggruppare le fatture riferite agli stessi clienti"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -181,7 +183,7 @@ msgstr "Quantità Ordinate"
 #: model:ir.actions.act_window,name:sale.action_sales_by_salesman
 #: view:sale.report:0
 msgid "Sales by Salesman"
-msgstr ""
+msgstr "Vendite per venditori"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
@@ -212,6 +214,11 @@ msgid ""
 "this list if you invoice based on the delivery orders or if you invoice "
 "sales totally."
 msgstr ""
+"Qui viene presentata una lista di ciascuna linea di ordine di vendita da "
+"fatturare. Questa vista permette di fatturare gli ordini di vendita "
+"parzialmente, per linea d'ordine. Non è necessario partire da questa lista "
+"se si emette fattura sulla base degli ordini di consegna o se si fattura "
+"l'ordine nel suo complesso."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -219,16 +226,18 @@ msgid ""
 "The invoice is created automatically if the shipping policy is 'Invoice from "
 "pick' or 'Invoice on order after delivery'."
 msgstr ""
+"La fattura viene creata automaticamente se il metodo di spedizione risulta "
+"'Fattura da prelievo' o 'Fattura su ordine dopo la consegna'."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Crea fattura di vendita"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Recreate Packing"
-msgstr ""
+msgstr "Ricrea imballaggio"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -240,13 +249,14 @@ msgstr "Sconto (%)"
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
 msgstr ""
+"I giorni aggiunti per sicurezza al tempo di consegna promesso al cliente"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
 msgid "Sales Manager Dashboard"
-msgstr ""
+msgstr "Dashboard Gestione Vendite"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
@@ -256,7 +266,7 @@ msgstr "Confezionamento"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "Da un ordine di vendita"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -267,7 +277,7 @@ msgstr "Nome Negozio"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "No Customer Defined !"
-msgstr ""
+msgstr "Nessun cliente definito!"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree2
@@ -277,7 +287,7 @@ msgstr "Vendite in Eccezione"
 #. module: sale
 #: view:sale.order:0
 msgid "Set to Draft"
-msgstr "Impost come Bozza"
+msgstr "Imposta come Bozza"
 
 #. module: sale
 #: view:sale.order:0
@@ -298,6 +308,19 @@ msgid ""
 "  - The 'Invoice From The Picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Il metodo di spedizione viene utilizzato per sincronizzare fatture ed "
+"operazioni di consegna.\n"
+"  - Selezionando 'Pagamento prima della consegna' verrà prima generata la "
+"fattura e quindi, dopo il pagamento della stessa, l'ordine di magazzino "
+"associato.\n"
+"  - Selezionando 'Spedizione e fatturazione manuale' verrà generato "
+"direttamente l'ordine di magazzino, mentre è necessario che l'utente generi "
+"manualmente la fattura in stato bozza premendo sul tasto 'Fattura'.\n"
+"  - Selezionando invece 'Fattura su ordine dopo la consegna' verrà generata "
+"una fattura in bozza basata sull'ordine di vendita, non appena tutte le "
+"linee di prelievo sono state lavorate.\n"
+"  - Selezionando infine 'Fattura da prelievo' è possibile creare una fattura "
+"contestualmente al processo di prelievo delle merci."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -306,58 +329,61 @@ msgid ""
 "There is no income category account defined in default Properties for "
 "Product Category or Fiscal Position is not defined !"
 msgstr ""
+"Non è stato definito un conto di categoria ricavo nelle proprietà di default "
+"della categoria prodotti oppure non è stato definita una posizione fiscale!"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Si sta cercando di assegnare un lotto non legato allo stesso prodotto"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "invalid mode for test_state"
-msgstr ""
+msgstr "stato invalido per test_state"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "Non è possibile cancellare questo ordine di vendita!"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "Statistiche ordini di vendita"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "Il conto analitico legato all'ordine di vendita."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Ordine di spedizione per l'ordine di vendita corrente"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Listino prezzi per l'ordine di vendita corrente."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -367,7 +393,7 @@ msgstr "Solamente ordine di consegna"
 #. module: sale
 #: report:sale.order:0
 msgid "TVA :"
-msgstr "TVA"
+msgstr "TVA :"
 
 #. module: sale
 #: help:sale.order.line,delay:0
@@ -375,11 +401,13 @@ msgid ""
 "Number of days between the order confirmation the shipping of the products "
 "to the customer"
 msgstr ""
+"Numero di giorni che intercorrono fra la conferma dell'ordine e la "
+"spedizione della merce al cliente"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "Data preventivo"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
@@ -390,7 +418,7 @@ msgstr "Posizione Fiscale"
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "UoM"
-msgstr "Unità di Misura"
+msgstr "UoM"
 
 #. module: sale
 #: field:sale.order.line,number_packages:0
@@ -409,18 +437,22 @@ msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
 msgstr ""
+"Il venditore conferma il preventivo. Lo stato dell'ordine di vendita diventa "
+"quindi 'In corso' o 'In corso manualmente'."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
+"È necessario prima cancellare i movimenti di magazzino collegati a questa "
+"linea d'ordine."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "(n/a)"
-msgstr ""
+msgstr "(n/d)"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
@@ -428,6 +460,9 @@ msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
 msgstr ""
+"Selezionare un prodotto di tipo serivizio chiamato 'Prodotto Avanzato'. "
+"Potrebbe essere necessario creare questo prodotto ed impostarlo come valore "
+"predefinito di questo campo."
 
 #. module: sale
 #: report:sale.order:0
@@ -441,6 +476,8 @@ msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
+"Non è possibile far avanzare la pratica su un ordine di vendita a cui è "
+"stato impostata la modalità 'Fatturazione automatica dopo la consegna'."
 
 #. module: sale
 #: view:sale.order:0
@@ -453,12 +490,14 @@ msgstr "Note"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Indirizzo di fatturazione per questo ordine di vendita."
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Enhance your core Sales Application with additional functionalities."
 msgstr ""
+"Migliora le funzionalità di base dell'applicazione di vendita con delle "
+"funzionalità aggiuntive."
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
@@ -484,12 +523,12 @@ msgstr "Ripartizione Partner"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "Il prezzo totale"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -507,11 +546,13 @@ msgid ""
 "For every sales order line, a procurement order is created to supply the "
 "sold product."
 msgstr ""
+"Per ogni linea d'ordine viene creato un ordine di approvvigionamento per "
+"permettere la fornitura del prodotto venduto."
 
 #. module: sale
 #: view:board.board:0
 msgid "Sales by Customer"
-msgstr ""
+msgstr "Vednite per cliente"
 
 #. module: sale
 #: help:sale.order,incoterm:0
@@ -519,6 +560,8 @@ msgid ""
 "Incoterm which stands for 'International Commercial terms' implies its a "
 "series of sales terms which are used in the commercial transaction."
 msgstr ""
+"Incoterms, contrazione di 'International commercial terms', è una serie di "
+"termini di vendita utilizzati nelle transazioni commerciali fra stati."
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -528,7 +571,7 @@ msgstr "Indirizzo Fatturazione"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "Cerca linee non ancora fatturate"
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
@@ -544,18 +587,18 @@ msgstr "Numero Righe"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "(?)Vendite fatture aperte"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Linea d'ordine di vendita"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Setup your sales workflow and default values."
-msgstr ""
+msgstr "Setup del workflow di vendita e dei valori di default."
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
@@ -625,7 +668,7 @@ msgstr "Listino Prezzi"
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "Q.tà"
 
 #. module: sale
 #: view:sale.order:0
@@ -636,7 +679,7 @@ msgstr "Data dell'ordine"
 #: view:sale.order.line:0
 #: field:sale.report,shipped:0
 msgid "Shipped"
-msgstr ""
+msgstr "Spedite"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
@@ -646,18 +689,18 @@ msgstr "Tutti i Preventivi"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice On Order After Delivery"
-msgstr ""
+msgstr "Fattura su ordine dopo la consegna"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Categoria prodotto"
 
 #. module: sale
 #: report:sale.order:0
@@ -672,7 +715,7 @@ msgstr "Spostamenti Stock"
 #. module: sale
 #: view:sale.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Anno  "
 
 #. module: sale
 #: field:sale.order,state:0
@@ -684,33 +727,33 @@ msgstr "Stato Ordine"
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Si desidera veramente creare la(le) fattura(e)?"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales By Month"
-msgstr ""
+msgstr "Vendite per mese"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "Impossibile cancellare la linea dell'ordine di vendita!"
 
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "Giorni di sicurezza"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr ""
+msgstr "Approviggionamento della merce venduta"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Create Final Invoice"
-msgstr ""
+msgstr "Creare la fattura finale"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -723,11 +766,13 @@ msgid ""
 "It indicates that the sales order has been delivered. This field is updated "
 "only after the scheduler(s) have been launched."
 msgstr ""
+"Indica che l'ordine di vendita è stato consegnato. Questo campo viene "
+"aggiornato solo dopo che lo (gli) scheduler sono partiti."
 
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtri estesi..."
 
 #. module: sale
 #: model:ir.module.module,description:sale.module_meta_information
@@ -755,22 +800,44 @@ msgid ""
 "    * Graph of cases of the month\n"
 "    "
 msgstr ""
+"\n"
+"    Il modulo base per gestire preventivi e ordini di vendita.\n"
+"\n"
+"    * Workflow con passi di validazione:\n"
+"        - Preventivo -> Ordine di vendita -> Fattura\n"
+"    * Metodi di fatturazione:\n"
+"        - Fattura su ordine (prima o dopo la consegna)\n"
+"        - Fattura su consegna\n"
+"        - Fattura su timesheet\n"
+"        - Anticipo fattura\n"
+"    * Preferenze del partner (spedizione, fatturazione, incoterm, ...)\n"
+"    * Scorte prodotti e prezzi\n"
+"    * Metodi di spedizione:\n"
+"        - tutto in una volta, multi-partita\n"
+"        - costi di spedizione\n"
+"    * Dashboard venditore che include:\n"
+"    * I propri preventivi\n"
+"    * Top 10 delle vendite del mese\n"
+"    * Statistiche dei casi di vendita\n"
+"    * Grafici delle vendite per prodotto\n"
+"    * Grafici dei casi del mese\n"
+"    "
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Negozio"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Aziende"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: sale
 #: view:sale.order:0
@@ -794,6 +861,18 @@ msgid ""
 "generated so that you just have to confirm it when you want to bill your "
 "customer."
 msgstr ""
+"Gli ordini di vendita agevolano la gestione dei preventivi e degli ordini "
+"verso i clienti. OpenERP suggerisce di partire con la creazione di un "
+"preventivo. Non appena la richiesta è confermata, il preventivo viene "
+"modificato e diventa un ordine di vendita. OpenERP è in grado di gestire "
+"diversi tipi di prodotti così che un ordine di vendita può generare in "
+"automatico delle operazioni correlate come: azioni automatiche, creazione di "
+"consegne, creazioni di ordini di produzione, acquisti, etc. In accordo con "
+"la configurazione dell'ordine di vendita può venir generata in automatico "
+"una fattura in bozza; questo agevola il lavoro della contabilità che non "
+"dovrà creare da zero la fattura ed i movimenti associati ma, una volta che "
+"la fattura deve essere presentata al cliente, si limiterà a confermare la "
+"fattura automaticamente generata."
 
 #. module: sale
 #: report:sale.order:0
@@ -812,6 +891,8 @@ msgstr ""
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
 msgstr ""
+"Non è possibile cancellare una riga di ordine di vendita che è stata già "
+"fatturata!"
 
 #. module: sale
 #: view:sale.order:0
@@ -822,7 +903,7 @@ msgstr "Qta'"
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "Riferimenti"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -838,7 +919,7 @@ msgstr "Annulla"
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "Date ordine di vendita"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -854,12 +935,12 @@ msgstr "Prezzo unitario"
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Margini degli ordini di vendita"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "Totale non tassato"
 
 #. module: sale
 #: view:sale.order:0
@@ -870,7 +951,7 @@ msgstr "Calcola"
 #: model:ir.actions.act_window,name:sale.action_sales_by_partner
 #: view:sale.report:0
 msgid "Sales by Partner"
-msgstr ""
+msgstr "Vendite per partner"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
@@ -881,7 +962,7 @@ msgstr "Contatto Ordinante"
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
 #: view:sale.open.invoice:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Apri Fattura"
 
 #. module: sale
 #: report:sale.order:0
@@ -894,7 +975,7 @@ msgstr "Prezzo"
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "Sales Application Configuration"
-msgstr ""
+msgstr "Configurazione applicazione di vendita"
 
 #. module: sale
 #: view:sale.report:0
@@ -910,12 +991,12 @@ msgstr "su Ordine"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
+msgstr "Basato sulle quantità spedite o ordinate."
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr ""
+msgstr "Prelievi correlati"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
@@ -930,32 +1011,32 @@ msgstr "Indirizzo Spedizione:"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr ""
+msgstr "Stato bozza dell'ordine di vendita"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr ""
+msgstr "Crea ordine di consegna"
 
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Costi di consegna"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Totale (tasse incluse)"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr ""
+msgstr "Crea lista di prelievo"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Product Category"
-msgstr ""
+msgstr "Vendite per categoria prodotto"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -970,14 +1051,14 @@ msgstr "Confirm Quotation"
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
-msgstr ""
+msgstr "Riferimento del documento che ha creato questa richiesta d'ordine"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Raggruppa per..."
 
 #. module: sale
 #: view:sale.order:0
@@ -999,18 +1080,18 @@ msgstr "In attesa di pianificazione"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Metodo di approvvigionamento"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "title"
-msgstr ""
+msgstr "titolo"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr ""
+msgstr "Lista prelievo"
 
 #. module: sale
 #: view:sale.order:0
@@ -1020,7 +1101,7 @@ msgstr "Data dell'ordine"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Documento del movimento verso area di uscita o verso area cliente."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1035,7 +1116,7 @@ msgstr "Conferma Ordine"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "Crea l'ordine di approvvigionamento"
 
 #. module: sale
 #: view:sale.order:0
@@ -1051,6 +1132,9 @@ msgid ""
 "The same sales order may have been invoiced in several times (by line for "
 "example)."
 msgstr ""
+"Lista delle fatture generate per questo ordine di vendita. Lo stesso ordine "
+"di vendita infatti può essere scisso in diverse fatture (ad esempio per "
+"linea d'ordine)."
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -1060,18 +1144,18 @@ msgstr "Politica di Spedizione"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Data nella quale l'ordine di vendita è creato"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Movimento di magazzino"
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Crea fatture"
 
 #. module: sale
 #: view:sale.order:0
@@ -1086,13 +1170,13 @@ msgstr "Fax"
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr ""
+msgstr "Importo di anticipo"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_product_total_price
 msgid "Sales by Product's Category"
-msgstr ""
+msgstr "Vendite per categoria di prodotto"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1119,12 +1203,12 @@ msgstr "Errore!"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "Non è possibile cancellare l'ordine di vendita!"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 #. module: sale
 #: field:sale.order.line,procurement_id:0
@@ -1151,7 +1235,7 @@ msgstr "Spedizione & Fatturazione Manuale"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Picking Information !"
-msgstr ""
+msgstr "Informazioni prelievo!"
 
 #. module: sale
 #: view:sale.report:0
@@ -1167,12 +1251,12 @@ msgstr "Gestione Vendite"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice From The Picking"
-msgstr ""
+msgstr "Fattura da prelievo"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Richiede una revisione del responsabile della contabilità."
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1183,7 +1267,7 @@ msgstr "Crea fatture"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Genera fattura - linea ordine di vendita"
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1213,7 +1297,7 @@ msgstr "Pagato"
 #: model:ir.ui.menu,name:sale.menu_report_product_all
 #: view:sale.report:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "Analisi delle vendite"
 
 #. module: sale
 #: field:sale.order.line,property_ids:0
@@ -1234,6 +1318,10 @@ msgid ""
 "is 'Shipping and Manual in Progress'. The invoice is created automatically "
 "if the shipping policy is 'Payment before Delivery'."
 msgstr ""
+"Se il metodo di spedizione dell'ordine di vendita è 'Shipping and Manual in "
+"Progress' il venditore crea una fattura manualmente. La fattura viene invece "
+"creata automaticamente quando il metodo di spedizione è 'Pagamento prima "
+"della consegna'."
 
 #. module: sale
 #: help:sale.config.picking_policy,order_policy:0
@@ -1271,7 +1359,7 @@ msgstr "Completato"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
 msgid "sale.installer"
-msgstr ""
+msgstr "sale.installer"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
@@ -1286,6 +1374,8 @@ msgid ""
 "You have to select a customer in the sales form !\n"
 "Please set one customer before choosing a product."
 msgstr ""
+"È necessario selezionare un cliente nel form di vendita!\n"
+"Selezionare quindi un cliente prima di scegliere un prodotto."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -1295,12 +1385,12 @@ msgstr "DDT & Ordine di consegna"
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Documento sorgente"
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
-msgstr ""
+msgstr "Da fare"
 
 #. module: sale
 #: field:sale.order,picking_policy:0
@@ -1310,23 +1400,25 @@ msgstr "Politica di prelievo"
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Documento del movimento per il cliente."
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "Totale senza la tassazione"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel all picking attached to this sales order."
 msgstr ""
+"È necessario prima cancellare tutti i prelievi legati a questo ordine di "
+"vendita."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sales Advance Payment Invoice"
-msgstr ""
+msgstr "Anticipo su fattura di vendita"
 
 #. module: sale
 #: field:sale.order,incoterm:0
@@ -1366,6 +1458,12 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the date 'Ordered Date'."
 msgstr ""
+"Stato del preventivo o dell'ordine di vendita. \n"
+"Lo stato di eccezione viene impostato automaticamente quando interviene "
+"un'operazione di cancellazione durante la sua validazione (Eccezione "
+"fattura) oppure nel processo di lista prelievo (Eccezione spedizione). \n"
+"Lo stato 'In attesa data programmazione' viene impostato quando la fattura "
+"viene confermata ma è ancora in attesa della data programmata 'Data Ordine'."
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
@@ -1396,7 +1494,7 @@ msgstr "Unità di Misura Prodotto"
 #. module: sale
 #: view:sale.order:0
 msgid "Logistic"
-msgstr ""
+msgstr "Logistica"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1408,11 +1506,12 @@ msgstr "Ordine"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
+"Non è definito alcun conto di ricavo per questo prodotto:\"%s\" (id:%d)"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
-msgstr ""
+msgstr "Ignora eccezione"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleinvoice0
@@ -1422,6 +1521,10 @@ msgid ""
 "generates an invoice or a delivery order as soon as it is confirmed by the "
 "salesman."
 msgstr ""
+"La fattura sarà riferita alla quantità consegnata o alla quantità ordinata "
+"in funzione del controllo dell'ordine di vendita della fattura stessa. "
+"Quindi un ordine di vendita può generare una fattura o un ordine di consegna "
+"non appena confermato da un venditore."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1430,6 +1533,9 @@ msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
 "The real stock is %.2f %s. (without reservations)"
 msgstr ""
+"Si è pianificata la vendita di %.2f %s ma è disponibile solo la quantità  "
+"%.2f %s !\n"
+"Lo stock reale è pari a %.2f %s. (senza quantità riservate)"
 
 #. module: sale
 #: view:sale.order:0
@@ -1439,7 +1545,7 @@ msgstr "Stati"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -1457,6 +1563,7 @@ msgstr "Totale"
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
+"Non è stato definito un registro vendite per questa azienda: \"%s\" (id:%d)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1465,30 +1572,34 @@ msgid ""
 "output area and the customer is done through the Delivery Order manually or "
 "automatically."
 msgstr ""
+"Il movimento merci fra l'area magazzino di uscita e il magazzino del cliente "
+"viene effettuato attraverso l'ordine di consegna, manualmente o "
+"automaticamente, in funzione della configurazione dell'area di magazzino in "
+"uscita."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "Non è possibile cancellare una linea di ordine di vendita che è %s!"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
 #: view:sale.order:0
 msgid "Make Invoices"
-msgstr ""
+msgstr "Genera fatture"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Da fatturare"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Data nella quale l'ordine di vendita viene confermato."
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1497,7 +1608,7 @@ msgstr ""
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Azienda"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
@@ -1507,7 +1618,7 @@ msgstr "Data fattura"
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "Il totale da fatturare in anticipo."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1519,7 +1630,7 @@ msgstr "Eccezione Fattura"
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is a list of picking that has been generated for this sales order."
-msgstr ""
+msgstr "Lista di prelievo generata per questo ordine di vendita."
 
 #. module: sale
 #: help:sale.installer,sale_margin:0
@@ -1527,6 +1638,8 @@ msgid ""
 "Gives the margin of profitability by calculating the difference between Unit "
 "Price and Cost Price."
 msgstr ""
+"Fornisce il margine di guadagno calcolando la differenza fra il prezzo "
+"unitario e il costo."
 
 #. module: sale
 #: report:sale.order:0
@@ -1552,30 +1665,30 @@ msgstr "Negozio"
 #. module: sale
 #: view:sale.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mese   "
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,uom_name:0
 msgid "Default UoM"
-msgstr ""
+msgstr "UoM predefinita"
 
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr ""
+msgstr "Data conferma"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Attenzione"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 msgid "Sales by Month"
-msgstr ""
+msgstr "Vendite per Mese"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1587,6 +1700,12 @@ msgid ""
 "\n"
 "EAN: %s Quantity: %s Type of ul: %s"
 msgstr ""
+"È stata selezionata una quantità di %d unità.\n"
+"Questa quantita non è però compatibile con l'imballaggio selezionato.\n"
+"Viene mostrato di seguito un suggerimento che è compatibile con "
+"l'imballaggio:\n"
+"\n"
+"EAN: %s Quantità: %s Tipo di imballaggio: %s"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1611,6 +1730,11 @@ msgid ""
 "parts to the sales order. There is 1 pick list by sales order line which "
 "evolves with the availability of parts."
 msgstr ""
+"Il form della lista di prelievo viene creato non appena l'ordine di vendita "
+"viene confermato, nello stesso tempo dell'ordine di approvvigionamento. Esso "
+"rappresenta l'assegnamento di tutte le merci all'ordine di vendita. Ad ogni "
+"linea d'ordine viene associata una lista prelievo che evolverà in funzione "
+"della disponibilità delle merci."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1625,7 +1749,7 @@ msgstr "Conferma"
 #. module: sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Errore! Non è possibile creare aziende ricorsive."
 
 #. module: sale
 #: view:sale.order:0
@@ -1642,7 +1766,7 @@ msgstr "Righe Ordine di Vendita"
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Tempo di consegna"
 
 #. module: sale
 #: view:res.company:0
@@ -1657,7 +1781,7 @@ msgstr "Consegna totale"
 #. module: sale
 #: view:sale.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mese-1    "
 
 #. module: sale
 #: help:sale.config.picking_policy,picking_policy:0
@@ -1684,6 +1808,10 @@ msgid ""
 "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
+"La fattura non può essere creata per questa linea d'ordine di vendita per "
+"una delle seguenti ragioni:\n"
+"1. La linea dell'ordine si trova nello stato \"bozza\" o \"cancellato\"!\n"
+"2. La linea dell'ordine di vendita è stata fatturata!"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1700,13 +1828,13 @@ msgstr "Fatture"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #. module: sale
 #: field:sale.config.picking_policy,config_logo:0
 #: field:sale.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Immagine"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
@@ -1716,11 +1844,15 @@ msgid ""
 "production of products regarding to the rules and to the sales order's "
 "parameters. "
 msgstr ""
+"Un ordine di approvvigionamento viene creato automaticamente non appena "
+"l'ordine di vendita viene confermato o la fattura viene pagata. Questo "
+"determina l'acquisto e la produzione delle merci in funzione delle regole e "
+"dei parametri dell'ordine di vendita. "
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "Non fatturata"
 
 #. module: sale
 #: report:sale.order:0
@@ -1736,7 +1868,7 @@ msgstr "Venditore"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "Regola approvigionamenti e fatturazione"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -1756,7 +1888,7 @@ msgstr "Fattura di acconto"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "L'ordine di vendita '%s' è stato cancellato."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1776,22 +1908,32 @@ msgid ""
 "            \n"
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
+"* Lo stato 'Bozza' viene impostato quando l'ordine associato si trova in "
+"bozza.      \n"
+"* Lo stato 'Confermato' viene impostato quando l'ordine di vendita associato "
+"viene confermato     \n"
+"* Lo stato 'Eccezione' viene impostato quando l'ordine associato entra in "
+"eccezione.    \n"
+"* Lo stato 'Chiuso' viene impostato quando alla linea d'ordine di vendita "
+"viene associato uno scarico di magazzino.      \n"
+"* Lo stato 'Cancellato' viene impostato quando un utente cancella l'ordine "
+"di vendita associato."
 
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
-msgstr ""
+msgstr "Totale tassa"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "Imballaggi"
 
 #. module: sale
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Processo di configurazione"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1818,7 +1960,7 @@ msgstr "Consegna Diretta"
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "Registri fatturazione"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
@@ -1830,28 +1972,30 @@ msgstr "Acconto prodotto"
 #: view:sale.report:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped Qty"
-msgstr ""
+msgstr "Q.tà spedita"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "La fattura è stata generata correttamente!"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel all invoices attached to this sales order."
 msgstr ""
+"È necessario prima cancellare tutte le fatture legate a questo ordine di "
+"vendita."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure Your Sales Management Application"
-msgstr ""
+msgstr "Configura la propria applicazione di gestione vendite"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
@@ -1861,7 +2005,7 @@ msgstr "Ordini di Vendita in esecuzione"
 #. module: sale
 #: field:sale.installer,sale_layout:0
 msgid "Sales Order Layout Improvement"
-msgstr ""
+msgstr "Miglioramento del layout dell'ordine di vendita"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:0
@@ -1873,7 +2017,7 @@ msgstr "Errore"
 #: view:sale.report:0
 #: field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+msgstr "Ritardo"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -1881,6 +2025,8 @@ msgid ""
 "One Procurement order for each sales order line and for each of the "
 "components."
 msgstr ""
+"Un ordine di approvigionamento per ogni linea d'ordine di vendita e per "
+"ciascuno dei componenti."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -1890,24 +2036,26 @@ msgstr "Assegna"
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Data ordine"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Ordine di vendita confermato da fatturare."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete Sales Order(s) which are already confirmed !"
 msgstr ""
+"Non è possibile cancellare lo(gli) ordine(i) di vendita che sono già stati "
+"confermati!"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
-msgstr ""
+msgstr "L'ordine di vendita '%s' è stato impostato nello stato bozza."
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1933,22 +2081,22 @@ msgstr "Consegnato"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "Sotto scorta!"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "È necessario assegnare un lotto di produzione per questo prodotto"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Layout Sequence"
-msgstr ""
+msgstr "Sequenza di layout"
 
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "Indica che una fattura è stata pagata."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -1958,6 +2106,11 @@ msgid ""
 "or sale order, it has to be linked to a shop. The shop also defines the "
 "warehouse from which the products will be delivered for each particular sale."
 msgstr ""
+"Se si hanno più negozi che rivendono i prodotti della propria azienda è "
+"possibile crearli e gestirli da qui. Ogni volta che si registra un nuovo "
+"preventivo o un nuovo ordine di vendita questo deve essere assegnato ad un "
+"negozio. Il negozio definisce anche il magazzino dal quale i prodotti "
+"verranno consegnati per ciascun ordine."
 
 #. module: sale
 #: report:sale.order:0
@@ -1968,12 +2121,13 @@ msgstr "Descrizione"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
 msgid "Adds commitment, requested and effective dates on Sales Orders."
 msgstr ""
+"Aggiunge impegni, richieste e date definitive agli ordini di vendita."
 
 #. module: sale
 #: view:sale.order:0
@@ -1985,7 +2139,7 @@ msgstr "Cliente"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 #. module: sale
 #: help:sale.installer,sale_journal:0
@@ -1993,11 +2147,13 @@ msgid ""
 "Allows you to group and invoice your delivery orders according to different "
 "invoicing types: daily, weekly, etc."
 msgstr ""
+"Permette di raggruppare e fatturare i propri ordini di consegna in accordo "
+"con le differenti tipologie di fatturazione: giornaliere, settimanali, etc."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 #. module: sale
 #: view:sale.shop:0
@@ -2007,18 +2163,18 @@ msgstr "Contabilità"
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sales Order"
-msgstr ""
+msgstr "Passi per emettere un ordine di vendita"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Cerca ordine di vendita"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sales Order Requisition"
-msgstr ""
+msgstr "Richiesta ordine di vendita"
 
 #. module: sale
 #: report:sale.order:0
@@ -2031,6 +2187,8 @@ msgstr "Termini di pagamento"
 msgid ""
 "Provides some features to improve the layout of the Sales Order reports."
 msgstr ""
+"Fornisce alcune funzionalità per migliorare il layout dei report degli "
+"ordini di vendita"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2041,6 +2199,12 @@ msgid ""
 "having invoiced yet. If you want to analyse your turnover, you should use "
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
+"Questo report permette le analisi sui propri preventivi e ordini di vendita. "
+"Le analisi verificano le entrate e le ordinano in funzione di differenti "
+"criteri (venditore, partner, prodotto, etc.). Utilizzare questo report per "
+"eseguire le analisi sulle vendite non ancora fatturate. Se si desidera "
+"analizzare il proprio fatturato, è necessario utilizzare l'analisi sulle "
+"fatture nell'applicazione di contabilità."
 
 #. module: sale
 #: report:sale.order:0
@@ -2057,7 +2221,7 @@ msgstr "Prelevato"
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Anno"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index 7efdcd38837..ae4ee823bba 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/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:45+0000\n"
-"PO-Revision-Date: 2010-12-18 05:38+0000\n"
+"PO-Revision-Date: 2010-12-31 10:19+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:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -59,13 +59,13 @@ msgstr "Anuluj zamówienie"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sales Order Logistics"
-msgstr ""
+msgstr "Konfiguruj logistykę zamówień sprzedaży"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
+msgstr "Oferta '%s' została skonwertowana do zamówienia sprzedaży."
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -86,7 +86,7 @@ msgstr "NIP"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sales order line."
-msgstr ""
+msgstr "Sporządza zapotrzebowania dla każdej pozycji zamówienia sprzedaży."
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -229,7 +229,7 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Sprzedaż tworzy fakturę"
 
 #. module: sale
 #: view:sale.order:0
@@ -264,7 +264,7 @@ msgstr "Pakowanie"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sales order"
-msgstr ""
+msgstr "Z zamówienia sprzedaży"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -306,6 +306,16 @@ msgid ""
 "  - The 'Invoice From The Picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Zasady wysyłki są stosowane do synchronizowania operacji fakturowania z "
+"wydaniami.\n"
+"  - 'Płatność przed wydaniem' najpierw wygeneruje fakturę, a pobranie po "
+"zapłaceniu faktury.\n"
+"  - 'Wydanie i ręczna faktura' wygeneruje pobranie od razu i poczeka aż "
+"użytkownik utworzy fakturę przyciskiem.\n"
+"  - 'Faktura wg zamówienia po wydaniu' wygeneruje projekt faktury wg "
+"zamówienia po wykonaniu wszystkich pobrań.\n"
+"  - 'Faktura z pobrania' jest stosowana do generowania faktury w trakcie "
+"pobrania."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -320,12 +330,12 @@ msgstr ""
 #. module: sale
 #: view:sale.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfiguruj"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Próbujesz powiązać z numerem partii z innego produktu"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -342,7 +352,7 @@ msgstr "Czerwiec"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel this sales order !"
-msgstr ""
+msgstr "Nie można anulowac tego zamówienia sprzedaży !"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
@@ -352,7 +362,7 @@ msgstr "Statystyka zamówień sprzedaży"
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "Konto analityczne związane z zamówieniem sprzedaży."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -362,12 +372,12 @@ msgstr "Październik"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sales order."
-msgstr ""
+msgstr "Adres wysyłki dla tego zamówienia sprzedaży."
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Cennik dla tego zamówienia sprzedaży."
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
@@ -420,18 +430,22 @@ msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
 msgstr ""
+"Sprzedawca potwierdza ofertę. Stan zamówienia sprzedaży zmieni się na 'W "
+"toku' lub 'Ręczne w toku'."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
+"Musisz najpierw anulować przesunięcia zapasów związane z tą pozycją "
+"zamówienia sprzedaży."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "(n/a)"
-msgstr ""
+msgstr "(nd.)"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
@@ -454,6 +468,8 @@ msgid ""
 "You cannot make an advance on a sales order                              "
 "that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
+"Nie możesz utworzyć faktury zaliczkowej do zamówienia sprzedaży "
+"zdefiniowanego jako 'Automatyczna faktura po wydaniu'."
 
 #. module: sale
 #: view:sale.order:0
@@ -466,12 +482,13 @@ msgstr "Notatki"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Adres do faktury dla tego zamówienia sprzedaży."
 
 #. module: sale
 #: view:sale.installer:0
 msgid "Enhance your core Sales Application with additional functionalities."
 msgstr ""
+"Rozszerz swoją podstawową aplikację sprzedaży o dodatkowe funkcjonalności."
 
 #. module: sale
 #: field:sale.order,invoiced_rate:0
@@ -502,7 +519,7 @@ msgstr "Marzec"
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount."
-msgstr ""
+msgstr "Suma kwot"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -557,13 +574,13 @@ msgstr "# pozycji"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sales Open Invoice"
-msgstr ""
+msgstr "Otwarte faktury sprzedaży"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
 #: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Pozycja zamówienia sprzedaży"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -659,7 +676,7 @@ msgstr "Wszystkie oferty"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice On Order After Delivery"
-msgstr ""
+msgstr "Faktura wg zamówienia po wydaniu"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -708,7 +725,7 @@ msgstr "Sprzedaż wg miesięcy"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order line!"
-msgstr ""
+msgstr "Nie mozna anulować pozycji zamówienia sprzedaży!"
 
 #. module: sale
 #: field:res.company,security_lead:0
@@ -773,7 +790,7 @@ msgstr ""
 #: model:ir.model,name:sale.model_sale_shop
 #: view:sale.shop:0
 msgid "Sales Shop"
-msgstr ""
+msgstr "Sklep sprzedaży"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
@@ -793,7 +810,7 @@ msgstr "Historia"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "Zasady pobrań"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_form
@@ -832,6 +849,8 @@ msgstr ""
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
 msgstr ""
+"Nie możesz anulować pozycji zamówienia sprzedaży, które zostało już "
+"zafakturowane!"
 
 #. module: sale
 #: view:sale.order:0
@@ -950,7 +969,7 @@ msgstr "Adres do wysyłki :"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
-msgstr ""
+msgstr "Stan projekt zamówienia sprzedaży"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
@@ -965,7 +984,7 @@ msgstr "Koszt dostawy"
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Zawiera sumę podatków"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
@@ -990,7 +1009,7 @@ msgstr "Potwierdź ofertę"
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
-msgstr ""
+msgstr "Odnośnik do dokumentu, który wygenerował to zapytanie ofertowe."
 
 #. module: sale
 #: view:sale.order:0
@@ -1040,7 +1059,7 @@ msgstr "Data zamówienia"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Dokument przesunięcia do klienta."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1080,7 +1099,7 @@ msgstr "Zasady wysyłki"
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sales order is created."
-msgstr ""
+msgstr "Data utworzenia zamówienia sprzedaży"
 
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
@@ -1139,7 +1158,7 @@ msgstr "Błąd !"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sales order !"
-msgstr ""
+msgstr "Nie mozna anulować zamówienia sprzedaży !"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1187,7 +1206,7 @@ msgstr "Sprzedaż"
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice From The Picking"
-msgstr ""
+msgstr "Faktura z pobrania"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
@@ -1217,7 +1236,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Poprzednie oferty"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1308,12 +1327,12 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr ""
+msgstr "Pobranie i zamówienie wysyłki"
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Dokument źródłowy"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1323,23 +1342,25 @@ msgstr "Do zrobienia"
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Picking Policy"
-msgstr ""
+msgstr "Zasady pobrań"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Dokument przesunięcia do klienta"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
-msgstr ""
+msgstr "Kwota bez podatku"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "You must first cancel all picking attached to this sales order."
 msgstr ""
+"Musisz najpierw anulować wszystkie pobrania związane z tym zamówieniem "
+"sprzedaży."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
@@ -1476,7 +1497,7 @@ msgstr "Suma"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
+msgstr "Brak zdefiniowanego dziennika sprzedaży w tej firmie: \"%s\" (id:%d)"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1490,7 +1511,7 @@ msgstr ""
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
-msgstr ""
+msgstr "Nie mozna usuwac pozycji zamówienia sprzedaży, które jest %s !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
@@ -1508,7 +1529,7 @@ msgstr "Do zafakturowania"
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
-msgstr ""
+msgstr "Data potwierdzenia zamówienia sprzedaży."
 
 #. module: sale
 #: field:sale.order,company_id:0
@@ -1527,7 +1548,7 @@ msgstr "Data faktury"
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "Kwota do zafakturowania z góry."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1539,7 +1560,7 @@ msgstr "Wyjątek faktury"
 #: help:sale.order,picking_ids:0
 msgid ""
 "This is a list of picking that has been generated for this sales order."
-msgstr ""
+msgstr "To jest lista pobrań wygenerowana dla tego zamówienia sprzedaży."
 
 #. module: sale
 #: help:sale.installer,sale_margin:0
@@ -1572,7 +1593,7 @@ msgstr "Sklep"
 #. module: sale
 #: view:sale.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Miesiąc   "
 
 #. module: sale
 #: view:sale.report:0
@@ -1645,7 +1666,7 @@ msgstr "Potwierdź"
 #. module: sale
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
 
 #. module: sale
 #: view:sale.order:0
@@ -1662,7 +1683,7 @@ msgstr "Pozycje zamówienia sprzedaży"
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Czas dostawy"
 
 #. module: sale
 #: view:res.company:0
@@ -1677,7 +1698,7 @@ msgstr "Dostawa kompletna"
 #. module: sale
 #: view:sale.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Miesiąc-1    "
 
 #. module: sale
 #: help:sale.config.picking_policy,picking_policy:0
@@ -1717,13 +1738,13 @@ msgstr "Faktury"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: sale
 #: field:sale.config.picking_policy,config_logo:0
 #: field:sale.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obraz"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
@@ -1737,7 +1758,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "Niezafakturowane"
 
 #. module: sale
 #: report:sale.order:0
@@ -1773,7 +1794,7 @@ msgstr "Faktura zaliczkowa"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sales order '%s' has been cancelled."
-msgstr ""
+msgstr "Zamówienie sprzedaży '%s' zostało anulowane."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1802,13 +1823,13 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Packings"
-msgstr ""
+msgstr "Opakowania"
 
 #. module: sale
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Postęp konfiguracji"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1818,7 +1839,7 @@ msgstr "Sprzedaż produktu"
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Ordered Date"
-msgstr ""
+msgstr "Data zamówienia"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -1835,7 +1856,7 @@ msgstr "Dostawa bezpośrednia"
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "Dzienniki fakturowania"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
@@ -1847,7 +1868,7 @@ msgstr "Awansuj produkt"
 #: view:sale.report:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped Qty"
-msgstr ""
+msgstr "Wydana ilość"
 
 #. module: sale
 #: view:sale.open.invoice:0
@@ -1863,7 +1884,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: sale
 #: view:sale.installer:0
@@ -1907,12 +1928,12 @@ msgstr "Przypisz"
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Data zamówienia"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr ""
+msgstr "Poztwierdzone zamówienia sprzedaży do fakturowania."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1944,18 +1965,18 @@ msgstr "Zamknij"
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
-msgstr ""
+msgstr "Dostarczone"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "Brak zapasu !"
 
 #. module: sale
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Musisz podać nr partii dla tego produktu"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
@@ -1965,7 +1986,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
-msgstr ""
+msgstr "To oznacza, że faktura została zapłacona."
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -1985,7 +2006,7 @@ msgstr "Opis"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
@@ -2002,7 +2023,7 @@ msgstr "Klient"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: sale
 #: help:sale.installer,sale_journal:0
@@ -2014,7 +2035,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: sale
 #: view:sale.shop:0
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index be6f7d51c14..5636c36b725 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/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:45+0000\n"
-"PO-Revision-Date: 2010-12-25 19:00+0000\n"
+"PO-Revision-Date: 2010-12-31 10:33+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-26 04:50+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -192,7 +192,7 @@ msgstr "Движение запасов"
 #: field:sale.order,name:0
 #: field:sale.order.line,order_id:0
 msgid "Order Reference"
-msgstr "Ссылка на заказ"
+msgstr "Описание заказа"
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index b1e1ba2aedc..4f06e174548 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:08+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:08+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:27+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr ""
+
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
@@ -26,11 +32,8 @@ msgid "If you don't have enough stock available to deliver all at once, do you a
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
 msgstr ""
 
 #. module: sale
@@ -57,7 +60,7 @@ msgid "Configure Sales Order Logistics"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:603
 #, python-format
 msgid "The quotation '%s' has been converted to a sales order."
 msgstr ""
@@ -68,7 +71,7 @@ msgid "Payment Before Delivery"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:0
+#: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -96,6 +99,11 @@ msgstr ""
 msgid "Analytic Account"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid "Here is a list of each sales order line to be invoiced. You can invoice sales orders partially, by lines of sales order. You do not need this list if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
@@ -113,14 +121,13 @@ msgid "Order Line"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid "Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_average:0
-msgid "Average Price"
+#: help:sale.order,invoice_quantity:0
+msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
 
 #. module: sale
@@ -162,8 +169,6 @@ msgid "Ordered Quantities"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
 #: view:sale.report:0
 msgid "Sales by Salesman"
 msgstr ""
@@ -189,11 +194,6 @@ msgstr ""
 msgid "Dates"
 msgstr ""
 
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid "Here is a list of each sales order line to be invoiced. This view allows you to invoice sales orders partially, by lines of sales order. You don't need this list if you invoice based on the delivery orders or if you invoice sales totally."
-msgstr ""
-
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
 msgid "The invoice is created automatically if the shipping policy is 'Invoice from pick' or 'Invoice on order after delivery'."
@@ -220,10 +220,8 @@ msgid "This is the days added to what you promise to customers for security purp
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
 msgstr ""
 
 #. module: sale
@@ -242,7 +240,7 @@ msgid "Shop Name"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1014
 #, python-format
 msgid "No Customer Defined !"
 msgstr ""
@@ -272,7 +270,7 @@ msgid "The Shipping Policy is used to synchronise invoice and delivery operation
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:939
 #, python-format
 msgid "There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !"
 msgstr ""
@@ -288,7 +286,7 @@ msgid "You try to assign a lot which is not from the same product"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:620
 #, python-format
 msgid "invalid mode for test_state"
 msgstr ""
@@ -299,7 +297,7 @@ msgid "June"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:584
 #, python-format
 msgid "Could not cancel this sales order !"
 msgstr ""
@@ -320,8 +318,11 @@ msgid "October"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
 msgstr ""
 
 #. module: sale
@@ -377,13 +378,13 @@ msgid "The salesman confirms the quotation. The state of the sales order becomes
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:971
 #, python-format
 msgid "You must first cancel stock moves attached to this sales order line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1042
 #, python-format
 msgid "(n/a)"
 msgstr ""
@@ -399,7 +400,7 @@ msgid "Tel. :"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
 #, python-format
 msgid "You cannot make an advance on a sales order                              that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
@@ -443,6 +444,11 @@ msgstr ""
 msgid "Allotment Partner"
 msgstr ""
 
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
@@ -468,11 +474,6 @@ msgstr ""
 msgid "For every sales order line, a procurement order is created to supply the sold product."
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-msgid "Sales by Customer"
-msgstr ""
-
 #. module: sale
 #: help:sale.order,incoterm:0
 msgid "Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."
@@ -567,7 +568,9 @@ msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:290
+#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1165
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -650,7 +653,7 @@ msgid "Sales By Month"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:970
 #, python-format
 msgid "Could not cancel sales order line!"
 msgstr ""
@@ -738,8 +741,8 @@ msgid "Picking Default Policy"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid "Sales Orders helps you manage quotations and orders done with your customers. OpenERP suggests that you to start by creating a quotation. Once the order is confirmed, the quotation is converted into a Sale Order. OpenERP can handle several types of products so that a sales order can trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sale order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer."
+#: help:sale.order,invoice_ids:0
+msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."
 msgstr ""
 
 #. module: sale
@@ -753,7 +756,7 @@ msgid "The name and address of the contact who requested the order or quotation.
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:966
 #, python-format
 msgid "You cannot cancel a sales order line that has already been invoiced !"
 msgstr ""
@@ -791,9 +794,12 @@ msgid "Exception"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
 msgstr ""
 
 #. module: sale
@@ -812,7 +818,6 @@ msgid "Compute"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
 #: view:sale.report:0
 msgid "Sales by Partner"
 msgstr ""
@@ -872,6 +877,12 @@ msgstr ""
 msgid "Shipping address :"
 msgstr ""
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sales order"
@@ -989,11 +1000,6 @@ msgstr ""
 msgid "Taxes"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."
-msgstr ""
-
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
@@ -1030,12 +1036,6 @@ msgstr ""
 msgid "Advance Amount"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category"
-msgstr ""
-
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
@@ -1052,13 +1052,15 @@ msgid "Picking List"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:387
+#: code:addons/sale/sale.py:920
+#: code:addons/sale/sale.py:938
 #, python-format
 msgid "Error !"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:570
 #, python-format
 msgid "Could not cancel sales order !"
 msgstr ""
@@ -1090,7 +1092,7 @@ msgid "Shipping & Manual Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1051
 #, python-format
 msgid "Picking Information !"
 msgstr ""
@@ -1117,9 +1119,9 @@ msgid "To be reviewed by the accountant."
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Reference UoM"
 msgstr ""
 
 #. module: sale
@@ -1180,12 +1182,9 @@ msgid "Sales"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
@@ -1208,7 +1207,7 @@ msgid "Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1014
 #, python-format
 msgid "You have to select a customer in the sales form !\n"
 "Please set one customer before choosing a product."
@@ -1245,7 +1244,7 @@ msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:571
 #, python-format
 msgid "You must first cancel all picking attached to this sales order."
 msgstr ""
@@ -1327,7 +1326,7 @@ msgid "Order"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:921
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -1343,7 +1342,7 @@ msgid "Depending on the Invoicing control of the sales order, the invoice can be
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1116
 #, python-format
 msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
 "The real stock is %.2f %s. (without reservations)"
@@ -1371,7 +1370,7 @@ msgid "Total"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:388
 #, python-format
 msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
@@ -1382,7 +1381,14 @@ msgid "Depending on the configuration of the location Output, the move between t
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1165
 #, python-format
 msgid "Cannot delete a sales order line which is %s !"
 msgstr ""
@@ -1440,6 +1446,12 @@ msgstr ""
 msgid "Gives the margin of profitability by calculating the difference between Unit Price and Cost Price."
 msgstr ""
 
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Net Total :"
@@ -1466,19 +1478,13 @@ msgstr ""
 msgid "   Month   "
 msgstr ""
 
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,uom_name:0
-msgid "Default UoM"
-msgstr ""
-
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:0
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -1490,7 +1496,7 @@ msgid "Sales by Month"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1045
 #, python-format
 msgid "You selected a quantity of %d Units.\n"
 "But it's not compatible with the selected packaging.\n"
@@ -1534,6 +1540,12 @@ msgstr ""
 msgid "Error! You can not create recursive companies."
 msgstr ""
 
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
@@ -1577,7 +1589,7 @@ msgid "August"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:0
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid "Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n"
 "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
@@ -1639,7 +1651,7 @@ msgid "Untaxed Amount"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
 #: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
 #: view:sale.advance.payment.inv:0
 #: view:sale.order:0
@@ -1648,7 +1660,7 @@ msgid "Advance Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "The sales order '%s' has been cancelled."
 msgstr ""
@@ -1711,7 +1723,6 @@ msgid "Invoicing journals"
 msgstr ""
 
 #. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
@@ -1728,7 +1739,7 @@ msgid "You invoice has been successfully created!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:585
 #, python-format
 msgid "You must first cancel all invoices attached to this sales order."
 msgstr ""
@@ -1754,7 +1765,7 @@ msgid "Sales Order Layout Improvement"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
 #, python-format
 msgid "Error"
 msgstr ""
@@ -1786,13 +1797,13 @@ msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:290
 #, python-format
 msgid "Cannot delete Sales Order(s) which are already confirmed !"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:316
 #, python-format
 msgid "The sales order '%s' has been set in draft state."
 msgstr ""
@@ -1802,11 +1813,6 @@ msgstr ""
 msgid "from stock"
 msgstr ""
 
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "Close"
@@ -1818,7 +1824,7 @@ msgid "Delivered"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1115
 #, python-format
 msgid "Not enough stock !"
 msgstr ""
@@ -1834,13 +1840,13 @@ msgid "Layout Sequence"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid "If you have more than one shop reselling your company products, you can create and manage that from here. Whenever you will record a new quotation or sales order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sales."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid "If you have more than one shops reselling your company products, you can create and manage them from here. Whenever you will record a new quotation or sale order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sale."
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
@@ -1866,6 +1872,11 @@ msgstr ""
 msgid "Customer"
 msgstr ""
 
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 91492532acc..807e552cc80 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -128,7 +128,7 @@
   <story>
   <pto>
   <pto_header>
-    <blockTable colWidths="202.0,94.0,68.0,59.0,50.0,63.0" repeatRows="1" style="Table4">
+    <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -143,7 +143,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
+          <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Price</para>
@@ -241,7 +241,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="202.0,94.0,68.0,59.0,50.0,63.0" repeatRows="1" style="Table4">
+    <blockTable colWidths="181.0,70.0,80.0,70.0,50.0,85.0" repeatRows="1" style="Table4">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -256,7 +256,7 @@
           <para style="terp_tblheader_Details_Right">Unit Price</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
+          <para style="terp_tblheader_Details_Centre">Disc.(%)</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Price</para>
@@ -265,7 +265,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="203.0,94.0,47.0,22.0,59.0,42.0,70.0" style="Table5">
+      <blockTable colWidths="180.0,70.0,80.0,70.0,50.0,85.0" style="Table5">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]] </para>
@@ -274,16 +274,13 @@
             <para style="terp_default_Centre_9">[[ ', '.join(map(lambda x: x.name, line.tax_id)) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.product_uos and line.product_uos_qty or line.product_uom_qty) ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.price_unit ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.discount, digits=get_digits(dp='Sale Price')) ]]</para>
+            <para style="terp_default_Centre_9">[[ formatLang(line.discount, digits=get_digits(dp='Sale Price')) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
@@ -326,7 +323,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="387.0,56.0,93.0" style="Table6">
+    <blockTable colWidths="381.0,60.0,93.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -337,7 +334,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, dp='Sale Price') ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -350,7 +347,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, dp='Sale Price') ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -363,7 +360,7 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, dp='Sale Price') ]] [[ o.pricelist_id.currency_id.symbol ]] </para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 546e88ce37a..aaaec228d7b 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -95,8 +95,8 @@ class sale_report(osv.osv):
                         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,
+                        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 ,product_uom u, product_product p, product_template pt
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index add21f48cb3..3ed49f44b74 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -260,7 +260,7 @@ class sale_order(osv.osv):
         'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
-        'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
+        'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True,readonly=True)
     }
     _defaults = {
         'picking_policy': 'direct',
@@ -400,7 +400,7 @@ class sale_order(osv.osv):
                     inv_line_id = obj_invoice_line.copy(cr, uid, preline.id, {'invoice_id': False, 'price_unit': -preline.price_unit})
                     lines.append(inv_line_id)
         inv = {
-            'name': order.client_order_ref or order.name,
+            'name': order.client_order_ref or '',
             'origin': order.name,
             'type': 'out_invoice',
             'reference': "P%dSO%d" % (order.partner_id.id, order.id),
@@ -705,6 +705,7 @@ class sale_order(osv.osv):
                         #'state': 'waiting',
                         'note': line.notes,
                         'company_id': order.company_id.id,
+                        'returned_price': line.price_unit,
                     })
 
                 if line.product_id:
@@ -881,7 +882,8 @@ class sale_order_line(osv.osv):
         'invoiced': 0,
         'state': 'draft',
         'type': 'make_to_stock',
-        'product_packaging': False
+        'product_packaging': False,
+        'price_unit': 0.0,
     }
 
     def invoice_line_create(self, cr, uid, ids, context=None):
@@ -1200,11 +1202,11 @@ class sale_config_picking_policy(osv.osv_memory):
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
             ir_values_obj.set(cr, uid, 'default', False, 'order_policy', ['sale.order'], o.order_policy)
-            if o.step == 'one':
+            if o.step == 'two':
                 md = self.pool.get('ir.model.data')
                 location_id = md.get_object_reference(cr, uid, 'stock', 'stock_location_output')
                 location_id = location_id and location_id[1] or False
-                self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'transparent'})
+                self.pool.get('stock.location').write(cr, uid, [location_id], {'chained_auto_packing': 'manual'})
 
 sale_config_picking_policy()
 
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index a92afc69da6..0e3126defc5 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -8,10 +8,10 @@
             <field name="shop_id" ref="shop"/>
             <field model="product.pricelist" name="pricelist_id" search="[]"/>
             <field name="user_id" ref="base.user_root"/>
-            <field model="res.partner" name="partner_id" search="[]"/>
-            <field model="res.partner.address" name="partner_invoice_id" search="[]"/>
-            <field model="res.partner.address" name="partner_shipping_id" search="[]"/>
-            <field model="res.partner.address" name="partner_order_id" search="[]"/>
+            <field ref="base.res_partner_agrolait" name="partner_id"/>
+            <field ref="base.res_partner_address_8" name="partner_invoice_id"/>
+            <field ref="base.res_partner_address_8" name="partner_shipping_id"/>
+            <field ref="base.res_partner_address_8" name="partner_order_id"/>
         </record>
 
         <!--Resource: sale.order.line-->
@@ -182,17 +182,17 @@
         <function model="procurement.order" name="run_scheduler"/>
 
         <!-- sale advance demo.. -->
-		<!-- Demo Data for Product -->
-		
-		<record id="advance_product_0" model="product.product">
-			<field name="name">Advance Product</field>
-			<field name="categ_id" ref="product.cat1"/>
-			<field name="type">service</field>
-			<field name="list_price">150.0</field>
-			<field name="standard_price">100.0</field>
-			<field name="uom_id" ref="product.product_uom_unit"/>
-			<field name="uom_po_id" ref="product.product_uom_unit"/>
-		</record>
+        <!-- Demo Data for Product -->
+        
+        <record id="advance_product_0" model="product.product">
+            <field name="name">Advance</field>
+            <field name="categ_id" ref="product.cat1"/>
+            <field name="type">service</field>
+            <field name="list_price">150.0</field>
+            <field name="standard_price">100.0</field>
+            <field name="uom_id" ref="product.product_uom_unit"/>
+            <field name="uom_po_id" ref="product.product_uom_unit"/>
+        </record>
 
     <record id="base.user_demo" model="res.users">
         <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 786b5d2a7ff..5cc873beb75 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -38,7 +38,7 @@
         <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>
+        <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>
 
     <!-- Multi - Salesmen sales order assignation rules -->
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index fea84e019c4..f7c5d81ae57 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -186,19 +186,5 @@ class stock_picking(osv.osv):
                     })
         return result
 
-    def action_cancel(self, cr, uid, ids, context=None):
-        res = super(stock_picking, self).action_cancel(cr, uid, ids, context=context)
-        for pick in self.browse(cr, uid, ids, context=context):
-            call_ship_end = True
-            if pick.sale_id:
-                for picks in pick.sale_id.picking_ids:
-                    if picks.state not in ('done', 'cancel'):
-                        call_ship_end = False
-                        break
-                if call_ship_end:
-                    self.pool.get('sale.order').action_ship_end(cr, uid, [pick.sale_id.id], context=context)
-        return res
-
 stock_picking()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
index b3c01599680..b4a985ec4e8 100644
--- a/addons/sale/test/advance_invoice.yml
+++ b/addons/sale/test/advance_invoice.yml
@@ -5,7 +5,6 @@
   !record {model: sale.order, id: sale_order_so5}:
     date_order: '2010-07-17'
     invoice_quantity: order
-    name: SO004
     order_line:
       - name: LG Viewty Smart
         price_unit: 170.0
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index de845b5b34d..8c0383acb02 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -110,8 +110,8 @@ class sale_order_line_make_invoice(osv.osv_memory):
         if not invoices:
             raise osv.except_osv(_('Warning'), _('Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n1.The state of this sales order line is either "draft" or "cancel"!\n2.The Sales Order Line is Invoiced!'))
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 sale_order_line_make_invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_analytic_plans/i18n/de.po b/addons/sale_analytic_plans/i18n/de.po
index 50215a2ee40..f856141d7f9 100644
--- a/addons/sale_analytic_plans/i18n/de.po
+++ b/addons/sale_analytic_plans/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:45+0000\n"
-"PO-Revision-Date: 2010-12-01 09:33+0000\n"
+"PO-Revision-Date: 2010-12-31 10:29+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: 2011-01-01 05:04+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"
+"    Diese Anwendung bietet die Grundlage für die Verteilung von analytischen "
+"Buchungen durch Ausgangsrechnungen.\n"
+"    "
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Auftragsposition"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
diff --git a/addons/sale_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 46241731c70..8e8db68ddfe 100644
--- a/addons/sale_analytic_plans/i18n/es.po
+++ b/addons/sale_analytic_plans/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 19:06+0000\n"
+"PO-Revision-Date: 2010-12-28 09:16+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/it.po b/addons/sale_analytic_plans/i18n/it.po
index e4cc1d77be7..4427546b153 100644
--- a/addons/sale_analytic_plans/i18n/it.po
+++ b/addons/sale_analytic_plans/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-10-22 10:45+0000\n"
-"Last-Translator: Andrea Amoroso <andrea.amoroso@alice.it>\n"
+"PO-Revision-Date: 2011-01-01 22:18+0000\n"
+"Last-Translator: Roberto Onnis <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:42+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
@@ -33,11 +33,16 @@ msgid ""
 "    The base module to manage analytic distribution and sales orders.\n"
 "    "
 msgstr ""
+"\n"
+"    \\n\n"
+"    Il modulo di base per gestire le distribuzioni analitiche e gli ordini "
+"di vendita.\\n\n"
+"    "
 
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Linea d'ordine di vendita"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
diff --git a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
index 4212b772b9f..a92e1a2a47e 100644
--- a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
+++ b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:08+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:08+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:27+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_crm/i18n/de.po b/addons/sale_crm/i18n/de.po
index 0f936676c02..09c94e05326 100644
--- a/addons/sale_crm/i18n/de.po
+++ b/addons/sale_crm/i18n/de.po
@@ -8,14 +8,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-01 07:36+0000\n"
+"PO-Revision-Date: 2010-12-31 10:58+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.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: 2011-01-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -49,7 +49,7 @@ msgstr "Kunde hat keine Adresse"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr ""
+msgstr "Erstelle Verkaufsauftrag"
 
 #. module: sale_crm
 #: model:ir.module.module,description:sale_crm.module_meta_information
@@ -67,6 +67,22 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung erstellt eine Verknüpfung für die Verkaufschancen Ihrer CRM "
+"Anwendung.\n"
+"Durch die Verknüpfung kann durch einen einfachen Klick aus dem laufenden "
+"Vorgang einer \n"
+"Verkaufschance ein Angebot erstellt werden. Wenn Sie eine Liste mit mehreren "
+"Verkaufschancen \n"
+"haben, wird je Vorgang auch ein Angebot erstellt.\n"
+"\n"
+"Durch die Angebotserstellung werden die zugrundeliegenden Vorgänge für die "
+"Verkaufschance(n) automatisch beendet.\n"
+"\n"
+"Wir empfehlen Ihnen eine Installation der Anwendung, wenn Sie sowohl die CRM "
+"Anwendung als auch\n"
+"die Anwendungen für das Management von Verkaufsaufträgen einsetzen möchten.\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -127,7 +143,7 @@ msgstr "Shop"
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Verkaufschancen nach Stufen"
 
 #. module: sale_crm
 #: view:board.board:0
@@ -158,7 +174,7 @@ msgstr "Abbrechen"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #~ msgid "Crm opportunity quotation"
 #~ msgstr "CRM Verkaufschance Angebot"
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index cbf406fd5f0..a5a264e2a67 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 19:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:07+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index 1b481b3076f..3ce5e324586 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-20 05:48+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-31 10:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -126,7 +126,7 @@ msgstr "Magasin"
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Opportunités par étape"
 
 #. module: sale_crm
 #: view:board.board:0
@@ -142,7 +142,7 @@ msgstr "Fermer l'opportunité"
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Équipe commerciale"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -157,7 +157,7 @@ msgstr "Annuler"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Commande de ventes"
 
 #~ msgid "Crm opportunity quotation"
 #~ msgstr "Chiffrage de l'opportunité"
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 505027bf637..abce56e8c53 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-10-24 08:37+0000\n"
+"PO-Revision-Date: 2010-12-31 10:37+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:13+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -24,30 +24,30 @@ msgstr "Cliente"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr "Converti in Quotazione"
+msgstr "Converti in preventivo"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "is converted to Quotation."
-msgstr "è convertito in Quotazione"
+msgstr "è convertito in preventivo"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Dati insufficienti"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Customer has no addresses defined!"
-msgstr ""
+msgstr "Il cliente non ha un indirizzo definito"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr ""
+msgstr "Effettua vendite"
 
 #. module: sale_crm
 #: model:ir.module.module,description:sale_crm.module_meta_information
@@ -65,6 +65,20 @@ msgid ""
 "crm modules.\n"
 "    "
 msgstr ""
+"\n"
+"Questo modulo aggiunge una scorciatoia per una o per diverse opportunità di "
+"vendita nel CRM.\n"
+"Questa scorciatoia permette di generare un ordine di vendita basato sul caso "
+"selezionato.\n"
+"Se vengono aperti diversi casi (una lista), viene generato un ordine di "
+"vendita\n"
+"per ogni caso di CRM.\n"
+"Il caso viene quindi chiuso e legato all'ordine di vendita generato.\n"
+"\n"
+"Si consiglia di installare questo modulo qualora siano già installati sia il "
+"modulo vendite\n"
+" che quello del CRM.\n"
+"    "
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -76,6 +90,8 @@ msgstr "_Crea"
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
+"Spuntare questa opzione per chiudere l'opportunità dopo la creazione "
+"dell'ordine di vendita."
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -86,13 +102,13 @@ msgstr "Converti in preventivo"
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Fatturato mensile"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Convertito in preventivo di vendita(id: %s)."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
@@ -109,12 +125,12 @@ msgstr "Opportunità:%s"
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Crea ordine di vendita da opportunità"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr "Quotazioni"
+msgstr "Preventivi"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -124,12 +140,12 @@ msgstr "Negozio"
 #. module: sale_crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Opportunità per fase"
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr "Le mie Quotazioni"
+msgstr "I miei preventivi"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
@@ -140,12 +156,12 @@ msgstr "Chiudi Opportunità"
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Team vendite"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
 msgid "Make Quotation"
-msgstr "Genera quotazione"
+msgstr "Genera preventivo"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -155,7 +171,7 @@ msgstr "Annulla"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Ordine di vendita"
 
 #~ msgid "All at once"
 #~ msgstr "Tutto in una volta"
diff --git a/addons/sale_crm/i18n/pl.po b/addons/sale_crm/i18n/pl.po
index a7db87a8960..bff8a218494 100644
--- a/addons/sale_crm/i18n/pl.po
+++ b/addons/sale_crm/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 14:13+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 07:48+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index 2078a202072..ded053c0655 100644
--- a/addons/sale_crm/i18n/sale_crm.pot
+++ b/addons/sale_crm/i18n/sale_crm.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:09+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:09+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:28+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:28+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,19 +26,19 @@ msgid "Convert to Quotation"
 msgstr ""
 
 #. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "is converted to Quotation."
 msgstr ""
 
 #. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Data Insufficient!"
 msgstr ""
 
 #. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Customer has no addresses defined!"
 msgstr ""
@@ -67,6 +67,11 @@ msgstr ""
 msgid "_Create"
 msgstr ""
 
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid "Check this to close the opportunity after having created the sale order."
@@ -84,19 +89,19 @@ msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
 msgstr ""
 
 #. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
 #, python-format
 msgid "Opportunity "
 msgstr ""
 
 #. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
 msgstr ""
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index cdb5893a6f3..3c17f278e16 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -112,7 +112,7 @@ class crm_make_sale(osv.osv_memory):
             if make.close:
                 case_obj.case_close(cr, uid, data)
             if not new_ids:
-                return {}
+                return {'type': 'ir.actions.act_window_close'}
             if len(new_ids)<=1:
                 value = {
                     'domain': str([('id', 'in', new_ids)]),
diff --git a/addons/sale_journal/i18n/de.po b/addons/sale_journal/i18n/de.po
index 8c4e088c7e0..283ff1eab32 100644
--- a/addons/sale_journal/i18n/de.po
+++ b/addons/sale_journal/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:45+0000\n"
-"PO-Revision-Date: 2010-12-01 09:33+0000\n"
+"PO-Revision-Date: 2010-12-31 10:36+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:32+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -30,7 +30,7 @@ msgstr "Der Journaltyp für Verkauf und Lieferung"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -61,6 +61,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the invoice "
 "type without removing it."
 msgstr ""
+"Wenn diese Option deaktiviert wird, können Sie die Anzeige des Rechnungstyps "
+"ausblenden."
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
@@ -99,6 +101,39 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    Die Anwendung für Verkaufsjournale ermöglicht Ihnen eine Kategorisierung "
+"von\n"
+"     Verkäufe und Lieferaufträgen durch verschiedene Journale.\n"
+"     Diese Anwendung ist sehr hilfreich für größere Unternehmen, mit "
+"komplexeren\n"
+"     Abteilungs- und Bereichsstrukturen.\n"
+"\n"
+"     Sie können Verkaufsjournale sehr felxibel für verschiedene Zwecke "
+"anwenden:\n"
+"     * Trennung der Verkäufe nach verschiedenen Abteilungen\n"
+"     *  Lieferauftragsjournale getrennt nach Transportmittel, z.B. per LKW "
+"oder per UPS\n"
+"\n"
+"     Verkaufsjournale haben eine zugewiesenen verantwortlichen Mitarbeiter "
+"und ermöglichen eine Verwaltung des Status:\n"
+"     * Entwurf, Offen, Abgebrochen, Beendet.\n"
+"\n"
+"     Weiterhin können Batch Operationen gesteuert über die Journale sinnvoll "
+"sein, z.B. zwecks einmaliger Bestätigung \n"
+"     aller Verkaufsaufträge in einem Journal, oder zur täglichen Bestätigung "
+"von Rechnungen, Lieferaufträgen ...\n"
+"\n"
+"     Unterstützt wird durch dieses Modul auch eine Batch-Fakturierung, die "
+"bei den Kunden bzw. den Aufträgen \n"
+"     durch Hinterlegung eines Verkaufsjournals konfiguriert werden kann. "
+"Z.B. können folgende Journale definiert werden:\n"
+"     * täglich Fakturierung,\n"
+"     * monatliche Fakturierung, ...\n"
+"\n"
+"     Die Anwendung bietet abschliessend einige fertige Statistiken zur "
+"Analyse von Verkäufen und Lieferungen.\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
@@ -113,7 +148,7 @@ msgstr "Gruppiert"
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index 978a563cc5a..0af6f0707c9 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-27 19:14+0000\n"
+"PO-Revision-Date: 2010-12-29 08:04+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-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:26+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -99,6 +99,32 @@ msgid ""
 "    Some statistics by journals are provided.\n"
 "    "
 msgstr ""
+"\n"
+"    El módulo de diario de ventas le permite categorizar sus ventas\n"
+"    y entregas (albaranes) en diferentes diarios.\n"
+"    Este módulo es muy útil para compañías grandes que\n"
+"    trabajan por departamentos.\n"
+"\n"
+"    Puede usar los diarios para diferentes propósitos, algunos ejemplos:\n"
+"    * aislar ventas de diferentes departamentos\n"
+"    * diarios para entregas según camión o compañía de envío\n"
+"\n"
+"    Los diarios tienen un responsable y evolucionan entre diferentes "
+"estados:\n"
+"    * borrador, abierto, cancelado, hecho.\n"
+"\n"
+"    Se pueden procesar operaciones en lote en los diferentes diarios\n"
+"    para confirmar todas las ventas a la vez, para validar o facturar "
+"albaranes, ...\n"
+"\n"
+"    También soporta métodos de facturación en lote que pueden ser "
+"configurados \n"
+"    según tercero o órdenes de venta, ejemplos:\n"
+"    * facturación diaria,\n"
+"    * facturación mensual, ...\n"
+"\n"
+"    Se proporcionan algunas estadísticas por diario.\n"
+"    "
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
diff --git a/addons/sale_journal/i18n/it.po b/addons/sale_journal/i18n/it.po
index dd2b888b21b..bf2a3173580 100644
--- a/addons/sale_journal/i18n/it.po
+++ b/addons/sale_journal/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-08-03 06:03+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 22:26+0000\n"
+"Last-Translator: Roberto Onnis <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:32+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -29,12 +29,12 @@ msgstr ""
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Ordine di vendita"
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fatturazione"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
diff --git a/addons/sale_journal/i18n/sale_journal.pot b/addons/sale_journal/i18n/sale_journal.pot
index 9b245d8d645..82d022bcb03 100644
--- a/addons/sale_journal/i18n/sale_journal.pot
+++ b/addons/sale_journal/i18n/sale_journal.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:09+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:09+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:28+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:28+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "The type of journal used for sales and picking."
 msgstr ""
 
 #. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_order
-msgid "Sales Order"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
 msgstr ""
 
 #. module: sale_journal
@@ -35,11 +35,6 @@ msgstr ""
 msgid "Invoicing"
 msgstr ""
 
-#. module: sale_journal
-#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
-msgid "Invoice types are used on partners, sales order and delivery orders. You can create journal to group your invoicing according to customer's needs: daily, each wednesday, monthly, etc."
-msgstr ""
-
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
@@ -102,11 +97,21 @@ msgstr ""
 msgid "Error ! You can not create recursive associated members."
 msgstr ""
 
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid "Invoice types are used for partners, sales orders and delivery orders. You can create a specific invoicing journal to group your invoicing according to your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
 msgid "Invoicing method"
 msgstr ""
 
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
 #: view:sale_journal.invoice.type:0
diff --git a/addons/sale_layout/i18n/de.po b/addons/sale_layout/i18n/de.po
index d7520af5686..e21c0f52ba3 100644
--- a/addons/sale_layout/i18n/de.po
+++ b/addons/sale_layout/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-01 09:32+0000\n"
+"PO-Revision-Date: 2010-12-31 10:52+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_layout
@@ -36,6 +36,16 @@ msgid ""
 "\n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung bietet Funktionen, um das Layout von Verkaufsaufträgen "
+"zu verbessern.\n"
+"\n"
+"     Das Modul gibt Ihnen die Möglichkeit,\n"
+"         * alle Zeilen eines Verkaufsauftrags individuell zu sortieren\n"
+"         * Titel hinzuzufügen, Kommentarzeilen, Zwischensummen zu ergänzen\n"
+"         * horizontale Linien und Seitenumbrüche zu ergänzen\n"
+"\n"
+"    "
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
@@ -265,7 +275,7 @@ msgstr "Fax:"
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -280,7 +290,7 @@ msgstr "Preis"
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Auftragsposition"
 
 #. module: sale_layout
 #: view:sale.order:0
diff --git a/addons/sale_layout/i18n/es.po b/addons/sale_layout/i18n/es.po
index 206513e6ce0..a3668701555 100644
--- a/addons/sale_layout/i18n/es.po
+++ b/addons/sale_layout/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-27 19:39+0000\n"
+"PO-Revision-Date: 2010-12-28 09:13+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_layout
diff --git a/addons/sale_layout/i18n/fr_BE.po b/addons/sale_layout/i18n/fr_BE.po
deleted file mode 100644
index 52da36456b6..00000000000
--- a/addons/sale_layout/i18n/fr_BE.po
+++ /dev/null
@@ -1,276 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_layout
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-26 08:45:52+0000\n"
-"PO-Revision-Date: 2009-11-26 08:45:52+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: sale_layout
-#: selection:sale.order.line,layout_type:0
-msgid "Sub Total"
-msgstr ""
-
-#. module: sale_layout
-#: selection:sale.order.line,layout_type:0
-msgid "Title"
-msgstr ""
-
-#. module: sale_layout
-#: model:ir.module.module,shortdesc:sale_layout.module_meta_information
-msgid "sale_layout"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Disc. (%)"
-msgstr ""
-
-#. module: sale_layout
-#: selection:sale.order.line,layout_type:0
-msgid "Note"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale_layout
-#: field:sale.order,abstract_line_ids:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale_layout
-#: field:sale.order.line,layout_type:0
-msgid "Layout Type"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Seq."
-msgstr ""
-
-#. module: sale_layout
-#: selection:sale.order.line,layout_type:0
-msgid "Product"
-msgstr ""
-
-#. module: sale_layout
-#: model:ir.module.module,description:sale_layout.module_meta_information
-msgid "\n"
-"    This module provides some features to improve the layout of the Sale Order.\n"
-"\n"
-"    It gives you the possibility to\n"
-"        * order all the lines of an sale order\n"
-"        * add titles, comment lines, sub total lines\n"
-"        * draw horizontal lines and put page breaks    \n"
-"\n"
-"    "
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Description"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Manual Description"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Our Salesman"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Automatic Declaration"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Quotation N°"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "VAT"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Make Invoice"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale_layout
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: sale_layout
-#: selection:sale.order.line,layout_type:0
-msgid "Page Break"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Notes"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Date Ordered"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Total :"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Payment Terms"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "History"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Sale Order Lines"
-msgstr ""
-
-#. module: sale_layout
-#: selection:sale.order.line,layout_type:0
-msgid "Separator Line"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Your Reference"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Sales order lines"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Qty"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "States"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale_layout
-#: model:ir.actions.report.xml,name:sale_layout.sale_order_1
-msgid "Order with Layout"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "UoM"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Order Line"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Price"
-msgstr ""
-
-#. module: sale_layout
-#: rml:sale.order.layout:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: sale_layout
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr ""
-
diff --git a/addons/sale_layout/i18n/ru.po b/addons/sale_layout/i18n/ru.po
index c999dc8a7b2..9f7b316d834 100644
--- a/addons/sale_layout/i18n/ru.po
+++ b/addons/sale_layout/i18n/ru.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-25 22:11+0000\n"
+"PO-Revision-Date: 2011-01-01 12:46+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_layout
@@ -99,7 +99,7 @@ msgstr "Описание"
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Manual Description"
-msgstr ""
+msgstr "Примечания"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
diff --git a/addons/sale_layout/i18n/sale_layout.pot b/addons/sale_layout/i18n/sale_layout.pot
index 476b762947a..a6347a41f48 100644
--- a/addons/sale_layout/i18n/sale_layout.pot
+++ b/addons/sale_layout/i18n/sale_layout.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:10+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:10+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -88,6 +88,11 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Description"
diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py
index 94b10c8ebf9..57839ecffeb 100644
--- a/addons/sale_layout/report/report_sale_layout.py
+++ b/addons/sale_layout/report/report_sale_layout.py
@@ -41,7 +41,6 @@ class sale_order_1(report_sxw.rml_parse):
     def sale_order_lines(self, sale_order):
         result = []
         sub_total = {}
-        info = []
         order_lines = []
         res = {}
         obj_order_line = self.pool.get('sale.order.line')
diff --git a/addons/sale_margin/i18n/de.po b/addons/sale_margin/i18n/de.po
index 6c766254390..071ab8a5169 100644
--- a/addons/sale_margin/i18n/de.po
+++ b/addons/sale_margin/i18n/de.po
@@ -9,14 +9,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-01 09:32+0000\n"
+"PO-Revision-Date: 2010-12-31 10:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -64,6 +64,11 @@ msgid ""
 "Unit Price and Cost Price\n"
 "    "
 msgstr ""
+" \n"
+"    Diese Anwendung ergänzt das Feld Verkaufsspanne bei Verkaufsaufträgen.\n"
+"    Die Differenz zwischen Verkaufspreis und Selbstkostenpreis wird "
+"errechnet und bei der Auftragserfassung angezeigt.\n"
+"    "
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -87,6 +92,8 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and Cost Price."
 msgstr ""
+"Hier wird die Verkaufsspanne angezeigt, die sich aus der Differenz zwischen "
+"Verkaufspreis und Selbstkostenpreis ergibt."
 
 #. module: sale_margin
 #: field:report.account.invoice.product,type:0
@@ -322,7 +329,7 @@ msgstr "Partner"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #. module: sale_margin
 #: selection:report.account.invoice.product,state:0
@@ -337,7 +344,7 @@ msgstr "Statistik Rechnungen"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Auftragsposition"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
diff --git a/addons/sale_margin/i18n/es.po b/addons/sale_margin/i18n/es.po
index 8156057fcc7..648d2dfba67 100644
--- a/addons/sale_margin/i18n/es.po
+++ b/addons/sale_margin/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 19:35+0000\n"
+"PO-Revision-Date: 2010-12-28 08:37+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
diff --git a/addons/sale_margin/i18n/fr_BE.po b/addons/sale_margin/i18n/fr_BE.po
deleted file mode 100644
index 8ef3d3df4ab..00000000000
--- a/addons/sale_margin/i18n/fr_BE.po
+++ /dev/null
@@ -1,367 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* sale_margin
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-25 14:28:11+0000\n"
-"PO-Revision-Date: 2009-11-25 14:28:11+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: sale_margin
-#: selection:report.account.invoice,type:0
-#: selection:report.account.invoice.category,type:0
-#: selection:report.account.invoice.partner,type:0
-#: selection:report.account.invoice.partner.product,type:0
-#: selection:report.account.invoice.product,type:0
-msgid "Customer Refund"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice_product
-msgid "report.account.invoice.product"
-msgstr ""
-
-#. module: sale_margin
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_product
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_product
-msgid "Invoices by Product"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,type:0
-#: selection:report.account.invoice.category,type:0
-#: selection:report.account.invoice.partner,type:0
-#: selection:report.account.invoice.partner.product,type:0
-#: selection:report.account.invoice.product,type:0
-msgid "Customer Invoice"
-msgstr ""
-
-#. module: sale_margin
-#: wizard_view:stock.invoice_onshipping,init:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale_margin
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice_partner_product
-msgid "report.account.invoice.partner.product"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,type:0
-#: selection:report.account.invoice.category,type:0
-#: selection:report.account.invoice.partner,type:0
-#: selection:report.account.invoice.partner.product,type:0
-#: selection:report.account.invoice.product,type:0
-msgid "Supplier Invoice"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice,state:0
-#: field:report.account.invoice.category,state:0
-#: field:report.account.invoice.partner,state:0
-#: field:report.account.invoice.partner.product,state:0
-#: field:report.account.invoice.product,state:0
-msgid "State"
-msgstr ""
-
-#. module: sale_margin
-#: view:stock.picking:0
-msgid "Create Invoice"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
-#: selection:report.account.invoice.product,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale_margin
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_month_product
-msgid "All Months"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree_all
-msgid "report.account.invoice.partner.product.tree"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice,type:0
-#: field:report.account.invoice.category,type:0
-#: field:report.account.invoice.partner,type:0
-#: field:report.account.invoice.partner.product,type:0
-#: field:report.account.invoice.product,type:0
-#: wizard_field:stock.invoice_onshipping,init,type:0
-msgid "Type"
-msgstr ""
-
-#. module: sale_margin
-#: wizard_field:stock.invoice_onshipping,init,journal_id:0
-msgid "Destination Journal"
-msgstr ""
-
-#. module: sale_margin
-#: view:stock.picking:0
-msgid "Supplier Invoices"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice.partner.product,product_id:0
-#: field:report.account.invoice.product,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: sale_margin
-#: view:report.account.invoice.partner:0
-msgid "Invoices by partner"
-msgstr ""
-
-#. module: sale_margin
-#: view:report.account.invoice.category:0
-msgid "Invoices by category"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
-#: selection:report.account.invoice.product,state:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.actions.wizard,name:sale_margin.wizard_picking_invoice_create
-#: wizard_button:stock.invoice_onshipping,init,create_invoice:0
-msgid "Create invoice"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree_all
-msgid "report.account.invoice.category.tree"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner_product
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner_product
-msgid "Invoices by Partner and Product"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice_category
-msgid "report.account.invoice.category"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product
-msgid "This Month"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice.category,categ_id:0
-msgid "Categories"
-msgstr ""
-
-#. module: sale_margin
-#: field:account.invoice.line,cost_price:0
-#: field:report.account.invoice,cost_price:0
-#: field:report.account.invoice.category,cost_price:0
-#: field:report.account.invoice.partner,cost_price:0
-#: field:report.account.invoice.partner.product,cost_price:0
-#: field:report.account.invoice.product,cost_price:0
-#: field:sale.order.line,purchase_price:0
-msgid "Cost Price"
-msgstr ""
-
-#. module: sale_margin
-#: wizard_field:stock.invoice_onshipping,init,group:0
-msgid "Group by partner"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice_partner
-msgid "report.account.invoice.partner"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner
-msgid "Invoices by Partner"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_category
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_category
-msgid "Invoices by Category"
-msgstr ""
-
-#. module: sale_margin
-#: view:report.account.invoice.partner.product:0
-msgid "Invoices by partner and product"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice,amount:0
-#: field:report.account.invoice.category,amount:0
-#: field:report.account.invoice.partner,amount:0
-#: field:report.account.invoice.partner.product,amount:0
-#: field:report.account.invoice.product,amount:0
-msgid "Amount"
-msgstr ""
-
-#. module: sale_margin
-#: wizard_field:stock.invoice_onshipping,init,invoice_date:0
-msgid "Invoiced date"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,type:0
-#: selection:report.account.invoice.category,type:0
-#: selection:report.account.invoice.partner,type:0
-#: selection:report.account.invoice.partner.product,type:0
-#: selection:report.account.invoice.product,type:0
-msgid "Supplier Refund"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree_all
-msgid "report.account.invoice.partner.tree"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice,margin:0
-#: field:report.account.invoice.category,margin:0
-#: field:report.account.invoice.partner,margin:0
-#: field:report.account.invoice.partner.product,margin:0
-#: field:report.account.invoice.product,margin:0
-#: field:sale.order,margin:0
-#: field:sale.order.line,margin:0
-msgid "Margin"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice,quantity:0
-#: field:report.account.invoice.category,quantity:0
-#: field:report.account.invoice.partner,quantity:0
-#: field:report.account.invoice.partner.product,quantity:0
-#: field:report.account.invoice.product,quantity:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale_margin
-#: view:report.account.invoice.product:0
-msgid "Invoices by product"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.module.module,shortdesc:sale_margin.module_meta_information
-msgid "Margins in Sale Orders"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.model,name:sale_margin.model_report_account_invoice
-msgid "report.account.invoice"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices
-#: view:report.account.invoice:0
-#: view:stock.picking:0
-#: field:stock.picking,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
-#: selection:report.account.invoice.product,state:0
-msgid "Pro-forma"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice,name:0
-#: field:report.account.invoice.category,name:0
-#: field:report.account.invoice.partner,name:0
-#: field:report.account.invoice.partner.product,name:0
-#: field:report.account.invoice.product,name:0
-msgid "Month"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
-#: selection:report.account.invoice.product,state:0
-msgid "Canceled"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product
-msgid "Invoice"
-msgstr ""
-
-#. module: sale_margin
-#: wizard_button:stock.invoice_onshipping,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: sale_margin
-#: field:report.account.invoice.partner,partner_id:0
-#: field:report.account.invoice.partner.product,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree_all
-msgid "report.account.invoice.tree"
-msgstr ""
-
-#. module: sale_margin
-#: selection:report.account.invoice,state:0
-#: selection:report.account.invoice.category,state:0
-#: selection:report.account.invoice.partner,state:0
-#: selection:report.account.invoice.partner.product,state:0
-#: selection:report.account.invoice.product,state:0
-msgid "Open"
-msgstr ""
-
-#. module: sale_margin
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree
-#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree_all
-msgid "report.account.invoice.product.tree"
-msgstr ""
-
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index 17def48c2a5..a41f7cd73ca 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.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-25 10:04+0000\n"
+"PO-Revision-Date: 2011-01-01 12:37+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_margin
@@ -62,6 +62,10 @@ msgid ""
 "Unit Price and Cost Price\n"
 "    "
 msgstr ""
+" \n"
+"    Этот модуль добавит поле \"Прибыль\" в заказ на продажу,\n"
+"    прибыль определяется как разница между ценой продажи и ценой закупки\n"
+"    "
 
 #. module: sale_margin
 #: view:report.account.invoice.product:0
@@ -85,6 +89,7 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and Cost Price."
 msgstr ""
+"Прибыль определяется как разница между ценой продажи и ценой закупки."
 
 #. module: sale_margin
 #: field:report.account.invoice.product,type:0
diff --git a/addons/sale_margin/i18n/sale_margin.pot b/addons/sale_margin/i18n/sale_margin.pot
index c4b4e526bc9..3f2099b7af4 100644
--- a/addons/sale_margin/i18n/sale_margin.pot
+++ b/addons/sale_margin/i18n/sale_margin.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:10+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:10+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -96,6 +96,11 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
 #. module: sale_margin
 #: view:report.account.invoice.product:0
 msgid "Invoice by Partner"
diff --git a/addons/sale_mrp/i18n/de.po b/addons/sale_mrp/i18n/de.po
index 2955db71aee..ea24552c4f4 100644
--- a/addons/sale_mrp/i18n/de.po
+++ b/addons/sale_mrp/i18n/de.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-12-01 09:34+0000\n"
+"PO-Revision-Date: 2010-12-31 10:22+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:53+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+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 "Anzeige der Kundenreferenz bei Verkaufsauftrag"
 
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
@@ -45,11 +45,21 @@ msgid ""
 "    It adds sales name and sales Reference on production order\n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung ermöglicht eine parallele Anwendung der Module für die "
+"Fertigung\n"
+"    und den Vertrieb. Üblicherweise wird diese Anwendung genutzt, wenn die "
+"Beziehung \n"
+"    von Fertigungsaufträgen zu Verkaufsaufträgen jederzeitig rekapitulierbar "
+"sein soll.\n"
+"    Die Anwendung ergänzt zum Beispiel den Fertigungsauftrag durch die "
+"Verkaufsauftragsnummer.\n"
+"    "
 
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sales Name"
-msgstr ""
+msgstr "Bezeichnung Verkaufsauftrag"
 
 #. module: sale_mrp
 #: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
@@ -59,12 +69,12 @@ msgstr "Verkauf und Fertigungsplanung"
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Bestellmengen können nicht negativ oder '0' sein !"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
-msgstr ""
+msgstr "Anzeige der Auftragsbezeichnung durch den Verkauf"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/sale_mrp/i18n/es.po b/addons/sale_mrp/i18n/es.po
index 3c47c3ad034..3cd6a13450d 100644
--- a/addons/sale_mrp/i18n/es.po
+++ b/addons/sale_mrp/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-27 19:32+0000\n"
+"PO-Revision-Date: 2010-12-28 07:51+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/pl.po b/addons/sale_mrp/i18n/pl.po
index 78022a6897a..1c24876198f 100644
--- a/addons/sale_mrp/i18n/pl.po
+++ b/addons/sale_mrp/i18n/pl.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-27 13:55+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 08:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
index 3c48f2cfc18..b3a853d16a9 100644
--- a/addons/sale_mrp/i18n/sale_mrp.pot
+++ b/addons/sale_mrp/i18n/sale_mrp.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:10+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:10+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
index 90ff5ac06e2..a504c9a9e5a 100644
--- a/addons/sale_mrp/security/ir.model.access.csv
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -1,3 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_mrp_bom_user","mrp.bom","mrp.model_mrp_bom","base.group_sale_salesman",1,0,0,0
 "access_mrp_bom_manager","mrp.bom","mrp.model_mrp_bom","base.group_sale_manager",1,0,0,0
+"access_sale_order_manufacturing_user","sale.order manufacturing.user","sale.model_sale_order","mrp.group_mrp_user",1,1,0,0
+"access_sale_order_line_manufacturing_user","sale.order.line manufacturing.user","sale.model_sale_order_line","mrp.group_mrp_user",1,1,0,0
diff --git a/addons/sale_order_dates/i18n/de.po b/addons/sale_order_dates/i18n/de.po
index 28b1b5fe56d..e6803ed8f92 100644
--- a/addons/sale_order_dates/i18n/de.po
+++ b/addons/sale_order_dates/i18n/de.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-12-01 09:33+0000\n"
+"PO-Revision-Date: 2010-12-31 10:35+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: 2011-01-01 05:05+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 "Datum der Anfrage an Vertrieb"
 
 #. module: sale_order_dates
 #: field:sale.order,commitment_date:0
@@ -36,12 +36,12 @@ msgstr "Effektives Datum"
 #. module: sale_order_dates
 #: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "Verkaufsauftragsdaten"
 
 #. module: sale_order_dates
 #: help:sale.order,effective_date:0
 msgid "Date on which picking is created."
-msgstr ""
+msgstr "Datum der Erstellung des Lieferauftrags"
 
 #. module: sale_order_dates
 #: field:sale.order,requested_date:0
@@ -51,7 +51,7 @@ msgstr "Datum Wunschtermin"
 #. module: sale_order_dates
 #: model:ir.model,name:sale_order_dates.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #. module: sale_order_dates
 #: model:ir.module.module,description:sale_order_dates.module_meta_information
@@ -59,11 +59,15 @@ msgid ""
 "\n"
 "Add commitment, requested and effective dates on the sales order.\n"
 msgstr ""
+"\n"
+"Ergänzt weitere essentielle Daten für den Verkaufsauftrags, z.B. Datum der "
+"Erstellung, Bestätigungsdatum, \n"
+"Wunschliefertermin etc.\n"
 
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
-msgstr ""
+msgstr "Vereinbarter Liefertermin"
 
 #~ msgid "Sale Order Dates"
 #~ msgstr "Verkaufsauftrag Datum"
diff --git a/addons/sale_order_dates/i18n/es.po b/addons/sale_order_dates/i18n/es.po
index 92f12265cbc..9428e379266 100644
--- a/addons/sale_order_dates/i18n/es.po
+++ b/addons/sale_order_dates/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-27 19:18+0000\n"
+"PO-Revision-Date: 2010-12-28 09:14+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_order_dates
diff --git a/addons/sale_order_dates/i18n/pl.po b/addons/sale_order_dates/i18n/pl.po
index 3b48d0222e4..7e3d2d2e402 100644
--- a/addons/sale_order_dates/i18n/pl.po
+++ b/addons/sale_order_dates/i18n/pl.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-27 13:58+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:08+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_order_dates
diff --git a/addons/sale_order_dates/i18n/ru.po b/addons/sale_order_dates/i18n/ru.po
index 6ad2a954c10..b5ca5d3f7ec 100644
--- a/addons/sale_order_dates/i18n/ru.po
+++ b/addons/sale_order_dates/i18n/ru.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-25 22:09+0000\n"
+"PO-Revision-Date: 2011-01-01 11:54+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-02 05:02+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 "Дата в которую заказчик сделал заказ"
 
 #. module: sale_order_dates
 #: field:sale.order,commitment_date:0
@@ -62,7 +62,7 @@ msgstr ""
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made."
-msgstr ""
+msgstr "Дата на которую должна быть сделана доставка."
 
 #~ msgid "Sale Order Dates"
 #~ msgstr "Даты заказа на продажу"
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index 4018dd512e1..cad64f55dd1 100644
--- a/addons/sale_order_dates/i18n/sale_order_dates.pot
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:11+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:11+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:30+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
 msgid "Date on which customer has requested for sales."
diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po
index afaca09e7a6..3a2eff0aea1 100644
--- a/addons/share/i18n/de.po
+++ b/addons/share/i18n/de.po
@@ -7,21 +7,21 @@ 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-15 13:02+0000\n"
+"PO-Revision-Date: 2010-12-31 11:00+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: share
 #: code:addons/share/web/editors.py:0
 #, python-format
 msgid "Sharing"
-msgstr ""
+msgstr "Freigaben"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:0
@@ -52,7 +52,7 @@ msgstr "Management von Freigaben"
 #. module: share
 #: 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: share
 #: code:addons/share/wizard/share_wizard.py:0
@@ -80,6 +80,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: share
 #: model:ir.model,name:share.model_res_users
@@ -308,7 +310,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:0
 #, python-format
 msgid "Database"
-msgstr ""
+msgstr "Datenbank"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_user
diff --git a/addons/share/i18n/es.po b/addons/share/i18n/es.po
new file mode 100644
index 00000000000..c39a61bb906
--- /dev/null
+++ b/addons/share/i18n/es.po
@@ -0,0 +1,487 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-31 09:19+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:0
+#, python-format
+msgid "Sharing"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr "Gestión de comparticiones"
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "¡No puede tener dos usuarios con el mismo identificador de usuario!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr "Asistente compartición - Paso 1"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr "Reglas de acceso a comparticiones"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+msgstr ""
+"Querido,\n"
+"\n"
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está en las compañías permitidas para este "
+"usuario"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr ""
+"Felicidades, ¡acaba de configurar correctamente un nuevo acceso compartido!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "(Copy for sharing)"
+msgstr "(Copia para compartir)"
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "Recién creado"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr "URL genérica de acceso compartido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:"
+msgstr ""
+"Puede usar el siguiente usuario y contraseña para acceder a esta área "
+"protegida:"
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr "Sólo grupos regulares (no grupos de compartición"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr "Lectura y escritura"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr "Asistente compartición: paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr "Asistente compartición: paso 0"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr "Asistente compartición: paso 1"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr "Compartir usuario"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr "%s a compartido la información %s de OpenERP contigo"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr "Terminar"
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr "Usuarios"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr "Nuevos usuarios"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr "res.grupos"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "%s (Shared)"
+msgstr "%s (Compartido)"
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "¡El nombre del grupo debe ser único"
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr "Nuevos usuarios (direcciones de correo electrónico requeridas)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr ""
+"Filtro de compartición creada por el usuario %s (%s) para el grupo %s"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Grupos"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr "Seleccione el modo de acceso compartido deseado:"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "Grupo compartición"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr "¿Con quién desearía compartir estos datos?"
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+"    "
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "User already exists"
+msgstr "El usuario ya existe"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr "Enviar notificaciones por correo electrónico"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Database"
+msgstr "Base de datos"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr "Usuarios externos existentes"
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr "Usuarios con los que compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Email required"
+msgstr "Correo electrónico requerido"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Copied access for sharing"
+msgstr "Acceso copiado para compartición"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+"Nuevos usuarios (por favor, proveea a continuación una dirección de correo "
+"electrónico por línea)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr "Sólo usuarios regulares (no usuarios de compartición)"
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "Compartir URL"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "Modo de acceso"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr "Información acceso"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+"    %s"
+msgstr ""
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr "Acción a compartir"
+
+#. module: share
+#: code:addons/share/web/editors.py:0
+#, python-format
+msgid "Share"
+msgstr "Compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr "Asistente de compartición - Paso 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr ""
+"Aquí se muestra un resumen de los puntos de acceso que acaba de crear:"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr "No se pudo configurar el acceso compartido"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+#: field:share.wizard.user,share_wizard_id:0
+msgid "Share Wizard"
+msgstr "Asistente de compartición"
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+"Seleccione el tipo de usuarios con los que le gustaría compartir datos."
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+"Usuario externo con acceso limitado, creado sólo con el propósito de "
+"compartir datos."
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "Dominio opcional para filtrado avanzado de datos"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr "Sólo lectura"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:0
+#, python-format
+msgid "*usual password*"
+msgstr ""
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index b350a333cac..fc0fc2e6404 100644
--- a/addons/share/i18n/share.pot
+++ b/addons/share/i18n/share.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:11+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:11+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:30+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: share
-#: code:addons/share/web/editors.py:0
+#: code:addons/share/web/editors.py:15
 #, python-format
 msgid "Sharing"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:434
 #, python-format
 msgid "This additional data has been automatically added to your current access.\n"
 ""
@@ -49,7 +49,7 @@ msgid "You can not have two users with the same login !"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:76
 #, python-format
 msgid "Sharing Wizard - Step 1"
 msgstr ""
@@ -61,7 +61,7 @@ msgid "Share Access Rules"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:425
 #, python-format
 msgid "Dear,\n"
 "\n"
@@ -89,7 +89,7 @@ msgid "The action that opens the screen containing the data you wish to share."
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:68
 #, python-format
 msgid "Please specify \"share_root_url\" in context"
 msgstr ""
@@ -100,7 +100,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:247
 #, python-format
 msgid "(Copy for sharing)"
 msgstr ""
@@ -116,7 +116,7 @@ msgid "Generic Share Access URL"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:429
 #, python-format
 msgid "You may use the following login and password to get access to this protected area:"
 msgstr ""
@@ -147,7 +147,7 @@ msgid "Share wizard: step 1"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:430
 #: field:share.wizard.result.line,login:0
 #, python-format
 msgid "Username"
@@ -159,7 +159,7 @@ msgid "Share User"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:424
 #, python-format
 msgid "%s has shared OpenERP %s information with you"
 msgstr ""
@@ -176,7 +176,7 @@ msgid "Users"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:103
 #, python-format
 msgid "This username (%s) already exists, perhaps data has already been shared with this person.\n"
 "You may want to try selecting existing shared users instead."
@@ -193,7 +193,7 @@ msgid "res.groups"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:121
 #, python-format
 msgid "%s (Shared)"
 msgstr ""
@@ -209,7 +209,7 @@ msgid "New users (emails required)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:390
 #, python-format
 msgid "Sharing filter created by user %s (%s) for group %s"
 msgstr ""
@@ -230,7 +230,7 @@ msgid "Share Group"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:431
 #: field:share.wizard.result.line,password:0
 #, python-format
 msgid "Password"
@@ -252,7 +252,7 @@ msgid "The goal is to implement a generic sharing mechanism, where user of OpenE
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:102
 #, python-format
 msgid "User already exists"
 msgstr ""
@@ -263,14 +263,14 @@ msgid "Send Email Notification(s)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:435
 #, python-format
 msgid "You may use your existing login and password to view it. As a reminder, your login is %s.\n"
 ""
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:432
 #, python-format
 msgid "Database"
 msgstr ""
@@ -302,19 +302,19 @@ msgid "Users to share with"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:276
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:420
 #, python-format
 msgid "Email required"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:212
 #, python-format
 msgid "Copied access for sharing"
 msgstr ""
@@ -330,7 +330,7 @@ msgid "New Users (please provide one e-mail address per line below)"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:420
 #, python-format
 msgid "The current user must have an email address configured in User Preferences to be able to send outgoing emails."
 msgstr ""
@@ -351,7 +351,7 @@ msgid "Domain"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:286
 #, python-format
 msgid "Sorry, the current screen and filter you are trying to share are not supported at the moment.\n"
 "You may want to try a simpler filter."
@@ -368,7 +368,7 @@ msgid "Access info"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:426
 #, python-format
 msgid "To access it, you can go to the following URL:\n"
 "    %s"
@@ -380,13 +380,13 @@ msgid "Action to share"
 msgstr ""
 
 #. module: share
-#: code:addons/share/web/editors.py:0
+#: code:addons/share/web/editors.py:18
 #, python-format
 msgid "Share"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:406
 #, python-format
 msgid "Sharing Wizard - Step 2"
 msgstr ""
@@ -402,7 +402,7 @@ msgid "share.wizard.result.line"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:285
 #, python-format
 msgid "Sharing access could not be setup"
 msgstr ""
@@ -446,7 +446,7 @@ msgid "Read-only"
 msgstr ""
 
 #. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:295
 #, python-format
 msgid "*usual password*"
 msgstr ""
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index 9fe2c756e97..373dc5fdb64 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -8,14 +8,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 10:21+0000\n"
+"PO-Revision-Date: 2010-12-31 10:30+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.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:00+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -26,13 +26,14 @@ msgstr "Verfolge Warenversand"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_upload
 msgid "Stock ups upload"
-msgstr ""
+msgstr "Aktualisierung Lagerbestand"
 
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Variation Account is not specified for Product Category: %s"
 msgstr ""
+"Bestandsveränderungskonto ist nicht hinterlegt bei der Produktkategorie: %s"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -183,7 +184,7 @@ msgstr ""
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr ""
+msgstr "Fehlender Teillieferauftrag für die Lieferung #%s"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_move
@@ -211,7 +212,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "Nicht abzurechnen"
 
 #. module: stock
 #: help:stock.tracking,serial:0
@@ -275,7 +276,7 @@ msgstr ""
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Kategorien definieren."
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -664,6 +665,7 @@ msgstr "Pakete"
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: stock
 #: view:res.partner:0
@@ -682,6 +684,10 @@ msgid ""
 "customers. You can process the deliveries directly from this list, line by "
 "or line or through the Delivery Orders menu."
 msgstr ""
+"Das Menü 'Produktabgänge' zeigt alle an Kunden auszuliefernden "
+"Produktpositionen. Sie können die Auslieferung entweder direkt über diese "
+"Liste positionsweise ausführen oder über das Menü Warenversand gesamte "
+"Lieferaufträge bearbeiten."
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
@@ -815,7 +821,7 @@ msgstr "Zwischenlager für  Lieferungen zwischen internen Unternehmen"
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr ""
+msgstr "Ändere Produktanzahl"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -964,7 +970,7 @@ msgstr "Hauptlager Li"
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
 msgid "Delivery Information"
-msgstr ""
+msgstr "Lieferinformationen"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
@@ -975,7 +981,7 @@ msgstr "Inventur wurde abgeschlossen"
 #. module: stock
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -983,6 +989,8 @@ msgstr ""
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Es wurde noch kein Konto für den Warenversand bei dem folgenden Produkt "
+"definiert:  \"%s\" (id: %d)"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -1224,6 +1232,11 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
+"Die Systematik der Lagerjournale ermöglicht eine Zuweisung von "
+"Lieferaufträgen zu bestimmten Lagerjournalen in Abhängigkeit des\r\n"
+"jeweiligen Vorgangs, der im Lager durchzuführen ist. Als Beispiele können "
+"genannt werden: Wareneingangskontrolle, Kommissionierung, Verpackung, "
+"Versand etc."
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1242,6 +1255,9 @@ msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Variant account on category of this product are same."
 msgstr ""
+"Es kann keine Buchung im Journal vorgenommen werden, da das Konto für den "
+"Warenversand und das Bestandsveränderungskonto beim Produkt bzw. der "
+"Produktkategorie identisch sind."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1374,7 +1390,7 @@ msgstr "Generic IT Suppliers"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr ""
+msgstr "Packauftrag:"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -1417,13 +1433,13 @@ msgstr "Fehlerhafte Aktion"
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
 msgid "Receive Information"
-msgstr ""
+msgstr "Information Wareneingang"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr ""
+msgstr "Übersicht Lagerbestände"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement
@@ -1449,7 +1465,7 @@ msgstr "Auswertung Rückverfolgung"
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
 msgid "No Invoices were created"
-msgstr ""
+msgstr "Es wurden keine Rechnungen erzeugt"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@@ -1460,7 +1476,7 @@ msgstr "OpenERP S.A."
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
 msgid "Receive"
-msgstr ""
+msgstr "Wareneingang"
 
 #. module: stock
 #: help:stock.incoterms,active:0
@@ -1695,7 +1711,7 @@ msgstr "Datum"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Extended Filters..."
-msgstr "Filter auf Datenfelder..."
+msgstr "Erweiterter Filter..."
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
@@ -1818,6 +1834,9 @@ msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Variant account on category of this product are same."
 msgstr ""
+"Es kann keine Buchung im Journal vorgenommen werden, da das Konto für den "
+"Wareneingang und das Bestandsveränderungskonto beim Produkt bzw. der "
+"Produktkategorie identisch sind."
 
 #. module: stock
 #: view:stock.change.standard.price:0
@@ -1872,6 +1891,10 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
+"Die Auswertung Statistik Lagerbuchungen ermöglicht eine einfache Prüfung und "
+"Analyse von Lagerbuchungen. Benutzen Sie diese Statistik, wenn Sie "
+"verschiedene Routen beim Warenfluss Ihrer Produkte auswerten möchten oder "
+"die Produktivität in Ihrem Lager analysieren wollen."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -2088,7 +2111,7 @@ msgstr "Lagerbuchhaltung"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Lieferung von Teilmenge"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -2128,7 +2151,7 @@ msgstr "Letztes Inventurdatum"
 #: view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr "Gruppiert je..."
+msgstr "Gruppierung..."
 
 #. module: stock
 #: view:stock.location:0
@@ -2369,6 +2392,8 @@ msgstr "Revisionen"
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
 msgstr ""
+"Dieser Vorgang wird die Auslieferung abbrechen. Möchten Sie wirklich "
+"fortfahren?"
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2520,6 +2545,11 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
+"Anzeige der zuletzt durchgeführten Produktinventuren mit verschiedenen "
+"Möglichkeiten zur Filterung, Sortierung und Gruppierung. Wenn Sie permant "
+"über das Geschäftsjahr Inventuren für Produkte vornehmen, werden Sie diesen "
+"Bericht zwingend benötigen, um festzustellen, welche Produkte während des "
+"Jahres bereits gezählt wurden."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2652,12 +2682,16 @@ msgstr "Auftragsrückstand"
 msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Es wurde noch kein Konto für den Wareneingang für folgendes Produkt "
+"definiert: \"%s\" (id: %d)"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
+"Es kann keine Lieferung mit einer Menge von Null oder einer negativen Menge "
+"vorgenommen werden."
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -2674,6 +2708,8 @@ msgstr "Auffüllen Bestände"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Fehler: Die Standard Mengeneinheit sowie die Mengeneinheit für die "
+"Beschaffung muss in derselben Kategorie sein."
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -2719,6 +2755,8 @@ msgstr "Menge (UOS)"
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
+"Sie buchen eine Lieferung von %.2f %s Produkten, es sind aber nur %.2f %s "
+"für diese Losnummer vorhanden."
 
 #. module: stock
 #: view:stock.move:0
@@ -3001,7 +3039,7 @@ msgstr "Verbrauche Produkte"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr ""
+msgstr "Fehlerhafter Bestand bei Fertigungslos !"
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -3038,7 +3076,7 @@ msgstr "Gesamt Wert"
 #. module: stock
 #: field:stock.move.memory,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Assistent"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3087,7 +3125,7 @@ msgstr "Mengeneinheit"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr ""
+msgstr "Summe"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
@@ -3200,7 +3238,7 @@ msgstr "Begründung"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Delivery Order:"
-msgstr ""
+msgstr "Lieferauftrag"
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3368,11 +3406,12 @@ msgstr "Bestände zusammenführen"
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
 msgstr ""
+"Die Anzahl wird in der Standard Mengeneinheit für das Produkt angezeigt."
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr ""
+msgstr "Zugang:"
 
 #. module: stock
 #: help:stock.location,scrap_location:0
@@ -3565,6 +3604,11 @@ msgid ""
 "according to the original purchase order. You can validate the shipment "
 "totally or partially."
 msgstr ""
+"Das Menü Wareneingang beinhaltet eine Liste aller anstehenden Lieferaufträge "
+"bei Lieferanten. Ein Lieferauftrag für den Wareneingang beinhaltet eine "
+"Liste mit Produkten, die für den Wareneingang bezüglich noch offener "
+"Beschaffungsaufträge erwartet werden. Sie können Auftragsbezogen für den "
+"Warenzugang Teillieferungen oder Komplettlieferungen buchen."
 
 #. module: stock
 #: field:stock.move,auto_validate:0
@@ -3574,7 +3618,7 @@ msgstr "Automatisch Genehmigen"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Weight"
-msgstr ""
+msgstr "Gewicht"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
@@ -3595,16 +3639,18 @@ msgstr "Automatische Bewegung"
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
 msgstr ""
+"Einheitliche Fertigungsseriennummer, die gemäß folgender Logik angezeigt "
+"wird: PREFIX/SERIAL [INT_REF]"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Return Products"
-msgstr ""
+msgstr "Retourelieferung für Produkte"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr ""
+msgstr "Bestandsbuchung durchführen"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3695,7 +3741,7 @@ msgstr ""
 #. module: stock
 #: view:board.board:0
 msgid "Outgoing Products Delay"
-msgstr ""
+msgstr "Verzögerung Warenversand"
 
 #. module: stock
 #: field:stock.move.split.lines,use_exist:0
@@ -3820,7 +3866,7 @@ msgstr "XML Datei"
 #. module: stock
 #: view:stock.change.product.qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Wähle Anzahl"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
@@ -3874,6 +3920,8 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Die gesamte Anzahl kann für dieses Produkt in verschiedene Anteile "
+"aufgeteilt werden: \"%s\" (id:%d)"
 
 #. module: stock
 #: view:stock.move:0
@@ -3909,7 +3957,7 @@ msgstr ""
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: stock
 #: view:stock.move:0
@@ -3965,7 +4013,7 @@ msgstr "Mai"
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
 msgid "Deliver"
-msgstr ""
+msgstr "Ausliefern"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index a98a070e63f..a3cfd3095dd 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/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-12-27 19:51+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-31 08: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-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #~ msgid "Stock Management"
@@ -1263,6 +1262,8 @@ msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Variant account on category of this product are same."
 msgstr ""
+"No se puede crear el asiento, la cuenta de salida definida en este producto "
+"y la cuenta variante de la categoría de producto son la misma."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1838,6 +1839,8 @@ msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Variant account on category of this product are same."
 msgstr ""
+"No se puede crear el asiento, la cuenta de entrada definido en este producto "
+"y la cuenta variante en la categoría del producto son la misma."
 
 #. module: stock
 #: view:stock.change.standard.price:0
@@ -3431,7 +3434,7 @@ msgstr "Categoría de producto"
 #: code:addons/stock/wizard/stock_change_product_qty.py:0
 #, python-format
 msgid "INV: "
-msgstr ""
+msgstr "INV: "
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index f460af9e0e9..6346aa1af74 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-21 01:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 18:37+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <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 04:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -50,6 +50,8 @@ msgstr ""
 #, python-format
 msgid "Variation Account is not specified for Product Category: %s"
 msgstr ""
+"Le compte de variation de stock n'est pas spécifié dans la catégorie de "
+"produit: %s"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -169,7 +171,7 @@ msgstr "UdM"
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
 msgid "Physical Inventories"
-msgstr ""
+msgstr "Inventaires physique"
 
 #. module: stock
 #: field:product.category,property_stock_journal:0
@@ -245,7 +247,7 @@ msgstr "Origine"
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr ""
+msgstr "Non inventorié"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -440,7 +442,7 @@ msgstr "Décallage (Jours)"
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr ""
+msgstr "Action de traçabilité "
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -528,6 +530,7 @@ msgstr "Type d'emplacement"
 #: help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
 msgstr ""
+"Le type d'expédition définit si les produits sont entrants ou sortants."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -558,6 +561,8 @@ msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
 msgstr ""
+"Quantité actuelle de produits disponibles avec ce numéro de lot dans les "
+"entrepôts de la société."
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
@@ -638,6 +643,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Oblige à indiquer un lot de production pour tous les mouvements contenant ce "
+"produit et allant vers un emplacement client."
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -836,7 +843,7 @@ msgstr "Emplacement de transit pour les transferts inter-entrepôts"
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr ""
+msgstr "Changer la quantité de produit"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -1226,6 +1233,9 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
+"Pour le produit actuel, cet emplacement de stock sera utilisé, au lieu de "
+"l'emplacement par défaut, en tant qu'emplacement d'origine pour les "
+"mouvements de stock générés par les ordres de fabrication."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1366,7 +1376,7 @@ msgstr "Fournisseurs IT Générique"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr ""
+msgstr "Liste de colisage"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -1512,7 +1522,7 @@ msgstr "Impossible de livrer des produits qui sont déjà livrés !"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr ""
+msgstr "Facturation du stock au moment de l'expédition"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1623,6 +1633,7 @@ msgstr "Lot de suivi"
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
 msgstr ""
+"Détails facultatifs sur la localisation, uniquement à but informatif."
 
 #. module: stock
 #: view:product.product:0
@@ -1989,6 +2000,9 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
+"Pour le produit actuel, cet emplacement sera utilisé comme source des "
+"mouvements de stock générés lors de l'inventaire, à la place de "
+"l'emplacement par défaut."
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -2037,6 +2051,9 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements made on the product."
 msgstr ""
+"Ce menu permet la traçabilité totale des opérations de stock effectués sur "
+"un produit donné. Vous pouvez filtrer sur le produit pour voir toues les "
+"mouvements passés ou à venir concernant ce produit."
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -2044,6 +2061,9 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
+"Journal d'inventaire sur lequel le mouvement chainé sera inscrit, si le type "
+"de chaînage n'est pas \"Transparent\" (aucun journal n'est utilisé si le "
+"champ est vide)"
 
 #. module: stock
 #: view:board.board:0
@@ -2079,7 +2099,7 @@ msgstr "Gestion d'entrepôt"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Livraison partielle"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -2103,6 +2123,8 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
+"Date du mouvement : date planifiée tant que le mouvement n'est pas terminé, "
+"puis date de l'exécution réelle du mouvement."
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
@@ -2224,7 +2246,7 @@ msgstr "Produits "
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr ""
+msgstr "Suivre les lots entrants"
 
 #. module: stock
 #: view:board.board:0
@@ -2293,7 +2315,7 @@ msgstr "Méthode de livraison"
 #: help:stock.move,location_dest_id:0
 #: help:stock.picking,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "L'emplacement ou le système stockera les produits finis"
 
 #. module: stock
 #: help:product.category,property_stock_variation:0
@@ -2301,6 +2323,8 @@ msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
 msgstr ""
+"Quand la valorisation en temps réel est activée sur un produit, ce compte "
+"donnera la valorisation actuelle des produits."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2309,6 +2333,8 @@ msgid ""
 "There is no stock output account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Il n'y a pas de compte comptable sur la sortie de stock définit sur ce "
+"produit ou sa catégorie: \"%s\" (id: %d)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -2318,12 +2344,12 @@ msgstr "Mouvement de stock"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Dali(Jour)"
 
 #. module: stock
 #: field:stock.move.memory,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Mouvement"
 
 #. module: stock
 #: help:stock.picking,min_date:0
@@ -2436,7 +2462,7 @@ msgstr "Annuler l'inventaire"
 #: field:stock.move.split.lines,name:0
 #: field:stock.move.split.lines.exist,name:0
 msgid "Tracking serial"
-msgstr ""
+msgstr "Suivre le numéro de série"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:0
@@ -2466,12 +2492,12 @@ msgstr ""
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "July"
-msgstr ""
+msgstr "Juillet"
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Consumable"
-msgstr ""
+msgstr "Consommable"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
@@ -2512,7 +2538,7 @@ msgstr "Fournisseur Maxtor"
 #: code:addons/stock/wizard/stock_change_standard_price.py:0
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr ""
+msgstr "Active ID n'est pas mis dans le context"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2532,7 +2558,7 @@ msgstr ""
 #: view:stock.move:0
 #, python-format
 msgid "Receive Products"
-msgstr ""
+msgstr "Réceptionner les produits"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
@@ -2556,12 +2582,12 @@ msgstr "Bon de transfert interne"
 #: view:report.stock.move:0
 #: field:report.stock.move,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: stock
 #: help:stock.picking,date_done:0
 msgid "Date of Completion"
-msgstr ""
+msgstr "Date de fin prévue"
 
 #. module: stock
 #: help:stock.tracking,active:0
@@ -2582,7 +2608,7 @@ msgstr "Inventaires"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Todo"
-msgstr ""
+msgstr "À faire"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2603,7 +2629,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Retour"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -2611,6 +2637,8 @@ msgstr ""
 msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Il n'y a pas de compte d'entrée de stock définit pour ce produit: \"%s\" "
+"(id: %d)"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2633,6 +2661,8 @@ msgstr "Remplir l'inventaire"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Erreur : l'unité de mesure par défaut et l'unité d'achat doivent appartenir "
+"à la même catégorie."
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -2661,7 +2691,7 @@ msgstr "Lot"
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr ""
+msgstr "Numéro de lot de production"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2678,7 +2708,7 @@ msgstr "Rendre disponible"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr ""
+msgstr "Adresse du contac :"
 
 #. module: stock
 #: field:stock.move,backorder_id:0
@@ -2745,7 +2775,7 @@ msgstr "Préfix du suivi"
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr ""
+msgstr "Référence de l'inventaire"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2756,7 +2786,7 @@ msgstr "Bon de transfert"
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr ""
+msgstr "Ouvrir le produit"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -2767,7 +2797,7 @@ msgstr "Vers"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process"
-msgstr ""
+msgstr "Processus"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
@@ -2776,11 +2806,15 @@ msgstr "Nom de révision"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_root
 #: view:stock.warehouse:0
 msgid "Warehouse"
 msgstr "Entrepôt"
 
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_root
+msgid "Warehouse"
+msgstr "Stocks"
+
 #. module: stock
 #: view:stock.location.product:0
 msgid ""
@@ -2797,7 +2831,7 @@ msgstr "Propriété du compte de stock"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr ""
+msgstr "Colisation client"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -2816,7 +2850,7 @@ msgstr "Terminé"
 #: model:ir.model,name:stock.model_stock_change_standard_price
 #: view:stock.change.standard.price:0
 msgid "Change Standard Price"
-msgstr ""
+msgstr "Modifier le prix standard"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
@@ -2850,7 +2884,7 @@ msgstr "Non urgent"
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
-msgstr ""
+msgstr "À faire"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -2861,14 +2895,14 @@ msgstr "Entrepôts"
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "Analyse d'inventaire"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@@ -2911,7 +2945,7 @@ msgstr "Produit"
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
 msgid "Invoicing"
-msgstr ""
+msgstr "En facturation"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2927,19 +2961,19 @@ msgstr "Hauteur (Z)"
 #. module: stock
 #: field:stock.ups,weight:0
 msgid "Lot weight"
-msgstr ""
+msgstr "Poids du lot"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Produits consommés"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr ""
+msgstr "Stock insuffisant pour ce lot"
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -2949,7 +2983,7 @@ msgstr "Parent à droite"
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresse"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -2997,7 +3031,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr ""
+msgstr "Commande"
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3025,12 +3059,12 @@ msgstr "Unité de mesure"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr ""
+msgstr "Livraison interne"
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
@@ -3058,7 +3092,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr ""
+msgstr "Destination"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -3077,12 +3111,12 @@ msgstr ""
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Future Productions"
-msgstr ""
+msgstr "Production future"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "À facturer"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
@@ -3131,12 +3165,12 @@ msgstr "Inventaire du Lot"
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr ""
+msgstr "Motif"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Delivery Order:"
-msgstr ""
+msgstr "Ordre de livraison:"
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3180,6 +3214,8 @@ msgid ""
 "There is no inventory variation account defined on the product category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Aucun compte d'écart d'inventaire na été défini dans cette catégorie de "
+"produits : \"%s\" (id. : %d)"
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -3193,7 +3229,7 @@ msgstr "Voulez vous fusionnez ces inventaires"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulée"
 
 #. module: stock
 #: field:stock.location,chained_location_type:0
@@ -3301,7 +3337,7 @@ msgstr ""
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr ""
+msgstr "Réception"
 
 #. module: stock
 #: help:stock.location,scrap_location:0
@@ -3329,7 +3365,7 @@ msgstr ""
 #: help:stock.move.memory,cost:0
 #, python-format
 msgid "Unit Cost for this product line"
-msgstr ""
+msgstr "Coût unitaire pour cette ligne de produit"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
@@ -3338,13 +3374,13 @@ msgstr ""
 #: view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Catégorie de produits"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:0
 #, python-format
 msgid "INV: "
-msgstr ""
+msgstr "INV: "
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -3355,12 +3391,12 @@ msgstr "Reporting"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid " for the "
-msgstr ""
+msgstr " pour le "
 
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to leave in the current pack"
-msgstr ""
+msgstr "Quantité à laisser dans le colisage actuel"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3385,7 +3421,7 @@ msgstr "Configuration"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr ""
+msgstr "Lots existants"
 
 #. module: stock
 #: field:product.product,location_id:0
diff --git a/addons/stock/i18n/lv.po b/addons/stock/i18n/lv.po
new file mode 100644
index 00000000000..ea013930abc
--- /dev/null
+++ b/addons/stock/i18n/lv.po
@@ -0,0 +1,3849 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+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: 2011-01-01 22:37+0000\n"
+"Last-Translator: Vladimirs Kuzmins <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: 2011-01-02 05:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: stock
+#: field:product.product,track_outgoing:0
+msgid "Track Outgoing Lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups_upload
+msgid "Stock ups upload"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Variation Account is not specified for Product Category: %s"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_id:0
+msgid "Chained Location If Fixed"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in a new pack"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,action:0
+msgid "Action"
+msgstr "Darbība"
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Upstream Traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_line_date
+#: model:ir.ui.menu,name:stock.menu_report_stock_line_date
+msgid "Last Product Inventories"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Today"
+msgstr "Šodien"
+
+#. module: stock
+#: field:stock.production.lot.revision,indice:0
+msgid "Revision Number"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.memory:0
+msgid "Product Moves"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+msgid ""
+"This is the list of all delivery orders that must be prepared, according to "
+"your different sales orders and your logistics rules."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_move_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
+#: view:report.stock.move:0
+msgid "Moves Analysis"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,ref:0
+msgid ""
+"Internal reference number in case it differs from the manufacturer's serial "
+"number"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Picking list"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:report.stock.inventory,product_qty:0
+#: field:report.stock.move,product_qty:0
+#: field:stock.change.product.qty,new_quantity:0
+#: field:stock.inventory.line,product_qty:0
+#: field:stock.inventory.line.split,qty:0
+#: report:stock.inventory.move:0
+#: field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0
+#: field:stock.move.memory,quantity:0
+#: field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0
+#: field:stock.move.split.lines,quantity:0
+#: field:stock.move.split.lines.exist,quantity:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0
+#: field:stock.report.tracklots,name:0
+#: field:stock.split.into,quantity:0
+#, python-format
+msgid "Quantity"
+msgstr "Daudzums"
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,day:0
+msgid "Day"
+msgstr "Diena"
+
+#. module: stock
+#: view:stock.inventory:0
+#: field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0
+#: field:stock.move.split,product_uom:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+msgid "UoM"
+msgstr "mērv."
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form
+#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+msgid "Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_journal:0
+#: view:report.stock.move:0
+#: field:stock.change.standard.price,stock_journal:0
+msgid "Stock journal"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr "Ienākoša"
+
+#. module: stock
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"outgoing stock moves will be posted in this account. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Missing partial picking data for move #%s"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_move
+msgid "Deliver/Receive Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:0
+#, python-format
+msgid "You cannot delete any record!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"The current move line is already assigned to a pack, please remove it first "
+"if you really want to change it '             #                        'for "
+"this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Not Applicable"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,serial:0
+msgid "Other reference or serial number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,origin:0
+#: view:stock.picking:0
+#: field:stock.picking,origin:0
+msgid "Origin"
+msgstr "Izcelsme"
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Non Inv"
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,picking_id:0
+#: field:stock.picking,name:0
+#: view:stock.production.lot:0
+msgid "Reference"
+msgstr "Atsauce"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Products to Process"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_form
+msgid ""
+"Define your locations in order to reflect to your warehouse structure and "
+"organization. OpenERP is able to manage physical locations (warehouses, "
+"shelves, bin, etc), partners location (customers, suppliers) and virtual "
+"locations which are the counter-part of the stock operations like the "
+"manufacturing orders consummations, the 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 into the Stock location. Each report can "
+"be performed on physicals, partners or virtual locations."
+msgstr ""
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You can not create recursive categories."
+msgstr "Kļūda! Jūs nevarat veidot rekursīvas kategorijas."
+
+#. module: stock
+#: help:stock.fill.inventory,set_stock_zero:0
+msgid ""
+"If checked, all product quantities will be set to zero to help ensure a real "
+"physical inventory is done"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid ""
+"The Periodical Inventories are used when you count your number of products "
+"available per location. You can use it, once a year, when you do the general "
+"inventory or, once you need it, to correct the current stock level of a "
+"product."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Split lines"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot cancel picking because stock move is in done state !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Warning!"
+msgstr "Uzmanību!"
+
+#. module: stock
+#: field:stock.invoice.onshipping,group:0
+msgid "Group by partner"
+msgstr "Grupēt pēc partnera"
+
+#. module: stock
+#: help:stock.move,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Available'.\n"
+" When the picking is done the state is 'Done'.                               "
+"   \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_res_partner
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,partner_id:0
+#: view:stock.move:0
+#: field:stock.move,partner_id:0
+#: view:stock.picking:0
+#: field:stock.picking,partner_id:0
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: stock
+#: help:stock.move.memory,currency:0
+msgid "Currency in which Unit cost is expressed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "No invoicing"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot
+#: field:stock.production.lot.revision,lot_id:0
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Production lot"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,code:0
+msgid "Code for Incoterms"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,move_ids:0
+msgid "Moves for this pack"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Internal Location"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: field:report.stock.move,state:0
+#: view:stock.inventory:0
+#: field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0
+#: view:stock.move:0
+#: field:stock.move,state:0
+#: view:stock.picking:0
+#: field:stock.picking,state:0
+#: report:stock.picking.list:0
+msgid "State"
+msgstr "Stāvoklis"
+
+#. module: stock
+#: field:stock.location,stock_real_value:0
+msgid "Real Stock Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff2:0
+msgid "Lag (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_action_traceability
+msgid "Action traceability "
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "UOM"
+msgstr "Mērvienība"
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.move,state:0
+#: view:stock.picking:0
+#: selection:stock.picking,state:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,stock_available:0
+msgid "Available"
+msgstr "Pieejams"
+
+#. module: stock
+#: view:stock.picking:0
+#: field:stock.picking,min_date:0
+msgid "Expected Date"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
+msgid "Outgoing Product"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_warehouse_form
+msgid ""
+"Create and manage your warehouses and assign them a location from here"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_in:0
+msgid "In Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "No product in this location."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_output_id:0
+msgid "Location Output"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.split_into
+#: model:ir.model,name:stock.model_stock_split_into
+msgid "Split into"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,price_currency_id:0
+msgid "Currency for average price"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,location_type:0
+#: field:stock.location,usage:0
+msgid "Location Type"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,type:0
+#: help:stock.picking,type:0
+msgid "Shipping type specify, goods coming in or going out."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_move_labels
+msgid "Item Labels"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_move
+msgid "Moves Statistics"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Product Lots Filter"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "["
+msgstr "["
+
+#. module: stock
+#: help:stock.production.lot,stock_available:0
+msgid ""
+"Current quantity of products with this Production Lot Number available in "
+"company warehouses"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids:0
+msgid "Move History (child moves)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree6
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree6
+#: field:stock.picking,move_lines:0
+msgid "Internal Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,location_dest_id:0
+msgid "Destination Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can not process picking without stock moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_packaging:0
+msgid "Packaging"
+msgstr "Iepakojums"
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Order(Origin)"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Grand Total:"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
+msgid "Inventory Control"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: field:stock.location,comment:0
+msgid "Additional Information"
+msgstr "Papildu informācija"
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Location / Product"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Reception"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,serial:0
+msgid "Additional Reference"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot.revision:0
+msgid "Production Lot Revisions"
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,complete_name:0
+#: field:stock.location,name:0
+msgid "Location Name"
+msgstr "Noliktavas nosaukums"
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Posted Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Move Information"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Outgoing"
+msgstr "Izejoša"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "August"
+msgstr "Augusts"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_tracking_form
+#: model:ir.model,name:stock.model_stock_tracking
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form
+#: view:stock.tracking:0
+msgid "Packs"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: stock
+#: view:res.partner:0
+msgid "Sales & Purchases"
+msgstr "Tirdzniecība un Iepirkumi"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "June"
+msgstr "Jūnijs"
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid ""
+"The 'Deliver Products' menu lists all products you have to deliver to your "
+"customers. You can process the deliveries directly from this list, line by "
+"or line or through the Delivery Orders menu."
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_procurement:0
+msgid "Procurement Location"
+msgstr "Sagādes noliktava"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: field:stock.inventory.line.split,line_exist_ids:0
+#: field:stock.inventory.line.split,line_ids:0
+#: field:stock.move.split,line_exist_ids:0
+#: field:stock.move.split,line_ids:0
+msgid "Production Lots"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Recipient"
+msgstr "Saņēmējs"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_location_tree
+#: model:ir.ui.menu,name:stock.menu_action_location_tree
+msgid "Location Structure"
+msgstr "Noliktavas struktūra"
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "October"
+msgstr "Oktobris"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_line
+msgid "Inventory Line"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_journal:0
+msgid ""
+"When doing real-time inventory valuation, this is the Accounting Journal in "
+"which entries will be automatically posted when stock moves are processed."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_partial_picking
+msgid "Process Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Receptions"
+msgstr ""
+
+#. module: stock
+#: help:stock.inventory.line.split,use_exist:0
+#: help:stock.move.split,use_exist:0
+msgid ""
+"Check this option to select existing lots in the list below, otherwise you "
+"should enter new ones line by line."
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_dest_id:0
+msgid "Destination Move"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Now"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,address_id:0
+msgid "Location Address"
+msgstr "Noliktavas adrese"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is consumed with"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,prodlot_id:0
+msgid "Production lot is used to put a serial number on the production"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_input_id:0
+msgid "Location Input"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date:0
+msgid "Date of Order"
+msgstr "Pasūtījuma datums"
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Periodical (manual)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_procurement
+msgid "Procurements"
+msgstr "Sagādes"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_3
+msgid "IT Suppliers"
+msgstr "IT piegādātāji"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Transit Location for Inter-Companies Transfers"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
+#: model:ir.model,name:stock.model_stock_change_product_qty
+#: view:stock.change.product.qty:0
+msgid "Change Product Quantity"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future P&L"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree4
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
+#: view:stock.picking:0
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Scrap"
+msgstr "Brāķis"
+
+#. module: stock
+#: field:stock.location,child_ids:0
+msgid "Contains"
+msgstr "Satur"
+
+#. module: stock
+#: view:board.board:0
+msgid "Incoming Products Delay"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Stock Locations"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: field:stock.move,price_unit:0
+msgid "Unit Price"
+msgstr "Vienības cena"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines_exist
+msgid "Exist Split lines"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,date_expected:0
+msgid "Scheduled Date"
+msgstr "Ieplānotais datums"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Pack Search"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr "Steidzama"
+
+#. module: stock
+#: view:stock.picking:0
+#: report:stock.picking.list:0
+msgid "Journal"
+msgstr "Žurnāls"
+
+#. module: stock
+#: help:stock.picking,location_id:0
+msgid ""
+"Keep empty if you produce at the location where the finished products are "
+"needed.Set a location if you produce at a fixed location. This can be a "
+"partner location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: view:res.partner:0
+msgid "Inventory Properties"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff:0
+msgid "Execution Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_product_location_open
+msgid "Stock by Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,address_id:0
+msgid ""
+"Optional address where goods are to be delivered, specifically used for "
+"allotment"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Month-1"
+msgstr "Mēnesis-1"
+
+#. module: stock
+#: help:stock.location,active:0
+msgid ""
+"By unchecking the active field, you may hide a location without deleting it."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Packing list"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual:0
+msgid "Virtual Stock"
+msgstr "Virtuāla noliktava"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "View"
+msgstr "Skatīt"
+
+#. module: stock
+#: field:stock.location,parent_left:0
+msgid "Left Parent"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Delivery Information"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Stock Inventory is done"
+msgstr ""
+
+#. module: stock
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Kļūda: nederīgs EAN kods"
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock output account defined for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_production:0
+msgid "Production Location"
+msgstr "Ražošanas noliktava"
+
+#. module: stock
+#: help:stock.picking,address_id:0
+msgid "Address of partner"
+msgstr "Partnera adrese"
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_shop0
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
+msgstr ""
+
+#. module: stock
+#: help:stock.location,usage:0
+msgid ""
+"* Supplier Location: Virtual location representing the source location for "
+"products coming from your suppliers\n"
+"                       \n"
+"* View: Virtual location used to create a hierarchical structures for your "
+"warehouse, aggregating its child locations ; can't directly contain "
+"products\n"
+"                       \n"
+"* Internal Location: Physical locations inside your own warehouses,\n"
+"                       \n"
+"* Customer Location: Virtual location representing the destination location "
+"for products sent to your customers\n"
+"                       \n"
+"* Inventory: Virtual location serving as counterpart for inventory "
+"operations used to correct stock levels (Physical inventories)\n"
+"                       \n"
+"* Procurement: Virtual location serving as temporary counterpart for "
+"procurement operations when the source (supplier or production) is not known "
+"yet. This location should be empty when the procurement scheduler has "
+"finished running.\n"
+"                       \n"
+"* Production: Virtual counterpart location for production operations: this "
+"location consumes the raw material and produces finished products\n"
+"                      "
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,author_id:0
+msgid "Author"
+msgstr "Autors"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Delivery Order"
+msgstr "Piegādes Pasūtījums"
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Manual Operation"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: view:stock.move:0
+msgid "Supplier"
+msgstr "Piegādātājs"
+
+#. module: stock
+#: field:stock.picking,date_done:0
+msgid "Date Done"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Expected Shipping Date"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
+#: model:ir.model,name:stock.model_stock_inventory_line_split
+#: view:stock.inventory:0
+#: view:stock.inventory.line:0
+msgid "Split inventory lines"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Physical Inventory"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_company_id:0
+msgid ""
+"The company the Picking List containing the chained move will belong to "
+"(leave empty to use the default company determination rules"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_picking_type:0
+msgid ""
+"Shipping Type of the Picking List that will contain the chained move (leave "
+"empty to automatically detect the type based on the source and destination "
+"locations)."
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Lot number"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.inventory.line,product_uom:0
+#: field:stock.move.consume,product_uom:0
+#: field:stock.move.scrap,product_uom:0
+#, python-format
+msgid "Product UOM"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_partner
+msgid "Partner Locations"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total quantity"
+msgstr "Kopējais daudzums"
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_consume
+#: view:stock.move.consume:0
+msgid "Consume Move"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_7
+msgid "European Customers"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_delay:0
+msgid "Delay between original move and chained move in days"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Import current product inventory from the following location"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_auto_packing:0
+msgid ""
+"This is used only if you select a chained location type.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Downstream Traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_journal_form
+msgid ""
+"The stock journals system allows you assign each stock operation into a "
+"specific journal according to the type of operation to perform or the "
+"worker/team that should perform the operation. Examples of stock journals "
+"may be: quality control, pick lists, packing, etc."
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_production:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by production "
+"orders"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Can not create Journal Entry, Output Account defined on this product and "
+"Variant account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is in draft state."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups_final
+msgid "Stock ups final"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "To be refunded/invoiced"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop0
+msgid "Shop 1"
+msgstr "Veikals 1"
+
+#. module: stock
+#: view:stock.change.product.qty:0
+#: view:stock.change.standard.price:0
+#: view:stock.fill.inventory:0
+#: view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0
+#: view:stock.location.product:0
+#: view:stock.move:0
+#: view:stock.move.track:0
+#: view:stock.picking:0
+#: view:stock.split.into:0
+msgid "_Cancel"
+msgstr "_Atcelt"
+
+#. module: stock
+#: view:stock.move:0
+msgid "Ready"
+msgstr "Pabeigta"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Calendar View"
+msgstr "Kalendāra skats"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional Info"
+msgstr "Papildus info"
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Operation forbidden"
+msgstr "Operācija aizliegta"
+
+#. module: stock
+#: field:stock.location.product,from_date:0
+msgid "From"
+msgstr "No"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+#: field:stock.picking,invoice_state:0
+msgid "Invoice Control"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_production_lot_revision
+msgid "Production lot revisions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking List"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Waiting"
+msgstr "Gaida"
+
+#. module: stock
+#: view:stock.move:0
+#: selection:stock.move.split.lines,action:0
+#: view:stock.picking:0
+msgid "Split"
+msgstr "Sadalīt"
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Search Stock Picking"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Company is not specified in Location"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:stock.partial.move,type:0
+msgid "Type"
+msgstr "Tips"
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_5
+msgid "Generic IT Suppliers"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Picking List:"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date:0
+#: field:stock.move,create_date:0
+#: field:stock.production.lot,date:0
+#: field:stock.tracking,date:0
+msgid "Creation Date"
+msgstr "Izveidošanas datums"
+
+#. module: stock
+#: field:report.stock.lines.date,id:0
+msgid "Inventory Line Id"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,address_id:0
+msgid "Address of  customer or supplier."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,picking_id:0
+msgid "Packing"
+msgstr "Iepakošana"
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: field:res.partner,property_stock_customer:0
+#: selection:stock.location,usage:0
+msgid "Customer Location"
+msgstr "Klienta noliktava"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr "Nepareiza darbība!"
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Receive Information"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview
+#: report:lot.stock.overview:0
+msgid "Location Inventory Overview"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement
+msgid "Stock Replacement"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "General Informations"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr "Nav"
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Downstream traceability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "No Invoices were created"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "OpenERP S.A."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Receive"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,active:0
+msgid ""
+"By unchecking the active field, you may hide an INCOTERM without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+#: field:stock.picking,date:0
+msgid "Order Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,location_id:0
+msgid "Parent Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,state:0
+msgid ""
+"* Draft: not confirmed yet and will not be scheduled until confirmed\n"
+"* Confirmed: still waiting for the availability of products\n"
+"* Available: products reserved, simply waiting for confirmation.\n"
+"* Waiting: waiting for another move to proceed before it becomes "
+"automatically available (e.g. in Make-To-Order flows)\n"
+"* Done: has been processed, can't be modified or cancelled anymore\n"
+"* Cancelled: has been cancelled, can't be confirmed anymore"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,company_id:0
+msgid "Let this field empty if this location is shared between all companies"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Please provide a positive quantity to scrap!"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_delay:0
+msgid "Chaining Lead Time"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Cannot deliver products which are already delivered !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_invoice_onshipping
+msgid "Stock Invoice Onshipping"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: field:res.partner,property_stock_supplier:0
+#: selection:stock.location,usage:0
+msgid "Supplier Location"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "were scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Partial"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "September"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,backorder_id:0
+msgid ""
+"If this picking was split this field links to the picking that contains the "
+"other part that has been processed already."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_inventory
+msgid "Stock Statistics"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.move.memory,currency:0
+#, python-format
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_production:0
+msgid "Track Manufacturing Lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_open
+#: model:ir.actions.act_window,name:stock.action_move_form2
+#: model:ir.ui.menu,name:stock.menu_action_move_form2
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
+msgid "Stock Moves"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Sending Goods"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Cancel Availability"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date_expected:0
+msgid "Scheduled date for the processing of this move"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,move_ids:0
+msgid "Created Moves"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_14
+msgid "Shelf 2"
+msgstr ""
+
+#. module: stock
+#: field:stock.report.tracklots,tracking_id:0
+msgid "Tracking lot"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,posx:0
+#: help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: view:product.template:0
+msgid "Counter-Part Locations Properties"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Localization"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Delivered Qty"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Split in lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Numbers"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0
+#: view:stock.inventory:0
+#: report:stock.inventory.move:0
+#: view:stock.move:0
+#: field:stock.move,date:0
+#: field:stock.partial.move,date:0
+#: field:stock.partial.picking,date:0
+#: view:stock.picking:0
+msgid "Date"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,lot_stock_id:0
+msgid "Location Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Merging is only allowed on draft inventories."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_dashboard_stock
+msgid "Dashboard"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_track
+msgid "Track moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,code:0
+msgid "Code"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+msgid "Lots Number"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+msgid "Warehouse Dashboard"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can not remove a lot line !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_scrap
+#: view:stock.move:0
+#: view:stock.move.scrap:0
+#: view:stock.picking:0
+msgid "Scrap Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You cannot remove the picking which is in %s state !"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
+#: view:stock.picking:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_return_picking
+#: model:ir.model,name:stock.model_stock_return_picking
+msgid "Return Picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Split in production lots"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_location
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,location_id:0
+#: field:stock.change.product.qty,location_id:0
+#: field:stock.fill.inventory,location_id:0
+#: field:stock.inventory.line,location_id:0
+#: report:stock.inventory.move:0
+#: view:stock.location:0
+#: view:stock.move:0
+#: field:stock.move.consume,location_id:0
+#: field:stock.move.scrap,location_id:0
+#: field:stock.picking,location_id:0
+#: report:stock.picking.list:0
+#: field:stock.report.prodlots,location_id:0
+#: field:stock.report.tracklots,location_id:0
+msgid "Location"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Information"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Shipping Address :"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Provide the quantities of the returned products."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Can not create Journal Entry, Input Account defined on this product and "
+"Variant account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Cost Price"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: field:product.product,valuation:0
+msgid "Inventory Valuation"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process Later"
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_supplier:0
+msgid ""
+"This stock location will be used, instead of the default one, as the source "
+"location for goods you receive from the current partner"
+msgstr ""
+
+#. module: stock
+#: field:stock.warehouse,partner_address_id:0
+msgid "Owner Address"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_move_report
+msgid ""
+"Moves Analysis allows you to easily check and analyse your company stock "
+"moves. Use this report when you want to analyse the different routes taken "
+"by your products and inventory management performance."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,day_diff1:0
+msgid "Planned Lead Time (Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,new_price:0
+msgid "Price"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Search Inventory"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.track,quantity:0
+msgid "Quantity per lot"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no stock input account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Received Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,ref:0
+msgid "Internal Reference"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,prefix:0
+msgid ""
+"Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
+"[INT_REF]"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
+#: model:ir.model,name:stock.model_stock_fill_inventory
+#: view:stock.fill.inventory:0
+msgid "Import Inventory"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,name:0
+#: field:stock.move,name:0
+#: field:stock.warehouse,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is done."
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Stocks"
+msgstr ""
+
+#. module: stock
+#: model:ir.module.module,description:stock.module_meta_information
+msgid ""
+"OpenERP Inventory Management module can manage multi-warehouses, multi and "
+"structured stock locations.\n"
+"Thanks to the double entry management, the inventory controlling is powerful "
+"and flexible:\n"
+"* Moves history and planning,\n"
+"* Different inventory methods (FIFO, LIFO, ...)\n"
+"* Stock valuation (standard or average price, ...)\n"
+"* Robustness faced with Inventory differences\n"
+"* Automatic reordering rules (stock level, JIT, ...)\n"
+"* Bar code supported\n"
+"* Rapid detection of mistakes through double entry system\n"
+"* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+"* Dashboard for warehouse that includes:\n"
+"    * Products to receive in delay (date < = today)\n"
+"    * Procurement in exception\n"
+"    * Graph : Number of Receive products vs planned (bar graph on week par "
+"day)\n"
+"    * Graph : Number of Delivery products vs planned (bar graph on week par "
+"day)\n"
+"    "
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_inventory:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated when you do an "
+"inventory"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Stockable"
+msgstr ""
+
+#. module: stock
+#: selection:product.product,valuation:0
+msgid "Real Time (automated)"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,tracking_id:0
+msgid "Logistical shipping unit: pallet, box, pack ..."
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+#: view:stock.change.standard.price:0
+msgid "_Apply"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+#: report:stock.picking.list:0
+msgid "]"
+msgstr ""
+
+#. module: stock
+#: field:product.template,property_stock_inventory:0
+msgid "Inventory Location"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+msgid "Total value"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid ""
+"This menu gives you the full traceability of inventory operations made on a "
+"specific product. You can filter on the product to see all the past or "
+"future movements made on the product."
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_journal_id:0
+msgid ""
+"Inventory Journal in which the chained move will be written, if the Chaining "
+"Type is not Transparent (no journal is used if left empty)"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
+msgid "Incoming Product"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Creation"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: field:stock.move.memory,cost:0
+#, python-format
+msgid "Cost"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_account_input_categ:0
+#: field:product.template,property_stock_account_input:0
+#: field:stock.change.standard.price,stock_account_input:0
+msgid "Stock Input Account"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
+#: model:ir.ui.menu,name:stock.menu_warehouse_config
+msgid "Warehouse Management"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "Partial Delivery"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic No Step Added"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Product "
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Stock Location Analysis"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,date:0
+msgid ""
+"Move date: scheduled date until move is done, then date of actual move "
+"processing"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: view:stock.inventory:0
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+msgid "Group By..."
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Chained Locations"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_inventory
+msgid "Inventory loss"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Document"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Input Picking List"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uom:0
+#: field:stock.move.memory,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Products: "
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_production:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"generated by a Manufacturing Order"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.track_line_old
+#: view:stock.move.track:0
+msgid "Tracking a move"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid ""
+"The Internal Moves lists all inventory operations you have to perform in "
+"your warehouse. All operations can be categorized into stock journals, so "
+"that each worker has it's own list of operations to perform in his own "
+"journal. Most operations are prepared automatically by OpenERP according to "
+"your pre-configured logistics rules but you can also record manual stock "
+"operations."
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Update"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_journal_form
+#: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
+msgid "Stock Journals"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+msgid "Others"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Could not find any difference between standard price and new price!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_scrapped
+#: field:stock.move,scrapped:0
+msgid "Scrapped"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Products "
+msgstr ""
+
+#. module: stock
+#: field:product.product,track_incoming:0
+msgid "Track Incoming Lots"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Warehouse board"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Qty"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_variation:0
+msgid "Stock Variation Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,note:0
+#: view:stock.picking:0
+#: field:stock.picking,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Value"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,type:0
+#: field:stock.location,chained_picking_type:0
+#: field:stock.picking,type:0
+msgid "Shipping Type"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "You can only delete draft moves."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.actions.act_window,name:stock.act_product_location_open
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu
+#: view:stock.inventory:0
+#: view:stock.picking:0
+#, python-format
+msgid "Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.standard.price:0
+msgid "Change Price"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,move_type:0
+msgid "Delivery Method"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_dest_id:0
+#: help:stock.move,location_dest_id:0
+#: help:stock.picking,location_dest_id:0
+msgid "Location where the system will stock the finished products."
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_variation:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no stock output account defined for this product or its category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Delay(Days)"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.memory,move_id:0
+msgid "Move"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,min_date:0
+msgid "Expected date for the picking to be processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "P&L Qty"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+#: field:stock.production.lot,revisions:0
+msgid "Revisions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "This operation will cancel the shipment. Do you want to continue?"
+msgstr ""
+
+#. module: stock
+#: help:product.product,valuation:0
+msgid ""
+"If real-time valuation is enabled for a product, the system will "
+"automatically write journal entries corresponding to stock moves.The "
+"inventory variation account set on the product category will represent the "
+"current inventory value, and the stock input and stock output account will "
+"hold the counterpart moves for incoming and outgoing products."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_inventory_report
+msgid ""
+"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."
+msgstr ""
+
+#. module: stock
+#: help:report.stock.move,location_id:0
+#: help:stock.move,location_id:0
+msgid ""
+"Sets a location if you produce at a fixed location. This can be a partner "
+"location if you subcontract the manufacturing operations."
+msgstr ""
+
+#. module: stock
+#: view:stock.invoice.onshipping:0
+msgid "Create"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Dates"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,priority:0
+msgid "Priority"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Source"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: model:ir.model,name:stock.model_stock_inventory
+#: selection:report.stock.inventory,location_type:0
+#: field:stock.inventory.line,inventory_id:0
+#: report:stock.inventory.move:0
+#: selection:stock.location,usage:0
+#, python-format
+msgid "Inventory"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: stock
+#: sql_constraint:stock.production.lot:0
+msgid ""
+"The combination of serial number and internal reference must be unique !"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Currency in which Unit Cost is expressed"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_ups
+msgid "Stock ups"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Cancel Inventory"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines.exist,name:0
+msgid "Tracking serial"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/report/report_stock.py:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_replacement_result
+msgid "Stock Replacement result"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid ""
+"This is the list of all the production lots (serial numbers) you recorded. "
+"After having selected a lot, you can get the up-stream or down-stream "
+"traceability of the products contained in lot."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "July"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.lines.date:0
+msgid "Consumable"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_line_date
+msgid ""
+"Display the last inventories done on your products and easily sort them with "
+"specific filtering criteria. If you do frequent and partial inventories, you "
+"need this report in order to ensure that the stock of each product is "
+"controlled at least once a year."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_product_history
+msgid "Stock Level Forecast"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_journal
+#: field:report.stock.move,stock_journal:0
+#: view:stock.journal:0
+#: field:stock.journal,name:0
+#: field:stock.picking,stock_journal_id:0
+msgid "Stock Journal"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_4
+msgid "Maxtor Suppliers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:0
+#: code:addons/stock/wizard/stock_change_standard_price.py:0
+#, python-format
+msgid "Active ID is not set in Context"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Force Availability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.move_scrap
+#: view:stock.move.scrap:0
+msgid "Scrap Move"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: model:ir.actions.act_window,name:stock.action_reception_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in
+#: view:stock.move:0
+#, python-format
+msgid "Receive Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#: model:ir.actions.act_window,name:stock.action_out_picking_move
+#: model:ir.ui.menu,name:stock.menu_action_pdct_out
+#, python-format
+msgid "Deliver Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "View Stock of Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Internal Picking list"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,month:0
+msgid "Month"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,date_done:0
+msgid "Date of Completion"
+msgstr ""
+
+#. module: stock
+#: help:stock.tracking,active:0
+msgid ""
+"By unchecking the active field, you may hide a pack without deleting it."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Yes"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,inventory_line_id:0
+msgid "Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Todo"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0
+#: field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0
+#: field:stock.move,company_id:0
+#: field:stock.picking,company_id:0
+#: field:stock.production.lot,company_id:0
+#: field:stock.production.lot.revision,company_id:0
+#: field:stock.warehouse,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Back Orders"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid ""
+"There is no stock input account defined for this product: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Can not consume a move with negative or zero quantity !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_real:0
+msgid "Real Stock"
+msgstr ""
+
+#. module: stock
+#: view:stock.fill.inventory:0
+msgid "Fill Inventory"
+msgstr ""
+
+#. module: stock
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"incoming stock moves will be posted in this account. This is the default "
+"value for all products in this category, it can also directly be set on each "
+"product."
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,date:0
+msgid "Revision Date"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0
+#: field:stock.move.split.lines,lot_id:0
+#: field:stock.move.split.lines.exist,lot_id:0
+#: report:stock.picking.list:0
+msgid "Lot"
+msgstr ""
+
+#. module: stock
+#: view:stock.move.split:0
+msgid "Production Lot Number"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos_qty:0
+msgid "Quantity (UOS)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"You are moving %.2f %s products but only %.2f %s available in this lot."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Set Available"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Contact Address :"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,backorder_id:0
+msgid "Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.incoterms,active:0
+#: field:stock.location,active:0
+#: field:stock.tracking,active:0
+msgid "Active"
+msgstr ""
+
+#. module: stock
+#: model:ir.module.module,shortdesc:stock.module_meta_information
+msgid "Inventory Management"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Error, no partner !"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_incoterms_tree
+#: model:ir.model,name:stock.model_stock_incoterms
+#: view:stock.incoterms:0
+msgid "Incoterms"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0
+msgid "Total:"
+msgstr ""
+
+#. module: stock
+#: help:stock.incoterms,name:0
+msgid ""
+"Incoterms are series of sales terms.They are used to divide transaction "
+"costs and responsibilities between buyer and seller and reflect state-of-the-"
+"art transportation practices."
+msgstr ""
+
+#. module: stock
+#: help:stock.fill.inventory,recursive:0
+msgid ""
+"If checked, products contained in child locations of selected location will "
+"be included as well."
+msgstr ""
+
+#. module: stock
+#: field:stock.move.track,tracking_prefix:0
+msgid "Tracking prefix"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,name:0
+msgid "Inventory Reference"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Internal picking"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid "Open Product"
+msgstr ""
+
+#. module: stock
+#: field:stock.location.product,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Process"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot.revision,name:0
+msgid "Revision Name"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: view:stock.warehouse:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock
+#: view:stock.location.product:0
+msgid ""
+"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
+"filter all resources of the day for the 'From' date and 23:59:59 for the "
+"'To' date)"
+msgstr ""
+
+#. module: stock
+#: view:product.category:0
+msgid "Accounting Stock Properties"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree_out
+msgid "Customers Packings"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: view:stock.move:0
+#: selection:stock.move,state:0
+#: view:stock.picking:0
+#: selection:stock.picking,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_change_standard_price
+#: model:ir.model,name:stock.model_stock_change_standard_price
+#: view:stock.change.standard.price:0
+msgid "Change Standard Price"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations_virtual
+msgid "Virtual Locations"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "To Be Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "To Do"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_warehouse_form
+#: model:ir.ui.menu,name:stock.menu_action_warehouse_form
+msgid "Warehouses"
+msgstr ""
+
+#. module: stock
+#: field:stock.journal,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_inventory_report
+#: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
+#: view:report.stock.inventory:0
+msgid "Inventory Analysis"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,journal_id:0
+msgid "Destination Journal"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
+#: model:stock.location,name:stock.stock_location_stock
+msgid "Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.model,name:stock.model_product_product
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,product_id:0
+#: field:stock.inventory.line,product_id:0
+#: field:stock.inventory.line.split,product_id:0
+#: report:stock.inventory.move:0
+#: view:stock.move:0
+#: field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0
+#: field:stock.move.memory,product_id:0
+#: field:stock.move.scrap,product_id:0
+#: field:stock.move.split,product_id:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,product_id:0
+#: field:stock.report.prodlots,product_id:0
+#: field:stock.report.tracklots,product_id:0
+#, python-format
+msgid "Product"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Invoicing"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Please provide Proper Quantity !"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,product_uos:0
+msgid "Product UOS"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posz:0
+msgid "Height (Z)"
+msgstr ""
+
+#. module: stock
+#: field:stock.ups,weight:0
+msgid "Lot weight"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_consume
+#: view:stock.move.consume:0
+msgid "Consume Products"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Insufficient Stock in Lot !"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,parent_right:0
+msgid "Right Parent"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,address_id:0
+msgid "Address"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0
+#: report:lot.stock.overview_all:0
+msgid "Variants"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,posx:0
+msgid "Corridor (X)"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_suppliers
+msgid "Suppliers"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,value:0
+#: field:report.stock.move,value:0
+msgid "Total Value"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.memory,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_location_product
+#: model:ir.model,name:stock.model_stock_location_product
+msgid "Products by Location"
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,recursive:0
+msgid "Include children"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_components
+msgid "Shelf 1"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.tracking,name:0
+msgid "Pack Reference"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_id:0
+#: field:stock.move,location_id:0
+msgid "Source Location"
+msgstr ""
+
+#. module: stock
+#: view:product.template:0
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Unit Of Measure"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Total"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_intermediatelocation0
+msgid "Internal Shippings"
+msgstr ""
+
+#. module: stock
+#: field:stock.change.standard.price,enable_stock_in_out_acc:0
+msgid "Enable Related Account"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,stock_virtual_value:0
+msgid "Virtual Stock Value"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+#: view:stock.inventory.line.split:0
+#: view:stock.move.split:0
+msgid "Lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "New pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Destination"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "All at once"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"Quantities, UoMs, Products and Locations cannot be modified on stock moves "
+"that have already been processed (except by the Administrator)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Productions"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Return lines"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_report_stock_lines_date
+#: view:report.stock.lines.date:0
+msgid "Dates of Inventories"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total incoming quantity"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.move,product_qty_out:0
+msgid "Out Qty"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,move_ids:0
+msgid "Moves for this production lot"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#, python-format
+msgid "Message !"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Put in current pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Lot Inventory"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Reason"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Delivery Order:"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0
+#: view:stock.move.consume:0
+#: view:stock.move.scrap:0
+#: view:stock.move.split:0
+#: view:stock.move.track:0
+#: view:stock.split.into:0
+msgid "Ok"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_8
+msgid "Non European Customers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid ""
+"There is no inventory variation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.merge:0
+msgid "Do you want to merge theses inventories ?"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,move_type:0
+msgid "It specifies goods to be delivered all at once or by direct delivery"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "This picking list does not require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,type:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Getting Goods"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_location_type:0
+msgid ""
+"Determines whether this location is chained to another location, i.e. any "
+"incoming product in this location \n"
+"should next go to the chained location. The chained location is determined "
+"according to the type :\n"
+"* None: No chaining at all\n"
+"* Customer: The chained location will be taken from the Customer Location "
+"field on the Partner form of the Partner that is specified in the Picking "
+"list of the incoming products.\n"
+"* Fixed Location: The chained location is taken from the next field: Chained "
+"Location if Fixed."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid ""
+"This is the structure of your company's warehouses and locations. You can "
+"click on a location in order to get the list of the products and their stock "
+"level in this particular location and all its children."
+msgstr ""
+
+#. module: stock
+#: help:res.partner,property_stock_customer:0
+msgid ""
+"This stock location will be used, instead of the default one, as the "
+"destination location for goods you send to this partner"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.move,state:0
+#: view:stock.picking:0
+#: selection:stock.picking,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirm"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
+#: view:stock.inventory.merge:0
+msgid "Merge inventories"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.product.qty,new_quantity:0
+msgid "This quantity is expressed in the Default UoM of the product."
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Reception:"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,scrap_location:0
+msgid ""
+"Check this box to allow using this location to put scrapped/damaged goods."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_relate_picking
+msgid "Related Picking"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Total outgoing quantity"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: help:stock.move.memory,cost:0
+#, python-format
+msgid "Unit Cost for this product line"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_category
+#: view:report.stock.inventory:0
+#: field:report.stock.inventory,product_categ_id:0
+#: view:report.stock.move:0
+#: field:report.stock.move,categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:0
+#, python-format
+msgid "INV: "
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.next_id_61
+msgid "Reporting"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid " for the "
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Quantity to leave in the current pack"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
+#: view:stock.invoice.onshipping:0
+msgid "Create invoice"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+msgid ""
+"This is the list of all your packs. After having selected a Pack, you can "
+"get the up-stream or down-stream traceability of the products contained in "
+"the pack."
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split,use_exist:0
+#: field:stock.move.split,use_exist:0
+msgid "Existing Lots"
+msgstr ""
+
+#. module: stock
+#: field:product.product,location_id:0
+#: view:stock.location:0
+msgid "Stock Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.change.standard.price,new_price:0
+msgid ""
+"If cost price is increased, stock variation account will be debited and "
+"stock output account will be credited with the value = (difference of amount "
+"* quantity available).\n"
+"If cost price is decreased, stock variation account will be creadited and "
+"stock input account will be debited."
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_journal_id:0
+msgid "Chaining Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "Not enough stock, unable to reserve the products."
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_customers
+msgid "Customers"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is cancelled."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_reception_picking_move
+msgid ""
+"You will find here the list of all products you are waiting for, according "
+"to your preceding purchase orders. Once you receive an order, you can filter "
+"based on the name of the supplier or the purchase order reference. Then you "
+"can confirm all products received using the buttons on the right of each "
+"line."
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line:0
+msgid "Stock Inventory Lines"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#, python-format
+msgid "Process Document"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Deliveries"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Additional info"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree4
+msgid ""
+"The Incoming Shipments is the list of all orders you will receive from your "
+"supplier. An incoming shipment contains a list of products to be received "
+"according to the original purchase order. You can validate the shipment "
+"totally or partially."
+msgstr ""
+
+#. module: stock
+#: field:stock.move,auto_validate:0
+msgid "Auto Validate"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Weight"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "December"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr ""
+
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Return Products"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory:0
+msgid "Validate Inventory"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,price_currency_id:0
+msgid ""
+"Technical field used to record the currency chosen by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_products_moves
+msgid "Products Moves"
+msgstr ""
+
+#. module: stock
+#: selection:stock.picking,invoice_state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,address_id:0
+msgid "Destination Address"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,max_date:0
+msgid "Max. Expected Date"
+msgstr ""
+
+#. module: stock
+#: field:stock.picking,auto_picking:0
+msgid "Auto-Picking"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_shop1
+msgid "Shop 2"
+msgstr ""
+
+#. module: stock
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:report.stock.move:0
+#: selection:report.stock.move,type:0
+#: view:stock.location:0
+#: selection:stock.location,chained_picking_type:0
+#: selection:stock.picking,type:0
+msgid "Internal"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.move,state:0
+#: selection:stock.picking,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
+#: report:stock.inventory.move:0
+msgid "Stock Inventory"
+msgstr ""
+
+#. module: stock
+#: help:report.stock.inventory,state:0
+msgid ""
+"When the stock move is created it is in the 'Draft' state.\n"
+" After that it is set to 'Confirmed' state.\n"
+" If stock is available state is set to 'Avaiable'.\n"
+" When the picking it done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+msgid "Outgoing Products Delay"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,use_exist:0
+msgid "Existing Lot"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Please specify at least one non-zero quantity!"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_procurement:0
+msgid ""
+"For the current product, this stock location will be used, instead of the "
+"default one, as the source location for stock moves generated by procurements"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is ready to process."
+msgstr ""
+
+#. module: stock
+#: help:stock.picking,origin:0
+msgid "Reference of the document that produced this picking."
+msgstr ""
+
+#. module: stock
+#: field:stock.fill.inventory,set_stock_zero:0
+msgid "Set to zero"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "None of these picking lists require invoicing."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "November"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Unplanned Qty"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "is scheduled"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,chained_company_id:0
+msgid "Chained Company"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "January"
+msgstr ""
+
+#. module: stock
+#: help:product.product,track_incoming:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"coming from a Supplier Location"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
+msgid "Future Stock Moves"
+msgstr ""
+
+#. module: stock
+#: field:stock.move,move_history_ids2:0
+msgid "Move History (parent moves)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Future Stock"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: stock
+#: field:stock.ups.final,xmlfile:0
+msgid "XML File"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0
+msgid "Select Quantity"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.inventory.line,prod_lot_id:0
+#: report:stock.inventory.move:0
+#: field:stock.move,prodlot_id:0
+#: field:stock.move.memory,prodlot_id:0
+#: field:stock.move.split.lines.exist,prodlot_id:0
+#: view:stock.production.lot:0
+#: field:stock.production.lot,name:0
+#, python-format
+msgid "Production Lot"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_traceability
+#: view:stock.move:0
+#: view:stock.picking:0
+#: view:stock.production.lot:0
+#: view:stock.tracking:0
+msgid "Traceability"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "To invoice"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_location_form
+#: model:ir.ui.menu,name:stock.menu_action_location_form
+#: view:stock.picking:0
+msgid "Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "General Information"
+msgstr ""
+
+#. module: stock
+#: field:stock.production.lot,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_splitinto.py:0
+#, python-format
+msgid ""
+"Total quantity after split exceeds the quantity to split for this product: "
+"\"%s\" (id: %d)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+#: field:stock.partial.move,product_moves:0
+msgid "Moves"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,location_dest_id:0
+#: field:stock.picking,location_dest_id:0
+msgid "Dest. Location"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,product_packaging:0
+msgid ""
+"It specifies attributes of packaging like type, quantity of packaging,etc."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#, python-format
+msgid "quantity."
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_memory
+msgid "stock.move.memory"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Expected"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,location_type:0
+#: model:stock.location,name:stock.location_production
+#: selection:stock.location,usage:0
+msgid "Production"
+msgstr ""
+
+#. module: stock
+#: view:stock.split.into:0
+msgid "Split Move"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid ""
+"There are no products to return (only lines in Done state and not fully "
+"returned yet can be returned)!"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split
+msgid "Split in Production lots"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+msgid "Real"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+#: view:stock.production.lot.revision:0
+#: field:stock.production.lot.revision,description:0
+msgid "Description"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "May"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_move.py:0
+#, python-format
+msgid "Deliver"
+msgstr ""
+
+#. module: stock
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart Journal Items for all "
+"outgoing stock moves will be posted in this account. If not set on the "
+"product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:stock.tracking:0
+msgid "Upstream traceability"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report.xml,name:stock.report_location_overview_all
+#: report:lot.stock.overview_all:0
+msgid "Location Content"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:0
+#, python-format
+msgid "Produced Qty"
+msgstr ""
+
+#. module: stock
+#: field:product.category,property_stock_account_output_categ:0
+#: field:product.template,property_stock_account_output:0
+#: field:stock.change.standard.price,stock_account_output:0
+msgid "Stock Output Account"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Picking"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_report_prodlots
+msgid "Stock report by production lots"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+#: selection:stock.location,chained_location_type:0
+#: view:stock.move:0
+msgid "Customer"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "February"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0
+msgid "Production Lot Identification"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0
+#: view:stock.move.scrap:0
+msgid "Scrap Location"
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.move,month:0
+msgid "April"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0
+#: view:stock.move:0
+msgid "Future"
+msgstr ""
+
+#. module: stock
+#: field:stock.invoice.onshipping,invoice_date:0
+msgid "Invoiced date"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Outgoing Deliveries"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_output
+msgid "Output"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move.split.lines,action:0
+msgid "Keep in one lot"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price:"
+msgstr ""
+
+#. module: stock
+#: help:stock.move,move_dest_id:0
+msgid "Optional: next stock move when chaining them"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+#: field:report.stock.move,year:0
+msgid "Year"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_locations
+msgid "Physical Locations"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move"
+msgstr ""
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 4d4de633411..a1c8aebee30 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-12-27 17:10+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 09:02+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-28 04:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -155,7 +155,7 @@ msgstr "Inwentaryzacje"
 #: view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
-msgstr "Dziennik zapasów"
+msgstr "Dziennik magazynowy"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -179,7 +179,7 @@ msgstr ""
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr ""
+msgstr "Brak danych częściowego pobrania dla przesunięcia #%s"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_move
@@ -200,14 +200,14 @@ msgid ""
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
 msgstr ""
-"Bieżące przesunięcie jest już przypisane do pobrania. Jeśli chcesz zmienić "
+"Bieżące przesunięcie jest już przypisane do ppaczki. Jeśli chcesz zmienić "
 "przypisanie '             #                        ', to najpierw je usuń "
 "dla produktu \"%s\" (id: %d)"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "Nie dotyczy"
 
 #. module: stock
 #: help:stock.tracking,serial:0
@@ -229,7 +229,7 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr "Identyfikacja opakowania"
+msgstr "Identyfikacja paczki"
 
 #. module: stock
 #: view:stock.move:0
@@ -271,7 +271,7 @@ msgstr ""
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych kategorii."
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -302,7 +302,7 @@ msgstr "Podziel pozycje"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
-msgstr "Nie możesz anulowac pobrania, bo pozycje mają stan wykonano !"
+msgstr "Nie możesz anulować pobrania, bo pozycje mają stan wykonano !"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -371,7 +371,7 @@ msgstr "Kod dla Incoterms"
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr "Przesunięcia dla tego pobrania"
+msgstr "Przesunięcia dla tej paczki"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -413,7 +413,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr ""
+msgstr "Śledzenie akcji "
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -488,6 +488,10 @@ msgid ""
 "incoming stock moves will be posted in this account. If not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"Kiedy jest prowadzona bieżąca wycena zapasów, to na tym koncie będą "
+"księgowane wszystkie przeciwstawne pozycje zapisów dla przesunięć "
+"wchodzących. Jeśli nie ustawiono konta w produkcie, to będzie stosowane "
+"konto z kategorii produktu."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
@@ -558,7 +562,7 @@ msgstr "Nie możesz przetwarzać pobrania bez przesunięć"
 #. module: stock
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "Pakowanie"
+msgstr "Opakowanie"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -646,12 +650,12 @@ msgstr "Sierpień"
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 #: view:stock.tracking:0
 msgid "Packs"
-msgstr "Pobrania"
+msgstr "Paczki"
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Próbujesz powiązać z numerem partii z innego produktu"
 
 #. module: stock
 #: view:res.partner:0
@@ -670,6 +674,9 @@ msgid ""
 "customers. You can process the deliveries directly from this list, line by "
 "or line or through the Delivery Orders menu."
 msgstr ""
+"Menu 'Wydania zewnętrzne' zawiera wszystkie produkty, które trzeba "
+"dostarczyć klientom. Możesz przetwarzać wydania z listy lub przez menu "
+"Wydania zewnętrzne."
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
@@ -713,8 +720,8 @@ msgid ""
 "When doing real-time inventory valuation, this is the Accounting Journal in "
 "which entries will be automatically posted when stock moves are processed."
 msgstr ""
-"To jest dziennik do księgowania zapisów z przesunięć magazynowych "
-"inwentaryzacji."
+"Jeśli jest prowadzona bieżąca wycena zapasów, to to jest dziennik do "
+"księgowania zapisów z przesunięć magazynowych."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
@@ -734,6 +741,8 @@ msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
 msgstr ""
+"Zaznacz tę opcję, aby wybierać partie z listy poniżej. W przeciwnym "
+"przypadku powinieneś wprowadzić nowe partie pozycja po pozycji."
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -804,7 +813,7 @@ msgstr "Strefa tranzytowa do przesunięć między firmowych"
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr ""
+msgstr "Zmień ilość produktu"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -866,7 +875,7 @@ msgstr "Zaplanowana data"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr "Wyszukiwanie pobrań"
+msgstr "Wyszukiwanie paczek"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -956,19 +965,19 @@ msgstr "Inofrmacje o dostawach"
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
 #, python-format
 msgid "Stock Inventory is done"
-msgstr ""
+msgstr "Inwentaryzacja została wykonana"
 
 #. module: stock
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Błąd: Niedozwolony kod EAN"
 
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
-msgstr ""
+msgstr "Brak konta dla wydań tego produktu: \"%s\" (id: %d)"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -1116,7 +1125,7 @@ msgstr "Podziel pozycje inwentaryzacji"
 #. module: stock
 #: view:stock.inventory:0
 msgid "Physical Inventory"
-msgstr ""
+msgstr "Zapas fizyczny"
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1124,6 +1133,8 @@ msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
 msgstr ""
+"Firma, do której będzie należało powiązane pobranie (pozostaw puste, aby "
+"stosować domyślny wybór firmy)."
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1132,6 +1143,8 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
+"Typ pobrania dla powiązanego przesunięcia (pozostaw puste, aby system sam "
+"wybrał typ na podstawie strefy źródłowej i docelowej)."
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1177,7 +1190,7 @@ msgstr "Opóźnienie pomiędzy przesunięciem oryginalnym a powiązanym"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr "Importuj bieżące stany produktów z następujących stref"
+msgstr "Importuj bieżące stany produktów z następującej strefy"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1188,6 +1201,12 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"To jest stosowane tylko wtedy, jeśli wybierzesz strefę powiązaną.\n"
+"'Automatyczne przesunięcie' utworzy przesunięcie kolejne po bieżącym i "
+"automatycznie je zatwierdzi. 'Ręczna operacja' oznacza, że powiązane "
+"pobranie będzie musiało być zatwierdzone przez pracownika. 'Automatycznie i "
+"bezpośrednio' oznacza, że powiązana strefa wymieni docelową strefę w "
+"pierwotnym przesunięciu."
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -1214,6 +1233,8 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
+"Dla bieżącego produktu ta strefa będzie stosowana (zamiast domyślnej) jako "
+"strefa źródłowa dla przesunięć generowanych przez zamówienia produkcji."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1222,6 +1243,8 @@ msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Variant account on category of this product are same."
 msgstr ""
+"Nie można utworzyć zapisu. Konto wydań i wyceny dla tego produktu są takie "
+"same."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1354,7 +1377,7 @@ msgstr "Dostawcy IT"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr ""
+msgstr "Pobranie:"
 
 #. module: stock
 #: field:stock.inventory,date:0
@@ -1408,7 +1431,7 @@ msgstr "Opis inwentaryzacji"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_replacement
 msgid "Stock Replacement"
-msgstr ""
+msgstr "Zamiana zapasów"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1429,7 +1452,7 @@ msgstr "Śledzenie wstecz"
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
 msgid "No Invoices were created"
-msgstr ""
+msgstr "Nie utworzono faktur"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
@@ -1506,7 +1529,7 @@ msgstr "Nie można dostarczyć produktów juz dostarczonych"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr ""
+msgstr "Fakturowanie przy wydaniach"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1538,6 +1561,8 @@ msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
 msgstr ""
+"Jeśli pobranie zostało podzielone, to to pole wskazuje pobranie zawierające "
+"drugą część, która już została wykonana."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1574,7 +1599,7 @@ msgstr ""
 #: view:stock.production.lot:0
 #: view:stock.tracking:0
 msgid "Stock Moves"
-msgstr "Przesunięcia zapasów"
+msgstr "Przesunięcia"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -1591,7 +1616,7 @@ msgstr "Anuluj dostępność"
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr ""
+msgstr "Zaplanowana data na wykonanie tego przesunięcia"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
@@ -1601,7 +1626,7 @@ msgstr "Utworzone przesunięcia"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr ""
+msgstr "Półka 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
@@ -1613,7 +1638,7 @@ msgstr "Śledzenie partii magazynowej"
 #: help:stock.location,posy:0
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
-msgstr ""
+msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji."
 
 #. module: stock
 #: view:product.product:0
@@ -1792,6 +1817,8 @@ msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Variant account on category of this product are same."
 msgstr ""
+"Nie można utworzyć zapisu. Konto przyjęć i wyceny w kategorii tego produktu "
+"są takie same."
 
 #. module: stock
 #: view:stock.change.standard.price:0
@@ -1835,6 +1862,8 @@ msgid ""
 "Technical field used to record the product cost set by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
+"Pole techniczne do zapisywania kosztu produktu przy potwierdzaniu pobrania. "
+"(stosowane przy wycenie wg cen przeciętnych i ewentualnie FIFO)."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -1843,11 +1872,13 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
+"Analiza przesunięć pozwala przeglądać ruch magazynowy. Stosuj ją do "
+"obserwacji procesów magazynowych, którym podlegają produkty."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr ""
+msgstr "Planowany czas dostawy (dni)"
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
@@ -1941,6 +1972,27 @@ msgid ""
 "day)\n"
 "    "
 msgstr ""
+"Moduł Magazyn w OpenERP może obsługiwać wiele magazynów i wiele "
+"hierarchicznych stref magazynowych.\n"
+"Dzięki podwójnemu zapisowi operacji magazynowych, zrządzanie stanami jest "
+"pewne i elastyczne:\n"
+"* Historia przesunięć i planowanie;\n"
+"* Różne metody operacji (FIFO, LIFO, ...)\n"
+"* Wycena zapasów (wg cen ewidencyjnych lub przeciętnych)\n"
+"* Zmiana stanów przez Inentaryzację;\n"
+"* Automatyczne reguły zamawiania (stan minimalny, JIT);\n"
+"* Obsługa kodów paskowych\n"
+"* Łatwe znajdowanie błędów dzięki podwójnym zapisom.\n"
+"* Śledzenie (wprzód/wstecz, partie produkcyjne, numery seryjne, partie "
+"magazynowe)\n"
+"* Konsola dla magazynierów zawierająca:\n"
+"    * Opóźnienia w przyjęciach (data <= dziś)\n"
+"    * Problemy w obsłudze zapotrzebowań\n"
+"    * Wykres: Liczba otrzymanych produktów na tle planów (wykres słupkowy "
+"dziennie w tym tygodniu)\n"
+"    * Wykres: Liczba wydanych produktów na tle planów (wykres słupkowy "
+"dziennie w tym tygodniu)\n"
+"    "
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -1949,6 +2001,8 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
+"Dla tego produktu, ta strefa będzie stosowana (zamiast domyślnej) jako "
+"strefa źródłowa przesunięć generowanych w trakcie inwentaryzacji."
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -1958,7 +2012,7 @@ msgstr "Rejestrowany"
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr ""
+msgstr "Na bieżąco (automatycznie)"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
@@ -1997,6 +2051,9 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements made on the product."
 msgstr ""
+"To menu pomaga ci obserwować operacje magazynowe wykonywane na konkretnym "
+"produkcie. Możesz filtrować wg produktu, aby zobaczyć wykonane lub przyszłe "
+"przesunięcia."
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -2004,6 +2061,9 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
+"Dziennik magazynowy, w którym powiązane przesunięcie zostanie zapisane, "
+"jeśli typ powiązania nie jest bezpośredni (żaden dziennik nie jest "
+"stosowany, jeśli pole jest puste)."
 
 #. module: stock
 #: view:board.board:0
@@ -2039,7 +2099,7 @@ msgstr "Magazyn"
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr ""
+msgstr "Dostawa częściowa"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -2063,11 +2123,13 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
+"Data przesunięcia: planowana data dopóki przesunięcie nie jest wykonane, a "
+"po wykonaniu rzeczywista data przesunięcia."
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
 msgid "Latest Inventory Date"
-msgstr "data ostatniej inwentaryzacji"
+msgstr "Data ostatniej inwentaryzacji"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2118,6 +2180,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
+"Wymusza wprowadzenie numeru partii produkcyjnej do wszystkich przesunięć "
+"zawierających ten produkt i generowanych przez zamówienie produkcji."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line_old
@@ -2135,6 +2199,11 @@ msgid ""
 "your pre-configured logistics rules but you can also record manual stock "
 "operations."
 msgstr ""
+"Przesunięcia wewnętrzne są listą operacji magazynowych do wykonania wewnątrz "
+"magazynu. Operacje mogą być grupowane w dzienniki magazynowe, aby każdy "
+"magazynier miał własną listę operacji do wykonania. Większość operacji jest "
+"generowana automatycznie według skonfigurowanych reguł, ale można też "
+"dodawać operacje ręcznie."
 
 #. module: stock
 #: view:product.product:0
@@ -2150,7 +2219,7 @@ msgstr "Ustaw na projekt"
 #: model:ir.actions.act_window,name:stock.action_stock_journal_form
 #: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
 msgid "Stock Journals"
-msgstr "Dzienniki zapasów"
+msgstr "Dzienniki mogazynowe"
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -2259,6 +2328,8 @@ msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
 msgstr ""
+"Jeśli w produkcie jest stosowana bieżąca wycena zapasów, to to konto będzie "
+"stosowane do księgowania bieżącej wartości danego produktu w magazynie."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2277,7 +2348,7 @@ msgstr "Przesunięcie zapasów"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Opóźnienie (dni)"
 
 #. module: stock
 #: field:stock.move.memory,move_id:0
@@ -2304,7 +2375,7 @@ msgstr "Wersje"
 #. module: stock
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
-msgstr ""
+msgstr "Ta operacja anuluje pobranie. Chcesz kontynuować?"
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2328,6 +2399,8 @@ msgid ""
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
 msgstr ""
+"Analiza zapasów pozwala przeglądać i analizować poziom zapasu w firmie. W "
+"analizie możesz stosować filtrowanie, sortowanie i grupowanie."
 
 #. module: stock
 #: help:report.stock.move,location_id:0
@@ -2336,6 +2409,8 @@ msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
 msgstr ""
+"Ustawia strefę, jeśli produkujesz w ustalonej strefie. To może być strefa "
+"partnera, jeśli wykonujesz operacje u podwykonawcy."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -2379,6 +2454,7 @@ msgstr "Pobranie"
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
+"Kombinacja numeru seryjnego i odnośnika wewnętrznego musi być unikalna !"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
@@ -2426,6 +2502,8 @@ msgid ""
 "After having selected a lot, you can get the up-stream or down-stream "
 "traceability of the products contained in lot."
 msgstr ""
+"To jest lista partii produkcyjnych, które utworzyłeś. Po wybraniu partii "
+"możesz prześledzić przesunięcia wprzód i wstecz dla danej partii."
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -2458,7 +2536,7 @@ msgstr "Prognoza stanu zapasów"
 #: field:stock.journal,name:0
 #: field:stock.picking,stock_journal_id:0
 msgid "Stock Journal"
-msgstr "Dziennik zapasów"
+msgstr "Dziennik magazynowy"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -2532,8 +2610,7 @@ 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."
+"Odznaczając pole aktywności możesz ukryć paczkę bez konieczności usuwania go."
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -2548,7 +2625,7 @@ msgstr "Inwentaryzacje"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Todo"
-msgstr ""
+msgstr "Do wykonania"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2582,7 +2659,7 @@ msgstr "Nie zdefiniowano konta przyjęć dla produktu: '%s' (id: %d)"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
-msgstr ""
+msgstr "Nie można wykonanć przesunięcia z ilością negatywną lub zero !"
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -2598,7 +2675,7 @@ msgstr "Wypełnij inwentaryzację"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Błąd: domyślna JM i zakupowa JM muszą być tej samej kategorii."
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -2608,6 +2685,10 @@ msgid ""
 "value for all products in this category, it can also directly be set on each "
 "product."
 msgstr ""
+"Jeśli jest dokonywana bieżąca wycena zapasów, to na tym koncie będą "
+"księgowane przeciwstawne pozycje zapisów dla zapasów wchodzących. To jest "
+"domyślna wartość dla produktów tej kategorii, ale w produkcie można ustawić "
+"inne konto."
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -2640,6 +2721,7 @@ msgstr "Ilość (JS)"
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
+"Przesuwasz %.2f %s produktu, ale tylko %.2f %s jest dostępne w tej partii."
 
 #. module: stock
 #: view:stock.move:0
@@ -2666,7 +2748,7 @@ msgstr "Aktywne"
 #. module: stock
 #: model:ir.module.module,shortdesc:stock.module_meta_information
 msgid "Inventory Management"
-msgstr "Inwentaryzacja"
+msgstr "Zarządzanie magazynem"
 
 #. module: stock
 #: view:product.template:0
@@ -2707,6 +2789,8 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
+"Jeśli zaznaczysz, to produkty w strefach podrzędnych będą również brane pod "
+"uwagę."
 
 #. module: stock
 #: field:stock.move.track,tracking_prefix:0
@@ -2727,7 +2811,7 @@ msgstr "Pobranie wewnętrzne (MM)"
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr ""
+msgstr "Otwórz produkt"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -2759,6 +2843,8 @@ msgid ""
 "filter all resources of the day for the 'From' date and 23:59:59 for the "
 "'To' date)"
 msgstr ""
+"(Pozostaw puste, aby zobaczyć bieżącą sytuację. Wpisy z dzisiaj możesz "
+"zobaczyć ustawiając HH:MM:SS to 00:00:00 w polu 'Od' i 23:59:59 w polu 'Do')"
 
 #. module: stock
 #: view:product.category:0
@@ -2837,7 +2923,7 @@ msgstr "Odpowiedzialny"
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr "Analiza inwentaryzacji"
+msgstr "Analiza zapasów"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
@@ -2913,7 +2999,7 @@ msgstr "Zużycie produktów"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr ""
+msgstr "Zbyt mały zapas partii !"
 
 #. module: stock
 #: field:stock.location,parent_right:0
@@ -2976,7 +3062,7 @@ msgstr "Kolejność"
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr "Odnośnik pobrania"
+msgstr "Odnośnik paczki"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3009,7 +3095,7 @@ msgstr "Przesunięcia wewnętrzne (MM)"
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
-msgstr ""
+msgstr "Włącz odnośne konto"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -3027,7 +3113,7 @@ msgstr "Partie"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "New pack"
-msgstr "Nowe pobranie"
+msgstr "Nowa paczka"
 
 #. module: stock
 #: view:stock.move:0
@@ -3046,6 +3132,8 @@ msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
 msgstr ""
+"Ilości, JM, Produkty i Strefy nie mogą być modyfikowane w przesunięciach już "
+"wykonanych (wyjątkowo może to wykonać Administrator)."
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -3083,7 +3171,7 @@ msgstr "Ilość wydawana"
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
-msgstr ""
+msgstr "Przesunięcia dla tej partii produkcyjnej"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
@@ -3095,12 +3183,12 @@ msgstr "Wiadomość !"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in current pack"
-msgstr "Wstaw do bieżącego pobrania"
+msgstr "Wstaw do bieżącej paczki"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr "Inwentaryzacja partii"
+msgstr "Ewidencja partii"
 
 #. module: stock
 #: view:stock.move:0
@@ -3110,7 +3198,7 @@ msgstr "Przyczyna"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Delivery Order:"
-msgstr ""
+msgstr "Wydanie zewnętrzne"
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3184,7 +3272,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr ""
+msgstr "To wydanie nie wymaga fakturowania."
 
 #. module: stock
 #: selection:report.stock.move,type:0
@@ -3249,7 +3337,7 @@ msgstr "Potwierdź"
 #. module: stock
 #: help:stock.location,icon:0
 msgid "Icon show in  hierarchical tree view"
-msgstr ""
+msgstr "Ikona pokazywana w widokach hierarchicznych"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
@@ -3260,12 +3348,12 @@ msgstr "Połącz inwentaryzacje"
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr ""
+msgstr "Ta ilość jest wyrażona w domyślnej jednostce miary produktu."
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr ""
+msgstr "Przyjęcie:"
 
 #. module: stock
 #: help:stock.location,scrap_location:0
@@ -3283,19 +3371,19 @@ msgstr "Związane Pobranie"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr ""
+msgstr "Suma ilości wychodzących"
 
 #. module: stock
 #: field:stock.picking,backorder_id:0
 msgid "Back Order of"
-msgstr ""
+msgstr "Pobranie częściowe"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #: help:stock.move.memory,cost:0
 #, python-format
 msgid "Unit Cost for this product line"
-msgstr ""
+msgstr "Cena jednostkowa tej pozycji produktu"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
@@ -3310,7 +3398,7 @@ msgstr "Kategoria Produktu"
 #: code:addons/stock/wizard/stock_change_product_qty.py:0
 #, python-format
 msgid "INV: "
-msgstr ""
+msgstr "FAK: "
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -3321,12 +3409,12 @@ msgstr "Raportowanie"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid " for the "
-msgstr ""
+msgstr " dla "
 
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to leave in the current pack"
-msgstr "Ilość do zostawienia w bieżącym pobraniu"
+msgstr "Ilość do zostawienia w bieżącej paczce"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3341,8 +3429,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."
+"To jest lista paczek. Wybierając paczkę możesz sprawdzić przepływ produktów "
+"z paczki wstecz i wprzód."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3353,7 +3441,7 @@ msgstr "Konfiguracja"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr ""
+msgstr "Isniejące partie"
 
 #. module: stock
 #: field:product.product,location_id:0
@@ -3379,13 +3467,13 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr ""
+msgstr "Dziennik powiązania"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr ""
+msgstr "Zbyt mały zapas. Nie mozna rezerwować produktów."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@@ -3440,7 +3528,7 @@ msgstr "Paczka"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Date Expected"
-msgstr ""
+msgstr "Spodziewana data"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree4
@@ -3484,12 +3572,12 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Return Products"
-msgstr ""
+msgstr "Zwrot produktów"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr ""
+msgstr "Zatwierdź inwentaryzację"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3497,11 +3585,13 @@ msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
+"Pole techniczne stosowane do zapisywania waluty przy potwierdzaniu przyjęcia "
+"(stosowane przy wycenie wg cen przeciętnych)"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
-msgstr ""
+msgstr "Przesunięcia produktów"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -3516,17 +3606,17 @@ msgstr "Adres docelowy"
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
-msgstr ""
+msgstr "Ostateczna spodziewana data"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr ""
+msgstr "Autopobranie"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr ""
+msgstr "Sklep 2"
 
 #. module: stock
 #: constraint:res.partner:0
@@ -3568,22 +3658,29 @@ msgid ""
 " When the picking it done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Kiedy przesunięcie jest tworzone to jest w stanie 'Projekt'.\n"
+" Po potwierdzeniu przechodzi w stan 'Potwierdzone'.\n"
+" Jeśli dana ilość jest dostępna, to stan zmienia się na 'Dostępne'.\n"
+" jeśli pobranie zostanie wykonane to stan zmienia się na 'Wykonano'.         "
+"     \n"
+"Stan 'Oczekiwanie' pojawia się, jeśli przesunięcie czeka na inne "
+"przesunięcie."
 
 #. module: stock
 #: view:board.board:0
 msgid "Outgoing Products Delay"
-msgstr ""
+msgstr "Opóźnienie w wydawaniu produktów"
 
 #. module: stock
 #: field:stock.move.split.lines,use_exist:0
 msgid "Existing Lot"
-msgstr ""
+msgstr "Istniejąca partia"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr ""
+msgstr "Podaj wartoś większą od zera !"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3591,6 +3688,8 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated by procurements"
 msgstr ""
+"Dla tego produktu jest to strefa stosowana (zamiast domyślnej) jako strefa "
+"źródłowa dla przesunięć generowanych przez zapotrzebowanie."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -3601,7 +3700,7 @@ msgstr "jest gotowy do przetwarzania."
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr ""
+msgstr "Odnośnik do dokumentu tworzącego to pobranie."
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -3612,7 +3711,7 @@ msgstr "Ustaw na zero"
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr ""
+msgstr "Zadne z pobrań nie wymaga fakturowania."
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -3659,16 +3758,18 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Wymusza wprowadzanie partii produkcyjnej dla wszystkich przesunięć "
+"zawierających ten produkt ze stref Dostawców."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr "Przyszłe przesunięcia zapasów"
+msgstr "Przyszłe przesunięcia"
 
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr ""
+msgstr "Histora przesunięć (przesunięcia nadrzędne)"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -3686,12 +3787,12 @@ msgstr "Błąd"
 #. module: stock
 #: field:stock.ups.final,xmlfile:0
 msgid "XML File"
-msgstr ""
+msgstr "Plik XML"
 
 #. module: stock
 #: view:stock.change.product.qty:0
 msgid "Select Quantity"
-msgstr ""
+msgstr "Wybierz ilość"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
@@ -3745,6 +3846,8 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Suma ilości po podziale przekracza ilość przed podziałem dla produktu: "
+"\"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.move:0
@@ -3763,7 +3866,7 @@ msgstr "Strefa docelowa"
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
-msgstr "To określa atrybuty pakowania jak typ, ilość w paczce itp."
+msgstr "To określa atrybuty pakowania jak typ, ilość w opakowaniu itp."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -3841,6 +3944,9 @@ msgid ""
 "outgoing stock moves will be posted in this account. If not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"Kiedy jest stosowana bieżąca wycena zapasów, to jest konto dla "
+"przeciwstawnych pozycji zapisów przy wydaniach zewnętrznych. Jeśli pole jest "
+"puste, to będzie stosowane konto z kategorii produktu."
 
 #. module: stock
 #: view:stock.tracking:0
@@ -3948,7 +4054,7 @@ msgstr "Cena koszt:"
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr ""
+msgstr "Nieobowiązkowe: następne przesunięcie, jeśłi ma być powiązane"
 
 #. module: stock
 #: view:report.stock.move:0
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 7728351959e..f5fe210fad9 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/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:45+0000\n"
-"PO-Revision-Date: 2010-12-14 22:39+0000\n"
+"PO-Revision-Date: 2011-01-01 11:44+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:00+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -442,7 +442,7 @@ msgstr "Исходящая продукция"
 #: model:ir.actions.act_window,help:stock.action_warehouse_form
 msgid ""
 "Create and manage your warehouses and assign them a location from here"
-msgstr ""
+msgstr "Создайте и управляйте вашими складами, определите им места хранения"
 
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
@@ -799,7 +799,7 @@ msgstr "Место транзита для перемещений между к
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr ""
+msgstr "Изменение количества ТМЦ"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -1324,7 +1324,7 @@ msgstr "Общие поставщики ИТ"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr ""
+msgstr "Комплектовочный лист:"
 
 #. module: stock
 #: field:stock.inventory,date:0
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 32bb0611101..b01326fdaa7 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:33+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Stock ups upload"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:76
 #, python-format
 msgid "Variation Account is not specified for Product Category: %s"
 msgstr ""
@@ -70,15 +70,11 @@ msgid "Revision Number"
 msgstr ""
 
 #. module: stock
-#: view:stock.move.memory:0
+#: view:stock.move.memory.in:0
+#: view:stock.move.memory.out:0
 msgid "Product Moves"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree
-msgid "This is the list of all delivery orders that must be prepared, according to your different sales orders and your logistics rules."
-msgstr ""
-
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
@@ -91,13 +87,17 @@ msgstr ""
 msgid "Internal reference number in case it differs from the manufacturer's serial number"
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid "Periodical Inventories are used to count the number of products available per location. You can use it once a year when you do the general inventory or whenever you need it, to correct the current stock level of a product."
+msgstr ""
+
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 #: field:report.stock.inventory,product_qty:0
@@ -108,7 +108,8 @@ msgstr ""
 #: report:stock.inventory.move:0
 #: field:stock.move,product_qty:0
 #: field:stock.move.consume,product_qty:0
-#: field:stock.move.memory,quantity:0
+#: field:stock.move.memory.in,quantity:0
+#: field:stock.move.memory.out,quantity:0
 #: field:stock.move.scrap,product_qty:0
 #: field:stock.move.split,qty:0
 #: field:stock.move.split.lines,quantity:0
@@ -117,10 +118,14 @@ msgstr ""
 #: field:stock.report.prodlots,qty:0
 #: field:stock.report.tracklots,name:0
 #: field:stock.split.into,quantity:0
-#, python-format
 msgid "Quantity"
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+msgid "This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules."
+msgstr ""
+
 #. module: stock
 #: view:report.stock.move:0
 #: field:report.stock.move,day:0
@@ -138,8 +143,10 @@ msgid "UoM"
 msgstr ""
 
 #. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:93
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
+#, python-format
 msgid "Physical Inventories"
 msgstr ""
 
@@ -161,7 +168,8 @@ msgid "When doing real-time inventory valuation, counterpart Journal Items for a
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1176
+#: code:addons/stock/stock.py:2378
 #, python-format
 msgid "Missing partial picking data for move #%s"
 msgstr ""
@@ -172,13 +180,14 @@ msgid "Deliver/Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/report/report_stock.py:0
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
 #, python-format
 msgid "You cannot delete any record!"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_splitinto.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:49
 #, python-format
 msgid "The current move line is already assigned to a pack, please remove it first if you really want to change it '             #                        'for this product: \"%s\" (id: %d)"
 msgstr ""
@@ -219,16 +228,11 @@ msgid "Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:661
 #, python-format
 msgid "Products to Process"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_location_form
-msgid "Define your locations in order to reflect to your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partners location (customers, suppliers) and virtual locations which are the counter-part of the stock operations like the manufacturing orders consummations, the 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 into the Stock location. Each report can be performed on physicals, partners or virtual locations."
-msgstr ""
-
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
@@ -239,24 +243,21 @@ msgstr ""
 msgid "If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_inventory_form
-msgid "The Periodical Inventories are used when you count your number of products available per location. You can use it, once a year, when you do the general inventory or, once you need it, to correct the current stock level of a product."
-msgstr ""
-
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Split lines"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1127
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2198
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
 #, python-format
 msgid "Warning!"
 msgstr ""
@@ -266,15 +267,6 @@ msgstr ""
 msgid "Group by partner"
 msgstr ""
 
-#. module: stock
-#: help:stock.move,state:0
-msgid "When the stock move is created it is in the 'Draft' state.\n"
-" After that it is set to 'Confirmed' state.\n"
-" If stock is available state is set to 'Available'.\n"
-" When the picking is done the state is 'Done'.                                  \n"
-"The state is 'Waiting' if the move is waiting for another one."
-msgstr ""
-
 #. module: stock
 #: model:ir.model,name:stock.model_res_partner
 #: view:report.stock.inventory:0
@@ -289,12 +281,13 @@ msgid "Partner"
 msgstr ""
 
 #. module: stock
-#: help:stock.move.memory,currency:0
+#: help:stock.move.memory.in,currency:0
+#: help:stock.move.memory.out,currency:0
 msgid "Currency in which Unit cost is expressed"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "No invoicing"
 msgstr ""
@@ -306,6 +299,11 @@ msgstr ""
 msgid "Production lot"
 msgstr ""
 
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr ""
+
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
@@ -371,6 +369,7 @@ msgstr ""
 #. module: stock
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
+#: view:stock.move:0
 #: selection:stock.move,state:0
 #: view:stock.picking:0
 #: selection:stock.picking,state:0
@@ -402,7 +401,7 @@ msgid "In Qty"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
 #, python-format
 msgid "No product in this location."
 msgstr ""
@@ -473,6 +472,12 @@ msgstr ""
 msgid "Move History (child moves)"
 msgstr ""
 
+#. module: stock
+#: code:addons/stock/stock.py:1984
+#, python-format
+msgid "There is no stock output account defined for this product or its category: \"%s\" (id: %d)"
+msgstr ""
+
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
@@ -486,12 +491,13 @@ msgid "Destination Location"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:751
 #, python-format
 msgid "You can not process picking without stock moves"
 msgstr ""
 
 #. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
 msgstr ""
@@ -507,6 +513,11 @@ msgstr ""
 msgid "Grand Total:"
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid "You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field)."
+msgstr ""
+
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
@@ -525,7 +536,7 @@ msgid "Location / Product"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1306
 #, python-format
 msgid "Reception"
 msgstr ""
@@ -545,6 +556,11 @@ msgstr ""
 msgid "Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_journal_form
+msgid "The stock journal system allows you to assign each stock operation to a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc."
+msgstr ""
+
 #. module: stock
 #: field:stock.location,complete_name:0
 #: field:stock.location,name:0
@@ -595,11 +611,6 @@ msgstr ""
 msgid "June"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_out_picking_move
-msgid "The 'Deliver Products' menu lists all products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu."
-msgstr ""
-
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
@@ -647,7 +658,7 @@ msgid "Process Picking"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:355
 #, python-format
 msgid "Future Receptions"
 msgstr ""
@@ -675,7 +686,7 @@ msgid "Location Address"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2348
 #, python-format
 msgid "is consumed with"
 msgstr ""
@@ -734,7 +745,7 @@ msgid "Merge Inventory"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:371
 #, python-format
 msgid "Future P&L"
 msgstr ""
@@ -858,13 +869,13 @@ msgid "Left Parent"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:132
 #, python-format
 msgid "Delivery Information"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
 #, python-format
 msgid "Stock Inventory is done"
 msgstr ""
@@ -875,7 +886,7 @@ msgid "Error: Invalid ean code"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:148
 #, python-format
 msgid "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
@@ -933,11 +944,16 @@ msgid "Author"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1305
 #, python-format
 msgid "Delivery Order"
 msgstr ""
 
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_memory_in
+msgid "stock.move.memory.in"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
@@ -959,6 +975,11 @@ msgstr ""
 msgid "Expected Shipping Date"
 msgstr ""
 
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Not Available"
+msgstr ""
+
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "March"
@@ -993,11 +1014,9 @@ msgid "Lot number"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
 #: field:stock.inventory.line,product_uom:0
 #: field:stock.move.consume,product_uom:0
 #: field:stock.move.scrap,product_uom:0
-#, python-format
 msgid "Product UOM"
 msgstr ""
 
@@ -1044,28 +1063,28 @@ msgstr ""
 msgid "Downstream Traceability"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_journal_form
-msgid "The stock journals system allows you assign each stock operation into a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc."
-msgstr ""
-
 #. module: stock
 #: help:product.template,property_stock_production:0
 msgid "For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1975
 #, python-format
 msgid "Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product are same."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1322
 #, python-format
 msgid "is in draft state."
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+msgid "This is the list of all your packs. When you select a Pack, you can get the upstream or downstream traceability of the products contained in the pack."
+msgstr ""
+
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_final
 msgid "Stock ups final"
@@ -1077,7 +1096,7 @@ msgid "Chaining Type"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "To be refunded/invoiced"
 msgstr ""
@@ -1117,7 +1136,7 @@ msgid "Additional Info"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1602
 #, python-format
 msgid "Operation forbidden"
 msgstr ""
@@ -1128,7 +1147,7 @@ msgid "From"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:79
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
@@ -1170,7 +1189,7 @@ msgid "Search Stock Picking"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:93
 #, python-format
 msgid "Company is not specified in Location"
 msgstr ""
@@ -1223,13 +1242,13 @@ msgid "Customer Location"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:85
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:139
 #, python-format
 msgid "Receive Information"
 msgstr ""
@@ -1261,7 +1280,7 @@ msgid "Downstream traceability"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "No Invoices were created"
 msgstr ""
@@ -1272,7 +1291,7 @@ msgid "OpenERP S.A."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:140
 #, python-format
 msgid "Receive"
 msgstr ""
@@ -1310,7 +1329,7 @@ msgid "Let this field empty if this location is shared between all companies"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2198
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
 msgstr ""
@@ -1321,7 +1340,7 @@ msgid "Chaining Lead Time"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:85
 #, python-format
 msgid "Cannot deliver products which are already delivered !"
 msgstr ""
@@ -1331,6 +1350,15 @@ msgstr ""
 msgid "Stock Invoice Onshipping"
 msgstr ""
 
+#. module: stock
+#: help:stock.move,state:0
+msgid "When the stock move is created it is in the 'Draft' state.\n"
+" After that, it is set to 'Not Available' state if the scheduler did not find the products.\n"
+" When products are reserved it is set to 'Available'.\n"
+" When the picking is done the state is 'Done'.              \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
@@ -1339,7 +1367,7 @@ msgid "Supplier Location"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2217
 #, python-format
 msgid "were scrapped"
 msgstr ""
@@ -1366,9 +1394,8 @@ msgid "Stock Statistics"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: field:stock.move.memory,currency:0
-#, python-format
+#: field:stock.move.memory.in,currency:0
+#: field:stock.move.memory.out,currency:0
 msgid "Currency"
 msgstr ""
 
@@ -1378,7 +1405,7 @@ msgid "Track Manufacturing Lots"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#: code:addons/stock/wizard/stock_inventory_merge.py:44
 #, python-format
 msgid "Please select multiple physical inventories to merge in the list view."
 msgstr ""
@@ -1428,10 +1455,8 @@ msgid "Tracking lot"
 msgstr ""
 
 #. module: stock
-#: help:stock.location,posx:0
-#: help:stock.location,posy:0
-#: help:stock.location,posz:0
-msgid "Optional localization details, for information purpose only"
+#: view:stock.picking:0
+msgid "Back Orders"
 msgstr ""
 
 #. module: stock
@@ -1451,7 +1476,7 @@ msgid "Stock report by tracking lots"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:367
 #, python-format
 msgid "Delivered Qty"
 msgstr ""
@@ -1496,7 +1521,7 @@ msgid "Location Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#: code:addons/stock/wizard/stock_inventory_merge.py:64
 #, python-format
 msgid "Merging is only allowed on draft inventories."
 msgstr ""
@@ -1528,7 +1553,7 @@ msgid "Warehouse Dashboard"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:510
 #, python-format
 msgid "You can not remove a lot line !"
 msgstr ""
@@ -1542,7 +1567,7 @@ msgid "Scrap Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1135
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
 msgstr ""
@@ -1599,13 +1624,13 @@ msgid "Shipping Address :"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Provide the quantities of the returned products."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1978
 #, python-format
 msgid "Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product are same."
 msgstr ""
@@ -1673,13 +1698,13 @@ msgid "Quantity per lot"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1981
 #, python-format
 msgid "There is no stock input account defined for this product or its category: \"%s\" (id: %d)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:357
 #, python-format
 msgid "Received Qty"
 msgstr ""
@@ -1708,12 +1733,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: stock
 #: view:product.product:0
 msgid "Stocks"
@@ -1784,11 +1803,6 @@ msgstr ""
 msgid "Total value"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_move_form2
-msgid "This menu gives you the full traceability of inventory operations made on a specific product. You can filter on the product to see all the past or future movements made on the product."
-msgstr ""
-
 #. module: stock
 #: help:stock.location,chained_journal_id:0
 msgid "Inventory Journal in which the chained move will be written, if the Chaining Type is not Transparent (no journal is used if left empty)"
@@ -1806,9 +1820,8 @@ msgid "Creation"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: field:stock.move.memory,cost:0
-#, python-format
+#: field:stock.move.memory.in,cost:0
+#: field:stock.move.memory.out,cost:0
 msgid "Cost"
 msgstr ""
 
@@ -1836,7 +1849,7 @@ msgid "Automatic No Step Added"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2348
 #, python-format
 msgid "Product "
 msgstr ""
@@ -1877,7 +1890,7 @@ msgid "Inventory loss"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1314
 #, python-format
 msgid "Document"
 msgstr ""
@@ -1889,12 +1902,13 @@ msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uom:0
-#: field:stock.move.memory,product_uom:0
+#: field:stock.move.memory.in,product_uom:0
+#: field:stock.move.memory.out,product_uom:0
 msgid "Unit of Measure"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:176
 #, python-format
 msgid "Products: "
 msgstr ""
@@ -1910,11 +1924,6 @@ msgstr ""
 msgid "Tracking a move"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree6
-msgid "The Internal Moves lists all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has it's own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your pre-configured logistics rules but you can also record manual stock operations."
-msgstr ""
-
 #. module: stock
 #: view:product.product:0
 msgid "Update"
@@ -1937,7 +1946,7 @@ msgid "Others"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:90
 #, python-format
 msgid "Could not find any difference between standard price and new price!"
 msgstr ""
@@ -1969,7 +1978,7 @@ msgid "Warehouse board"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:377
 #, python-format
 msgid "Future Qty"
 msgstr ""
@@ -2000,13 +2009,13 @@ msgid "Shipping Type"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2175
 #, python-format
 msgid "You can only delete draft moves."
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:74
 #: model:ir.actions.act_window,name:stock.act_product_location_open
 #: model:ir.ui.menu,name:stock.menu_stock_products_menu
 #: view:stock.inventory:0
@@ -2038,9 +2047,8 @@ msgid "When real-time inventory valuation is enabled on a product, this account
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "There is no stock output account defined for this product or its category: \"%s\" (id: %d)"
+#: model:ir.actions.act_window,help:stock.action_reception_picking_move
+msgid "Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line."
 msgstr ""
 
 #. module: stock
@@ -2054,7 +2062,8 @@ msgid "Delay(Days)"
 msgstr ""
 
 #. module: stock
-#: field:stock.move.memory,move_id:0
+#: field:stock.move.memory.in,move_id:0
+#: field:stock.move.memory.out,move_id:0
 msgid "Move"
 msgstr ""
 
@@ -2064,7 +2073,7 @@ msgid "Expected date for the picking to be processed"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:373
 #, python-format
 msgid "P&L Qty"
 msgstr ""
@@ -2096,6 +2105,11 @@ msgstr ""
 msgid "Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_form
+msgid "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."
+msgstr ""
+
 #. module: stock
 #: view:stock.invoice.onshipping:0
 msgid "Create"
@@ -2118,7 +2132,7 @@ msgid "Source"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2557
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
 #: field:stock.inventory.line,inventory_id:0
@@ -2138,12 +2152,6 @@ msgstr ""
 msgid "The combination of serial number and internal reference must be unique !"
 msgstr ""
 
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#, python-format
-msgid "Currency in which Unit Cost is expressed"
-msgstr ""
-
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups
 msgid "Stock ups"
@@ -2161,8 +2169,9 @@ msgid "Tracking serial"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/report/report_stock.py:0
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
+#: code:addons/stock/stock.py:751
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -2173,13 +2182,14 @@ msgid "Stock Replacement result"
 msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "Fixed Location"
+#: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
+msgid "Units of Measure"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,help:stock.action_production_lot_form
-msgid "This is the list of all the production lots (serial numbers) you recorded. After having selected a lot, you can get the up-stream or down-stream traceability of the products contained in lot."
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
 msgstr ""
 
 #. module: stock
@@ -2223,8 +2233,8 @@ msgid "Maxtor Suppliers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:0
-#: code:addons/stock/wizard/stock_change_standard_price.py:0
+#: code:addons/stock/wizard/stock_change_product_qty.py:69
+#: code:addons/stock/wizard/stock_change_standard_price.py:106
 #, python-format
 msgid "Active ID is not set in Context"
 msgstr ""
@@ -2241,7 +2251,7 @@ msgid "Scrap Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:138
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_in
 #: view:stock.move:0
@@ -2250,7 +2260,7 @@ msgid "Receive Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:131
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 #, python-format
@@ -2278,6 +2288,11 @@ msgstr ""
 msgid "Date of Completion"
 msgstr ""
 
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
 #. module: stock
 #: help:stock.tracking,active:0
 msgid "By unchecking the active field, you may hide a pack without deleting it."
@@ -2315,18 +2330,19 @@ msgid "Company"
 msgstr ""
 
 #. module: stock
+#: view:stock.move:0
 #: view:stock.picking:0
-msgid "Back Orders"
+msgid "Unit Of Measure"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:122
 #, python-format
 msgid "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2302
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
@@ -2377,7 +2393,7 @@ msgid "Quantity (UOS)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1647
 #, python-format
 msgid "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
@@ -2415,7 +2431,7 @@ msgid "Properties"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:982
 #, python-format
 msgid "Error, no partner !"
 msgstr ""
@@ -2455,7 +2471,7 @@ msgid "Inventory Reference"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1307
 #, python-format
 msgid "Internal picking"
 msgstr ""
@@ -2538,7 +2554,7 @@ msgid "Date done"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:983
 #, python-format
 msgid "Please put a partner on the picking list if you want to generate invoice."
 msgstr ""
@@ -2564,6 +2580,11 @@ msgstr ""
 msgid "Responsible"
 msgstr ""
 
+#. module: stock
+#: field:stock.move,returned_price:0
+msgid "Returned product price"
+msgstr ""
+
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
@@ -2583,39 +2604,41 @@ msgid "Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
 #: model:ir.model,name:stock.model_product_product
+#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
 #: model:ir.ui.menu,name:stock.menu_stock_product
 #: view:report.stock.inventory:0
 #: field:report.stock.inventory,product_id:0
 #: field:report.stock.lines.date,product_id:0
 #: view:report.stock.move:0
 #: field:report.stock.move,product_id:0
+#: field:stock.change.product.qty,product_id:0
 #: field:stock.inventory.line,product_id:0
 #: field:stock.inventory.line.split,product_id:0
 #: report:stock.inventory.move:0
 #: view:stock.move:0
 #: field:stock.move,product_id:0
 #: field:stock.move.consume,product_id:0
-#: field:stock.move.memory,product_id:0
+#: field:stock.move.memory.in,product_id:0
+#: field:stock.move.memory.out,product_id:0
 #: field:stock.move.scrap,product_id:0
 #: field:stock.move.split,product_id:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
 #: field:stock.report.tracklots,product_id:0
-#, python-format
 msgid "Product"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:135
 #, python-format
 msgid "Invoicing"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
 #, python-format
 msgid "Please provide Proper Quantity !"
 msgstr ""
@@ -2642,7 +2665,7 @@ msgid "Consume Products"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1646
 #, python-format
 msgid "Insufficient Stock in Lot !"
 msgstr ""
@@ -2680,7 +2703,18 @@ msgid "Total Value"
 msgstr ""
 
 #. module: stock
-#: field:stock.move.memory,wizard_id:0
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Products Categories"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.memory.in,wizard_id:0
+#: field:stock.move.memory.out,wizard_id:0
 msgid "Wizard"
 msgstr ""
 
@@ -2700,6 +2734,11 @@ msgstr ""
 msgid "Shelf 1"
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid "Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations."
+msgstr ""
+
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
@@ -2722,12 +2761,6 @@ msgstr ""
 msgid "Accounting Entries"
 msgstr ""
 
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Unit Of Measure"
-msgstr ""
-
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
@@ -2772,13 +2805,13 @@ msgid "All at once"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1603
 #, python-format
 msgid "Quantities, UoMs, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:383
 #, python-format
 msgid "Future Productions"
 msgstr ""
@@ -2789,7 +2822,7 @@ msgid "To Invoice"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:120
 #, python-format
 msgid "Return lines"
 msgstr ""
@@ -2816,7 +2849,12 @@ msgid "Moves for this production lot"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#: model:ir.model,name:stock.model_stock_move_memory_out
+msgid "stock.move.memory.out"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
 #, python-format
 msgid "Message !"
 msgstr ""
@@ -2842,13 +2880,18 @@ msgstr ""
 msgid "Delivery Order:"
 msgstr ""
 
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid "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. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers."
+msgstr ""
+
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2174
 #, python-format
 msgid "UserError"
 msgstr ""
@@ -2869,16 +2912,28 @@ msgid "Non European Customers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
-#: code:addons/stock/stock.py:0
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
-#: code:addons/stock/wizard/stock_splitinto.py:0
+#: code:addons/stock/product.py:76
+#: code:addons/stock/product.py:90
+#: code:addons/stock/product.py:93
+#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:121
+#: code:addons/stock/product.py:147
+#: code:addons/stock/stock.py:1975
+#: code:addons/stock/stock.py:1978
+#: code:addons/stock/stock.py:1981
+#: code:addons/stock/stock.py:1984
+#: code:addons/stock/stock.py:1987
+#: code:addons/stock/stock.py:1990
+#: code:addons/stock/stock.py:2302
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
 msgid "Error!"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1990
 #, python-format
 msgid "There is no inventory variation account defined on the product category: \"%s\" (id: %d)"
 msgstr ""
@@ -2898,8 +2953,8 @@ msgid "Cancelled"
 msgstr ""
 
 #. module: stock
-#: field:stock.location,chained_location_type:0
-msgid "Chained Location Type"
+#: view:stock.move:0
+msgid "Picking"
 msgstr ""
 
 #. module: stock
@@ -2908,7 +2963,7 @@ msgid "It specifies goods to be delivered all at once or by direct delivery"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
 #, python-format
 msgid "This picking list does not require invoicing."
 msgstr ""
@@ -2930,14 +2985,24 @@ msgid "Determines whether this location is chained to another location, i.e. any
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#: code:addons/stock/wizard/stock_inventory_merge.py:43
+#: code:addons/stock/wizard/stock_inventory_merge.py:63
 #, python-format
 msgid "Warning"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,help:stock.action_location_tree
-msgid "This is the structure of your company's warehouses and locations. You can click on a location in order to get the list of the products and their stock level in this particular location and all its children."
+#: code:addons/stock/stock.py:1321
+#: code:addons/stock/stock.py:2557
+#, python-format
+msgid "is done."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Delivery Orders"
 msgstr ""
 
 #. module: stock
@@ -2949,7 +3014,6 @@ msgstr ""
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0
 #: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
 #: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
@@ -3002,9 +3066,8 @@ msgid "Back Order of"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: help:stock.move.memory,cost:0
-#, python-format
+#: help:stock.move.memory.in,cost:0
+#: help:stock.move.memory.out,cost:0
 msgid "Unit Cost for this product line"
 msgstr ""
 
@@ -3018,7 +3081,7 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:0
+#: code:addons/stock/wizard/stock_change_product_qty.py:77
 #, python-format
 msgid "INV: "
 msgstr ""
@@ -3029,7 +3092,7 @@ msgid "Reporting"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1316
 #, python-format
 msgid " for the "
 msgstr ""
@@ -3045,11 +3108,6 @@ msgstr ""
 msgid "Create invoice"
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_tracking_form
-msgid "This is the list of all your packs. After having selected a Pack, you can get the up-stream or down-stream traceability of the products contained in the pack."
-msgstr ""
-
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
 msgid "Configuration"
@@ -3079,7 +3137,7 @@ msgid "Chaining Journal"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:729
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
 msgstr ""
@@ -3090,29 +3148,24 @@ msgid "Customers"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1320
 #, python-format
 msgid "is cancelled."
 msgstr ""
 
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_reception_picking_move
-msgid "You will find here the list of all products you are waiting for, according to your preceding purchase orders. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line."
-msgstr ""
-
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Stock Inventory Lines"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:74
 #, python-format
 msgid "Process Document"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:365
 #, python-format
 msgid "Future Deliveries"
 msgstr ""
@@ -3165,8 +3218,8 @@ msgid "Automatic Move"
 msgstr ""
 
 #. module: stock
-#: help:stock.production.lot,name:0
-msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid "This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product."
 msgstr ""
 
 #. module: stock
@@ -3264,7 +3317,7 @@ msgid "Existing Lot"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
 msgstr ""
@@ -3275,7 +3328,7 @@ msgid "For the current product, this stock location will be used, instead of the
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1319
 #, python-format
 msgid "is ready to process."
 msgstr ""
@@ -3291,7 +3344,7 @@ msgid "Set to zero"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
 #, python-format
 msgid "None of these picking lists require invoicing."
 msgstr ""
@@ -3302,20 +3355,20 @@ msgid "November"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/product.py:101
+#: code:addons/stock/stock.py:1987
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:379
 #, python-format
 msgid "Unplanned Qty"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1318
 #, python-format
 msgid "is scheduled"
 msgstr ""
@@ -3351,14 +3404,16 @@ msgid "Move History (parent moves)"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:361
 #, python-format
 msgid "Future Stock"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/stock.py:510
+#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1135
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
 #, python-format
 msgid "Error"
 msgstr ""
@@ -3374,16 +3429,21 @@ msgid "Select Quantity"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid "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."
+msgstr ""
+
+#. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
 #: field:stock.inventory.line,prod_lot_id:0
 #: report:stock.inventory.move:0
 #: field:stock.move,prodlot_id:0
-#: field:stock.move.memory,prodlot_id:0
+#: field:stock.move.memory.in,prodlot_id:0
+#: field:stock.move.memory.out,prodlot_id:0
 #: field:stock.move.split.lines.exist,prodlot_id:0
 #: view:stock.production.lot:0
 #: field:stock.production.lot,name:0
-#, python-format
 msgid "Production Lot"
 msgstr ""
 
@@ -3419,14 +3479,17 @@ msgid "Prefix"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_splitinto.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
 msgid "Total quantity after split exceeds the quantity to split for this product: \"%s\" (id: %d)"
 msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-#: field:stock.partial.move,product_moves:0
+#: field:stock.partial.move,product_moves_in:0
+#: field:stock.partial.move,product_moves_out:0
+#: field:stock.partial.picking,product_moves_in:0
+#: field:stock.partial.picking,product_moves_out:0
 msgid "Moves"
 msgstr ""
 
@@ -3443,16 +3506,11 @@ msgid "It specifies attributes of packaging like type, quantity of packaging,etc
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2348
 #, python-format
 msgid "quantity."
 msgstr ""
 
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory
-msgid "stock.move.memory"
-msgstr ""
-
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
@@ -3476,7 +3534,7 @@ msgid "Split Move"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:97
 #, python-format
 msgid "There are no products to return (only lines in Done state and not fully returned yet can be returned)!"
 msgstr ""
@@ -3504,7 +3562,7 @@ msgid "May"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:133
 #, python-format
 msgid "Deliver"
 msgstr ""
@@ -3526,7 +3584,7 @@ msgid "Location Content"
 msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:385
 #, python-format
 msgid "Produced Qty"
 msgstr ""
@@ -3539,8 +3597,8 @@ msgid "Stock Output Account"
 msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-msgid "Picking"
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
 msgstr ""
 
 #. module: stock
@@ -3588,16 +3646,12 @@ msgid "Invoiced date"
 msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree
-#: view:stock.picking:0
-msgid "Outgoing Deliveries"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/stock.py:729
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_return_picking.py:79
+#: code:addons/stock/wizard/stock_return_picking.py:97
+#: code:addons/stock/wizard/stock_return_picking.py:204
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -3638,3 +3692,10 @@ msgstr ""
 msgid "Partial Move"
 msgstr ""
 
+#. module: stock
+#: help:stock.location,posx:0
+#: help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
+msgstr ""
+
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index d68010b35e6..1bb1b5990ca 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -181,10 +181,10 @@
                 <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
               </td>
             </tr>
           </blockTable>
@@ -198,7 +198,7 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -215,7 +215,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price()) ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -224,4 +224,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index e46a2966c38..d2e628152f0 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -181,10 +181,10 @@
                 <para style="terp_default_Right_9">[[formatLang( p['prod_qty']) ]] [[ p['uom'] ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price']) ]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value']) ]] [[ o.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
               </td>
             </tr>
           </blockTable>
@@ -198,7 +198,7 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total()) ]] [[ o.company_id.currency_id.symbol ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -215,7 +215,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price()) ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -224,4 +224,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index e310d3c6feb..3d66a1b825a 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -248,7 +248,7 @@
           <para style="terp_tblheader_Details_Centre">Lot</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">State</para>
+          <para style="terp_tblheader_Details">State</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Location</para>
@@ -259,7 +259,7 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'confirmed' or line.state=='done' or line.state=='assigned')],'move_lines') ]]</para>
+      <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if ((line.state == 'confirmed' or line.state=='done' or line.state=='assigned') and not line.scrapped)],'move_lines') ]]</para>
       <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
       <blockTable colWidths="256.0,74.0,58.0,60.0,73.0" style="Move_Line_Contect_Assign_State">
         <tr>
@@ -326,4 +326,4 @@
     </para>
   </pto>
   </story>
-</document>
\ No newline at end of file
+</document>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 81efdbca71e..97d5f9a0270 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -61,6 +61,7 @@ class stock_journal(osv.osv):
     }
 
 stock_journal()
+
 #----------------------------------------------------------
 # Stock Location
 #----------------------------------------------------------
@@ -69,7 +70,7 @@ class stock_location(osv.osv):
     _description = "Location"
     _parent_name = "location_id"
     _parent_store = True
-    _parent_order = 'name'
+    _parent_order = 'posz,name'
     _order = 'parent_left'
 
     def name_get(self, cr, uid, ids, context=None):
@@ -474,7 +475,10 @@ class stock_tracking(osv.osv):
 
     def make_sscc(self, cr, uid, context=None):
         sequence = self.pool.get('ir.sequence').get(cr, uid, 'stock.lot.tracking')
-        return sequence + str(self.checksum(sequence))
+        try:
+            return sequence + str(self.checksum(sequence))
+        except Exception:
+            return sequence
 
     _columns = {
         'name': fields.char('Pack Reference', size=64, required=True, select=True),
@@ -798,10 +802,11 @@ class stock_picking(osv.osv):
         move_ids = self.pool.get('stock.move').search(cr, uid, [('picking_id', 'in', ids)])
         for move in self.pool.get('stock.move').browse(cr, uid, move_ids):
             if move.state not in ('done', 'cancel'):
+
                 if move.product_qty != 0.0:
                     return False
                 else:
-                    move.write(cr, uid, [move.id], {'state': 'done'})
+                    move.write({'state': 'done'})
         return True
 
     def test_assigned(self, cr, uid, ids):
@@ -869,7 +874,7 @@ class stock_picking(osv.osv):
         @return {'contact': address, 'invoice': address} for invoice
         """
         partner_obj = self.pool.get('res.partner')
-        partner = picking.address_id.partner_id
+        partner = (picking.purchase_id and picking.purchase_id.partner_id) or (picking.sale_id and picking.sale_id.partner_id) or picking.address_id.partner_id
 
         return partner_obj.address_get(cr, uid, [partner.id],
                 ['contact', 'invoice'])
@@ -972,7 +977,7 @@ class stock_picking(osv.osv):
             if picking.invoice_state != '2binvoiced':
                 continue
             payment_term_id = False
-            partner = picking.address_id and picking.address_id.partner_id
+            partner =  picking.address_id and picking.address_id.partner_id
             if not partner:
                 raise osv.except_osv(_('Error, no partner !'),
                     _('Please put a partner on the picking list if you want to generate invoice.'))
@@ -1211,6 +1216,8 @@ class stock_picking(osv.osv):
                                 {'price_unit': product_price,
                                  'price_currency_id': product_currency})
 
+                        if not move.returned_price:
+                            move_obj.write(cr, uid, [move.id], {'returned_price': move.price_unit})
 
             for move in too_few:
                 product_qty = move_product_qty[move.id]
@@ -1287,6 +1294,9 @@ class stock_picking(osv.osv):
         @param ids: List of Picking Ids
         @param context: A standard dictionary for contextual values
         """
+        if context is None:
+            context = {}
+        data_obj = self.pool.get('ir.model.data')
         for pick in self.browse(cr, uid, ids, context=context):
             msg=''
             if pick.auto_picking:
@@ -1296,6 +1306,11 @@ class stock_picking(osv.osv):
                 'in':_('Reception'),
                 'internal': _('Internal picking'),
             }
+            view_list = {
+                'out': 'view_picking_out_form',
+                'in': 'view_picking_in_form',
+                'internal': 'view_picking_form',
+            }
             message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' "
             if pick.min_date:
                 msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
@@ -1306,8 +1321,10 @@ class stock_picking(osv.osv):
                 'done': _('is done.'),
                 'draft':_('is in draft state.'),
             }
+            res = data_obj.get_object_reference(cr, uid, 'stock', view_list.get(pick.type, 'view_picking_form'))
+            context.update({'view_id': res and res[1] or False})
             message += state_list[pick.state]
-            self.log(cr, uid, pick.id, message)
+            self.log(cr, uid, pick.id, message, context=context)
         return True
 
 stock_picking()
@@ -1509,9 +1526,9 @@ class stock_move(osv.osv):
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History (parent moves)'),
         'picking_id': fields.many2one('stock.picking', 'Reference', select=True,states={'done': [('readonly', True)]}),
         'note': fields.text('Notes'),
-        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Confirmed'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
-                                  help='When the stock move is created it is in the \'Draft\' state.\n After that it is set to \'Confirmed\' state.\n If stock is available state is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
-                                  \nThe state is \'Waiting\' if the move is waiting for another one.'),
+        'state': fields.selection([('draft', 'Draft'), ('waiting', 'Waiting'), ('confirmed', 'Not Available'), ('assigned', 'Available'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, select=True,
+              help='When the stock move is created it is in the \'Draft\' state.\n After that, it is set to \'Not Available\' state if the scheduler did not find the products.\n When products are reserved it is set to \'Available\'.\n When the picking is done the state is \'Done\'.\
+              \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
         'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
@@ -1521,6 +1538,7 @@ class stock_move(osv.osv):
 
         # used for colors in tree views:
         'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
+        'returned_price': fields.float('Returned product price', digits_compute= dp.get_precision('Sale Price')),
     }
     _constraints = [
         (_check_tracking,
@@ -1751,7 +1769,8 @@ class stock_move(osv.osv):
                     result.setdefault(m.picking_id, [])
                     result[m.picking_id].append( (m, dest) )
         return result
-    def _create_chained_picking(self, cr, uid, pick_name,picking,ptype,move, context=None):
+
+    def _create_chained_picking(self, cr, uid, pick_name, picking, ptype, move, context=None):
         res_obj = self.pool.get('res.company')
         picking_obj = self.pool.get('stock.picking')
         pick_id= picking_obj.create(cr, uid, {
@@ -1783,11 +1802,18 @@ class stock_move(osv.osv):
             new_moves = []
             if context is None:
                 context = {}
+            seq_obj = self.pool.get('ir.sequence')
             for picking, todo in self._chain_compute(cr, uid, moves, context=context).items():
                 ptype = todo[0][1][5] and todo[0][1][5] or location_obj.picking_type_get(cr, uid, todo[0][0].location_dest_id, todo[0][1][0])
-                pick_name = picking.name or ''
                 if picking:
-                    pickid = self._create_chained_picking(cr, uid, pick_name,picking,ptype,todo,context)
+                    # name of new picking according to its type
+                    new_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + ptype)
+                    pickid = self._create_chained_picking(cr, uid, new_pick_name, picking, ptype, todo, context=context)
+                    # Need to check name of old picking because it always considers picking as "OUT" when created from Sale Order
+                    old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id)
+                    if old_ptype != picking.type:
+                        old_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + old_ptype)
+                        self.pool.get('stock.picking').write(cr, uid, picking.id, {'name': old_pick_name}, context=context)
                 else:
                     pickid = False
                 for move, (loc, dummy, delay, dummy, company_id, ptype) in todo:
@@ -2052,6 +2078,7 @@ class stock_move(osv.osv):
 
         todo = []
         for move in self.browse(cr, uid, ids, context=context):
+            #print 'DONE MOVE', move.id, move.product_id.name, move.move_dest_id.id, move.state, move.move_dest_id and move.move_dest_id.state
             if move.state=="draft":
                 todo.append(move.id)
         if todo:
@@ -2068,7 +2095,7 @@ class stock_move(osv.osv):
                 self.write(cr, uid, [move.id], {'move_history_ids': [(4, move.move_dest_id.id)]})
                 #cr.execute('insert into stock_move_history_ids (parent_id,child_id) values (%s,%s)', (move.id, move.move_dest_id.id))
                 if move.move_dest_id.state in ('waiting', 'confirmed'):
-                    self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'})
+                    self.force_assign(cr, uid, [move.move_dest_id.id], context=context)
                     if move.move_dest_id.picking_id:
                         wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
                     if move.move_dest_id.auto_validate:
@@ -2268,14 +2295,12 @@ class stock_move(osv.osv):
             context = {}
         if quantity <= 0:
             raise osv.except_osv(_('Warning!'), _('Please provide Proper Quantity !'))
-
         res = []
         for move in self.browse(cr, uid, ids, context=context):
             move_qty = move.product_qty
             if move_qty <= 0:
                 raise osv.except_osv(_('Error!'), _('Can not consume a move with negative or zero quantity !'))
             quantity_rest = move.product_qty
-
             quantity_rest -= quantity
             uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
             if quantity_rest <= 0:
@@ -2292,7 +2317,7 @@ class stock_move(osv.osv):
                     'state': move.state,
                     'location_id': location_id or move.location_id.id,
                 }
-                if move.product_id.track_production and location_id:
+                if (not move.prodlot_id.id) and (move.product_id.track_production and location_id):
                     # IF product has checked track for production lot, move lines will be split by 1
                     res += self.action_split(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
                 else:
@@ -2306,7 +2331,7 @@ class stock_move(osv.osv):
             else:
                 quantity_rest = quantity
                 uos_qty_rest =  uos_qty
-                if move.product_id.track_production and location_id:
+                if (not move.prodlot_id.id) and (move.product_id.track_production and location_id):
                     res += self.action_split(cr, uid, [move.id], quantity_rest, split_by_qty=1, context=context)
                 else:
                     res += [move.id]
@@ -2453,7 +2478,8 @@ class stock_inventory(osv.osv):
         'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
         'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Confirmed'),('cancel','Cancelled')), 'State', readonly=True, select=True),
-        'company_id': fields.many2one('res.company','Company',required=True,select=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
+
     }
     _defaults = {
         'date': time.strftime('%Y-%m-%d %H:%M:%S'),
@@ -2473,7 +2499,6 @@ class stock_inventory(osv.osv):
         """ Finish the inventory
         @return: True
         """
-
         if context is None:
             context = {}
         move_obj = self.pool.get('stock.move')
@@ -2497,8 +2522,9 @@ class stock_inventory(osv.osv):
             move_ids = []
             for line in inv.inventory_line_id:
                 pid = line.product_id.id
-                product_context.update(uom=line.product_uom.id)
+                product_context.update(uom=line.product_uom.id,date=inv.date)
                 amount = location_obj._product_get(cr, uid, line.location_id.id, [pid], product_context)[pid]
+
                 change = line.product_qty - amount
                 lot_id = line.prod_lot_id.id
                 if change:
@@ -2509,7 +2535,6 @@ class stock_inventory(osv.osv):
                         'product_uom': line.product_uom.id,
                         'prodlot_id': lot_id,
                         'date': inv.date,
-                        'date': inv.date,
                     }
                     if change > 0:
                         value.update( {
@@ -2568,7 +2593,7 @@ class stock_inventory_line(osv.osv):
         'state': fields.related('inventory_id','state',type='char',string='State',readonly=True),
     }
 
-    def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False):
+    def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False, to_date=False):
         """ Changes UoM and name if product_id changes.
         @param location_id: Location id
         @param product: Changed product_id
@@ -2580,7 +2605,7 @@ class stock_inventory_line(osv.osv):
         if not uom:
             prod = self.pool.get('product.product').browse(cr, uid, [product], {'uom': uom})[0]
             uom = prod.uom_id.id
-        amount = self.pool.get('stock.location')._product_get(cr, uid, location_id, [product], {'uom': uom})[product]
+        amount = self.pool.get('stock.location')._product_get(cr, uid, location_id, [product], {'uom': uom, 'to_date': to_date})[product]
         result = {'product_qty': amount, 'product_uom': uom}
         return {'value': result}
 
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index e934e525b1b..bcde818c78a 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -18,7 +18,7 @@
             <field name="name">Production Lot</field>
             <field name="object">stock.production.lot</field>
         </record>
-        
+
         <!--
     Resource: stock.location
     -->
@@ -32,12 +32,14 @@
             <field name="name">Partner Locations</field>
             <field name="usage">view</field>
             <field name="icon">terp-partner</field>
+            <field name="posz">1</field>
             <field name="company_id"></field>
         </record>
         <record id="stock_location_locations_virtual" model="stock.location">
             <field name="name">Virtual Locations</field>
             <field name="usage">view</field>
             <field name="icon">terp-mrp</field>
+            <field name="posz">1</field>
             <field name="company_id"></field>
         </record>
         <record id="stock_location_scrapped" model="stock.location">
@@ -47,7 +49,7 @@
             <field name="usage">inventory</field>
             <field name="company_id"></field>
         </record>
-        
+
         <record id="location_inventory" model="stock.location">
             <field name="name">Inventory loss</field>
             <field name="location_id" ref="stock_location_locations_virtual"/>
@@ -92,6 +94,7 @@
             <field name="location_id" ref="stock_location_company"/>
             <field name="usage">internal</field>
             <field name="chained_location_type">customer</field>
+            <field name="chained_auto_packing">transparent</field>
             <field name="chained_picking_type">out</field>
             <field name="chained_journal_id" ref="journal_delivery"/>
         </record>
@@ -99,7 +102,7 @@
             <field name="name">Stock</field>
             <field name="location_id" ref="stock_location_company"/>
         </record>
-        
+
         <!--
     Properties
     -->
@@ -113,7 +116,11 @@
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_stock_customer')]"/>
             <field eval="'stock.location,'+str(stock_location_customers)" name="value"/>
         </record>
-        
+
+        <record id="base.main_partner" model="res.partner">
+            <field name="property_stock_customer" eval="ref('stock_location_stock')"/>
+        </record>
+
         <record forcecreate="True" id="property_stock_procurement" model="ir.property">
             <field name="name">property_stock_procurement</field>
             <field name="fields_id" search="[('model','=','product.template'),('name','=','property_stock_procurement')]"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 8c08041678c..845b9c2d4fa 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -9,10 +9,30 @@
         <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/>
         <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/>
         <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/>
+        <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action"
+           parent="stock.menu_stock_product" sequence="0"/>
         <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"/>
         <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
+        <menuitem
+            id="menu_product_in_config_stock" name="Product"
+            parent="stock.menu_stock_configuration" sequence="2"/>
+        <menuitem
+            action="product.product_category_action_form" id="menu_product_category_config_stock"
+            parent="stock.menu_product_in_config_stock" sequence="0"/>
+        <menuitem
+            action="product.product_ul_form_action" groups="base.group_extended"
+            id="menu_product_packaging_stock_action" parent="stock.menu_product_in_config_stock" sequence="1"/>
+         <menuitem
+            id="menu_stock_unit_measure_stock" name="Units of Measure"
+            parent="stock.menu_product_in_config_stock"  sequence="2"/>
+         <menuitem
+             action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
+             parent="stock.menu_stock_unit_measure_stock" sequence="0"/>
+         <menuitem
+              action="product.product_uom_form_action" id="menu_stock_uom_form_action"
+              parent="stock.menu_stock_unit_measure_stock" sequence="1"/>
 
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
@@ -37,7 +57,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Stock Inventory Lines">
-                    <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" select="1" domain="[('type','&lt;&gt;','service')]"/>
+                    <field context="location=location_id,uom=product_uom,to_date=parent.date" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)" select="1" domain="[('type','&lt;&gt;','service')]"/>
                     <field name="product_qty"/>
                     <field name="product_uom"/>
                     <field name="prod_lot_id" groups="base.group_extended"/>
@@ -97,7 +117,7 @@
                         <field colspan="4" name="inventory_line_id" nolabel="1" widget="one2many_list">
                             <tree string="Products" editable="bottom">
                                 <field colspan="4" domain="[('usage','=','internal')]" name="location_id"/>
-                                <field context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
+                                <field context="location=location_id,uom=product_uom,to_date=parent.date" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <field name="prod_lot_id" groups="base.group_extended"/>
@@ -109,7 +129,7 @@
                             <form string="Products ">
                                 <field domain="[('usage','=','internal')]" name="location_id"/>
                                 <newline/>
-                                <field colspan="4" context="location=location_id,uom=product_uom" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom)" domain="[('type','&lt;&gt;','service')]"/>
+                                <field context="location=location_id,uom=product_uom,to_date=parent.date" name="product_id" on_change="on_change_product_id(location_id,product_id,product_uom,parent.date)"  domain="[('type','&lt;&gt;','service')]"/>
                                 <field name="product_qty"/>
                                 <field name="product_uom"/>
                                 <group colspan="2" col="4">
@@ -232,6 +252,7 @@
         <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"
+            sequence="6"
             parent="menu_traceability"/>
 
         <record id="lot_line_tree" model="ir.ui.view">
@@ -387,9 +408,11 @@
             <field name="view_id" ref="view_production_lot_tree"/>
             <field name="search_view_id" ref="search_product_lot_filter" />
             <field name="context">{'full':'1',"search_default_available":1}</field>
-            <field name="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>
+            <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. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers.</field>
         </record>
-        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability" groups="base.group_extended"/>
+        <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" 
+            parent="menu_traceability" groups="base.group_extended"
+            sequence="1"/>
 
         #
         # Lot composition (history)
@@ -812,7 +835,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Outgoing Deliveries">
+                <tree colors="blue:state in ('draft');grey:state in ('cancel');red:state not in ('cancel', 'done') and date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="origin"/>
@@ -831,7 +854,7 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Outgoing Deliveries">
+                <form string="Delivery Orders">
                     <group col="6" colspan="4">
                         <group colspan="4" col="4">
                             <field name="name" readonly="1"/>
@@ -969,13 +992,13 @@
             <field name="arch" type="xml">
                 <search string="Picking list">
                     <group col="8" colspan="4">
-                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Outgoing Deliveries"/>
-                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Outgoing Deliveries"/>
-                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Outgoing Deliveries already processed"/>
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
+                        <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
+                        <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Outgoing Deliveries to invoice"/>
+                        <filter icon="terp-dolar" name="to_invoice" string="To Invoice" domain="[('invoice_state','=','2binvoiced')]" help="Delivery orders to invoice"/>
                         <separator orientation="vertical"/>
                         <field name="name"/>
                         <field name="partner_id" />
@@ -999,7 +1022,7 @@
         </record>
 
         <record id="action_picking_tree" model="ir.actions.act_window">
-            <field name="name">Outgoing Deliveries</field>
+            <field name="name">Delivery Orders</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1482,7 +1505,7 @@
             <field name="context">{'search_default_Available':1}</field>
             <field name="help">This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product.</field>
         </record>
-        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="1"/>
+        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
 
         ====================================
         Reception Picking (By Stock Move)
@@ -1642,7 +1665,8 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                       <field name="tracking_id" context="{'tracking': self}"/>
+                       <field name="prodlot_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
@@ -1668,7 +1692,8 @@
                     <group col="8" colspan="4">
                         <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be received"/>
+                        <filter icon="terp-gtk-go-back-rtl" name="receive" string="To Do" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (available or not)"/>
+                        <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
                         <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
                         <separator orientation="vertical"/>
                         <field name="origin"/>
@@ -1677,7 +1702,8 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Extended Filters..." groups="base.group_extended">
-                       <field name="tracking_id" context="{'tracking': self}" filter_domain="[]" />
+                       <field name="tracking_id" context="{'tracking_id': self}"/>
+                       <field name="prodlot_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="8" groups="base.group_extended">
@@ -1838,7 +1864,7 @@
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_receive\':1, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
             <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
-            <field name="help">The Deliver Products menu lists all individual products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu.</field>
+            <field name="help">You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field).</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_move_out_picking_tree">
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 4e437eef815..897d5cd0e98 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -21,14 +21,15 @@
 
 from osv import fields, osv
 from tools.translate import _
-import time
 
 class stock_change_product_qty(osv.osv_memory):
     _name = "stock.change.product.qty"
     _description = "Change Product Quantity"
     _columns = {
-        'new_quantity': fields.float('Quantity', required=True, help='This quantity is expressed in the Default UoM of the product.'), 
-        'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade", domain="[('usage', '=', 'internal')]"), 
+        'product_id' : fields.many2one('product.product', 'Product'),
+        'new_quantity': fields.float('Quantity', required=True, help='This quantity is expressed in the Default UoM of the product.'),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
     }
 
     def default_get(self, cr, uid, fields, context):
@@ -40,10 +41,13 @@ class stock_change_product_qty(osv.osv_memory):
          @param context: A standard dictionary
          @return: A dictionary which of fields with values.
         """
+        product_id = context and context.get('active_id', False) or False
         res = super(stock_change_product_qty, self).default_get(cr, uid, fields, context=context)
 
         if 'new_quantity' in fields:
             res.update({'new_quantity': 1})
+        if 'product_id' in fields:
+            res.update({'product_id': product_id})
         return res
 
     def change_product_qty(self, cr, uid, ids, context=None):
@@ -58,7 +62,6 @@ class stock_change_product_qty(osv.osv_memory):
         if context is None:
             context = {}
 
-        move_ids = []
         rec_id = context and context.get('active_id', False)
         assert rec_id, _('Active ID is not set in Context')
 
@@ -70,18 +73,27 @@ class stock_change_product_qty(osv.osv_memory):
         for data in self.browse(cr, uid, ids, context=context):
             inventory_id = inventry_obj.create(cr , uid, {'name': _('INV: ') + str(res_original.name)}, context=context)
             line_data ={
-                'inventory_id' : inventory_id, 
-                'product_qty' : data.new_quantity, 
-                'location_id' : data.location_id.id, 
-                'product_id' : rec_id, 
-                'product_uom' : res_original.uom_id.id, 
+                'inventory_id' : inventory_id,
+                'product_qty' : data.new_quantity,
+                'location_id' : data.location_id.id,
+                'product_id' : rec_id,
+                'product_uom' : res_original.uom_id.id,
+                'prod_lot_id' : data.prodlot_id.id
             }
-            line_id = inventry_line_obj.create(cr , uid, line_data, context=context)
-    
+            inventry_line_obj.create(cr , uid, line_data, context=context)
+
             inventry_obj.action_confirm(cr, uid, [inventory_id], context=context)
             inventry_obj.action_done(cr, uid, [inventory_id], context=context)
-            
-        return {}
+
+        return {
+            'domain': "[('id','=', %s)]" % (inventory_id),
+            'name' : _('Physical Inventories'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'stock.inventory',
+            'context': context,
+            'type': 'ir.actions.act_window',
+        }
 
 stock_change_product_qty()
 
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 927f3e91f80..6bedd7605e6 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -10,7 +10,10 @@
                     <separator string="Select Quantity" colspan="4"/>
                     <newline/>
                     <field name="new_quantity" />
+                    <newline/>
+                    <field name="product_id" invisible="1"/>
                     <field name="location_id" />
+                    <field name="prodlot_id" />
                     <separator string="" colspan="4" />
                     <label string="" colspan="2"/>
                     <group col="2" colspan="2">
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index 198b067ac79..d6b7355bb7c 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -113,6 +113,6 @@ class change_standard_price(osv.osv_memory):
             'stock_journal' : res[0].stock_journal.id
         }
         prod_obj.do_change_standard_price(cr, uid, [rec_id], datas, context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 change_standard_price()
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 8b686cbb619..afb1299fe2b 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -66,7 +66,7 @@ class stock_fill_inventory(osv.osv_memory):
         if ids and len(ids): 
             ids = ids[0]
         else:
-             return {}    
+             return {'type': 'ir.actions.act_window_close'}    
         fill_inventory = self.browse(cr, uid, ids, context=context)
         res = {}
         res_location = {}
@@ -113,7 +113,7 @@ class stock_fill_inventory(osv.osv_memory):
 
         if(len(product_ids) == 0):
             raise osv.except_osv(_('Message !'), _('No product in this location.'))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_fill_inventory()
 
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index f5ca234d66f..8109d75c515 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -84,7 +84,7 @@ class stock_inventory_merge(osv.osv_memory):
                     'product_qty': quantity,
                 })
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_inventory_merge()
 
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index d43b03b1c5a..8cfdc648349 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -46,7 +46,7 @@ class stock_move_track(osv.osv_memory):
         datas = self.read(cr, uid, ids)[0]
         move_obj = self.pool.get('stock.move')
         move_obj._track_lines(cr, uid, context['active_id'], datas, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_move_track()
 
@@ -102,7 +102,7 @@ class stock_move_consume(osv.osv_memory):
             move_obj.action_consume(cr, uid, move_ids,
                              data['product_qty'], data['location_id'],
                              context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_move_consume()
 
@@ -163,7 +163,7 @@ class stock_move_scrap(osv.osv_memory):
             move_obj.action_scrap(cr, uid, move_ids,
                              data['product_qty'], data['location_id'],
                              context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_move_scrap()
 
@@ -218,7 +218,7 @@ class split_in_production_lot(osv.osv_memory):
         if context is None:
             context = {}
         self.split(cr, uid, ids, context.get('active_ids'), context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
     def split(self, cr, uid, ids, move_ids, context=None):
         """ To split stock moves into production lot
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index b982a4023ef..4543f8a4306 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -190,11 +190,8 @@ class stock_partial_move(osv.osv_memory):
         
         p_moves = {}
         picking_type = self.__get_picking_type(cr, uid, move_ids)
-        print picking_type
+        
         moves_list = picking_type == 'product_moves_in' and partial.product_moves_in  or partial.product_moves_out
-        print picking_type == 'product_moves_in'
-        print partial.product_moves_out
-        print moves_list
         for product_move in moves_list:
             p_moves[product_move.move_id.id] = product_move
             
@@ -204,11 +201,6 @@ class stock_partial_move(osv.osv_memory):
                 continue
             if not p_moves.get(move.id):
                 continue
-            
-            print p_moves[move.id].product_id.id
-            print p_moves[move.id].quantity
-            print p_moves[move.id].product_uom.id
-            
             partial_datas['move%s' % (move.id)] = {
                 'product_id' : p_moves[move.id].id,
                 'product_qty' : p_moves[move.id].quantity,
@@ -224,9 +216,8 @@ class stock_partial_move(osv.osv_memory):
                 })
                 
             
-        print partial_datas
         move_obj.do_partial(cr, uid, moves_ids_final, partial_datas, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_partial_move()
 stock_partial_move_memory_out()
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index ad75c142a96..b657e6639f5 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -174,7 +174,7 @@ class stock_partial_picking(osv.osv_memory):
                                                     'product_currency': p_moves[move.id].currency.id,
                                                     })
         pick_obj.do_partial(cr, uid, picking_ids, partial_datas, context=context)
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
         
    
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 918c519a1e4..d71e6361b32 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -53,8 +53,10 @@ class stock_return_picking(osv.osv_memory):
                     res['invoice_state'] = 'none'
             for line in pick.move_lines:
                 return_id = 'return%s'%(line.id)
+                return_price = 'return_price%s'%(line.id)
                 if return_id in fields:
                     res[return_id] = line.product_qty
+                    res[return_price]=line.price_unit
         return res
 
     def view_init(self, cr, uid, fields_list, context=None):
@@ -86,8 +88,11 @@ class stock_return_picking(osv.osv_memory):
                         valid_lines += 1
                         if 'return%s'%(m.id) not in self._columns:
                             self._columns['return%s'%(m.id)] = fields.float(string=m.name, required=True)
+                        if 'return_price%s'%(m.id) not in self._columns:
+                            self._columns['return_price%s'%(m.id)] = fields.float(string=m.name, required=True)
                         if 'invoice_state' not in self._columns:
                             self._columns['invoice_state'] = fields.selection([('2binvoiced', 'To be refunded/invoiced'), ('none', 'No invoicing')], string='Invoicing', required=True)
+
             if not valid_lines:
                 raise osv.except_osv(_('Warning !'), _("There are no products to return (only lines in Done state and not fully returned yet can be returned)!"))
         return res
@@ -121,6 +126,10 @@ class stock_return_picking(osv.osv_memory):
                 if m.state=='done' and quantity > return_history[m.id]:
                     arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
                     res['fields']['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True}
+
+                    if m.product_id.cost_method == 'average' and pick.type == 'in':
+                        arch_lst.append('<field name="return_price%s"/>\n<newline/>' % (m.id,))
+                        res['fields']['return_price%s' % m.id]={'string':'Price', 'type':'float', 'required':True}
                     res.setdefault('returns', []).append(m.id)
             arch_lst.append('<field name="invoice_state"/>\n<newline/>')
             res['fields']['invoice_state']={'string':_('Invoicing'), 'type':'selection','required':True, 'selection':[('2binvoiced', _('To be refunded/invoiced')), ('none', _('No invoicing'))]}
@@ -133,7 +142,7 @@ class stock_return_picking(osv.osv_memory):
         return res
 
     def create_returns(self, cr, uid, ids, context=None):
-        """ 
+        """
          Creates return picking.
          @param self: The object pointer.
          @param cr: A database cursor
@@ -143,13 +152,13 @@ class stock_return_picking(osv.osv_memory):
          @return: A dictionary which of fields with values.
         """
         if context is None:
-            context = {} 
+            context = {}
         record_id = context and context.get('active_id', False) or False
         move_obj = self.pool.get('stock.move')
         pick_obj = self.pool.get('stock.picking')
         uom_obj = self.pool.get('product.uom')
         wf_service = netsvc.LocalService("workflow")
-    
+
         pick = pick_obj.browse(cr, uid, record_id, context=context)
         data = self.read(cr, uid, ids[0])
         new_picking = None
@@ -171,6 +180,7 @@ class stock_return_picking(osv.osv_memory):
             new_location=move.location_dest_id.id
             if move.state=='done':
                 new_qty = data['return%s' % move.id]
+                price_unit = data['return_price%s' % move.id]
                 returned_qty = move.product_qty
 
                 for rec in move.move_history_ids2:
@@ -178,7 +188,6 @@ class stock_return_picking(osv.osv_memory):
 
                 if returned_qty != new_qty:
                     set_invoice_state_to_none = False
-
                 if new_qty:
                     returned_lines += 1
                     new_move=move_obj.copy(cr, uid, move.id, {
@@ -187,7 +196,8 @@ class stock_return_picking(osv.osv_memory):
                             new_qty, move.product_uos.id),
                         'picking_id':new_picking, 'state':'draft',
                         'location_id':new_location, 'location_dest_id':move.location_id.id,
-                        'date':date_cur,})
+                        'date':date_cur,
+                        'price_unit':price_unit})
                     move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
 
         if not returned_lines:
diff --git a/addons/stock/wizard/stock_split_move.py b/addons/stock/wizard/stock_split_move.py
index 276133b3a01..aa7e4c17e15 100644
--- a/addons/stock/wizard/stock_split_move.py
+++ b/addons/stock/wizard/stock_split_move.py
@@ -116,7 +116,7 @@ class stock_split_move_line(osv.osv_memory):
                 new_obj = move_obj.copy(cr, uid, move.id, {'product_qty' : new_qty, 'product_uos_qty': new_uos_qty, 'state':move.state})
                 uos_qty = quantity / move.product_qty * move.product_uos_qty
                 move_obj.write(cr, uid, [move.id], {'product_qty' : quantity, 'product_uos_qty': uos_qty})
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
     
 stock_split_move_line()
 
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index d7473e86b59..1f48c8cfc19 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -79,6 +79,6 @@ class stock_split_into(osv.osv_memory):
                         inventory_obj.write(cr, uid, inventory_id, {'move_ids': [(4, current_move)]}, context=context)
 
 
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 stock_split_into()
 
diff --git a/addons/stock/wizard/stock_ups.py b/addons/stock/wizard/stock_ups.py
index 9ba61d06977..fb47587f254 100644
--- a/addons/stock/wizard/stock_ups.py
+++ b/addons/stock/wizard/stock_ups.py
@@ -87,7 +87,7 @@ class stock_ups_upload(osv.osv_memory):
         report = netsvc._group['report']['report.stock.move.lot.ups_xml']
         data['report_type'] = 'raw'
         fp = file('/tmp/test.xml', 'w').write(report.create(uid, context['active_id'], ids, {}))
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 stock_ups_upload()
 
diff --git a/addons/stock_invoice_directly/i18n/de.po b/addons/stock_invoice_directly/i18n/de.po
index 2aafa665596..7c4112248b5 100644
--- a/addons/stock_invoice_directly/i18n/de.po
+++ b/addons/stock_invoice_directly/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:45+0000\n"
-"PO-Revision-Date: 2010-12-01 07:04+0000\n"
+"PO-Revision-Date: 2010-12-31 11:02+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:50+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
@@ -30,6 +30,12 @@ msgid ""
 "        the invoicing wizard if the delivery is to be invoiced.\n"
 "    "
 msgstr ""
+"\n"
+"        Immer wenn Sie Produkte ausliefern bzw. versenden startet diese "
+"Anwendung\n"
+"        für abrechenbare Lieferungen automatisch den Assistenten für die "
+"Rechnungserstellung.\n"
+"    "
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
diff --git a/addons/stock_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index 85499a40376..9c9a9fdae58 100644
--- a/addons/stock_invoice_directly/i18n/es.po
+++ b/addons/stock_invoice_directly/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 18:51+0000\n"
+"PO-Revision-Date: 2010-12-28 07:53+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot b/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
index b94b4d1b699..26f6a2a4fd1 100644
--- a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
+++ b/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:33+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index def35742b99..d2c553d2e6f 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -48,7 +48,7 @@ class invoice_directly(osv.osv_memory):
                 'type': 'ir.actions.act_window',
                 'target': 'new',
             }
-        return {}
+        return {'type': 'ir.actions.act_window_close'}
 
 invoice_directly()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po
index c992ef6f4ca..1c84f42d5da 100644
--- a/addons/stock_location/i18n/de.po
+++ b/addons/stock_location/i18n/de.po
@@ -8,14 +8,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:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:26+0000\n"
+"PO-Revision-Date: 2010-12-31 10:39+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.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:47+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
@@ -71,7 +71,7 @@ msgstr "Warenfluss durch Pull Regeln"
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
 
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
@@ -189,7 +189,7 @@ msgstr "Unternehmen"
 #. module: stock_location
 #: view:product.product:0
 msgid "Logistics Flows"
-msgstr ""
+msgstr "Lieferabfolge"
 
 #. module: stock_location
 #: help:stock.move,cancel_cascade:0
@@ -316,6 +316,102 @@ msgid ""
 "from Gate A\n"
 "    "
 msgstr ""
+"\n"
+"Dieses Modul ergänzt die Anwendung für das Lager durch Erweiterung der "
+"Möglichkeit zur\n"
+"Festlegung produktbezogener Lieferketten, zwecks effektiver Umsetzung von "
+"Push- und Pull-Lieferketten.\n"
+"\n"
+"Typischerweise könnten folgende Anwendungen für diese Funktion in Frage "
+"kommen:\n"
+"* Verwaltung von Lieferketten zwischen Fertigungsstellen\n"
+"* Verwaltung von produktbezogenen Standardlagerorten\n"
+"* Vordefinierte Lieferketten innerhalb eines Lagers aufgrund bestimmter "
+"geschäftlichen Anforderungen, wie z.B.:\n"
+"   - Qualitätskontrolle in Wareneingang und Warenversand\n"
+"   - Technischer Kundendienst im Anschluss an einen Verkauf\n"
+"   - Rücksendung defekter Warenlieferungen an Lieferanten\n"
+"* Unterstützung bei der Verwaltung von Mietprodukten, z.B. durch Generierung "
+"von Lieferaufträgen für die Warenrückgabe\n"
+"\n"
+"Sobald diese Anwendung installiert ist, finden Sie einen zusätzlichen "
+"Aktenreiter in der Formularansicht für Produkte, \n"
+"auf dem Sie dann Ihre individuellen Push- und Pull-Lieferketten-"
+"Spezifikation hinterlegen können. \n"
+"\n"
+"Die Demo-Daten beinhalten ein Beispiel der Push / Pull Lieferkette für das "
+"CPU1 Produkt:\n"
+"\n"
+"Push Lieferkette\n"
+"-----------------------\n"
+"Push Lieferketten sind nützlich, wenn einer eingehenden Lieferung bestimmter "
+"Produkte an einen bestimmten Ort immer\n"
+"eine weitere entsprechende Folgelieferung an einen anderen Lagerort folgen "
+"soll, gegebenenfalls nach einer gewissen \n"
+"zeitlichen Verzögerung. Die ursprüngliche Anwendung für das Lager "
+"unterstützt bereits solche Push-Lieferketten \n"
+"durch eine Konfiguration beim Lagerort selbst, aber diese Lieferkette konnte "
+"bislang nicht pro-Produkt verfeinert werden. \n"
+"\n"
+"Eine Push-Lieferketten-Spezifikation gibt somit an, welcher Lagerort an "
+"einen anderen gekettet ist, mit den entsprechen\n"
+"Angaben zu den Lagerorten und weiteren Parametern. Wenn also eine bestimmte "
+"Anzahl von Produkten an einem \n"
+"Lagerort geliefert wird, der auch als Quelle bei einer definierten "
+"Lieferkette hinterlegt ist, wird automatisch ein weiterer Lieferauftrag \n"
+"gemäss der Parametern der jeweiligen Lieferketten-Spezifikation festgelegt "
+"(Zielort, zeitliche Verzögerung, Art der Lieferung, Lagerjournal, etc.) Der "
+"hierdurch neu enstandene Lieferauftrag wird entweder automatisch verarbeitet "
+"oder erfordert eine manuelle Bestätigung der Lieferung, je nach "
+"Parametrisierung.\n"
+"\n"
+"Pull-Lieferkette\n"
+"----------------------\n"
+"Eine Pull-Lieferkette funktioniert ein wenig anders als Push-Lieferungen und "
+"zwar in dem Sinne, dass sie sich nicht nur auf die\n"
+"die Produktlieferung als solche bezieht, sondern auch die Verarbeitung von "
+"Beschaffungsaufträgen modifiziert.\n"
+"Die Angabe welcher Vorgang eine Pull-Lieferkette auslöst ist hierbei "
+"wichtiger, als das Produkt selbst.\n"
+"Ein klassisches Beispiel für eine Pull-Lieferkette wäre, wenn Sie ein "
+"eigenes Unternehmen für Verkäufe in einem Outlet Store definiert haben, mit "
+"einer übergeordneten Muttergesellschaft, die seinerseits die Verantwortung "
+"für die Beschaffung der benötigten Produkte hat.\n"
+"\n"
+"  [Kunden] <- A - [Outlet Store] <- B - [Muttergesellschaft] <~ C ~ "
+"[Lieferant]\n"
+"\n"
+"Ausgangspunkt ist ein Beschaffungsauftrag (A, zum Beispiel aus der "
+"Bestätigung eines Verkaufsauftrags) der\n"
+"im Outlet Store entsteht und automatisch in einen anderen "
+"Beschaffungsauftrag (B, über eine Push-Lieferkette des Typs 'Interne "
+"Umlagerung') und somit in einen Bedarf der Muttergesellschaft konvertiert "
+"wird. Wenn der Beschaffungsauftrag B durch die Muttergesellschaft "
+"verarbeitet wird und das Produkt dort nicht vorrätig ist, kann es in eine "
+"Bestellung (C) an den Lieferanten umgewandelt werden (Push-Lieferkette vom "
+"Typ Beschaffung). Im Ergebnis wird der gesamte Beschaffungsauftrag, "
+"respektive der Warenbedarf vom Kunden über die gesamte Lieferkette bis hin "
+"zum Lieferanten der Muttergesellschaft verschoben.\n"
+"\n"
+"Technisch ausgedrückt ermöglichen Pull-Lieferketten einen modifizierten "
+"Beschaffungprozess, nicht nur aus der Perspektive\n"
+"des zu betrachtenden Produkts, sondern auch unter Berücksichtigung des "
+"Lagerorts der die \"Notwendigkeit\" für das\n"
+"Produkt hat (d.h. der Ziellagerort des Beschaffungsauftrags).\n"
+"\n"
+"Use-Case\n"
+"-------------\n"
+"\n"
+"Sie können die Demo-Daten wie folgt nachvollziehen:\n"
+"  CPU1: Kaufen Sie einige Stück CPU1 vom Shop 1 und starten Sie einen "
+"Beschaffungsvorschlag\n"
+"     - Zentrallager: Auslieferauftrag, Shop 1: Wareneingangslieferung\n"
+"  CPU3:\n"
+"     - Beim Wareneingang, geht die Ware zuerst in den Lagerort "
+"Qualitätssicherung und erst dann in das Regal 2.\n"
+"     - Beim Warenversand: Kommissionierung der Ware -> Verpackung der Ware -"
+"> Warenversand vom Gate A\n"
+"    "
 
 #. module: stock_location
 #: field:product.pulled.flow,type_proc:0
@@ -398,7 +494,7 @@ msgstr "Qualitätskontrolle"
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Not Applicable"
-msgstr ""
+msgstr "Nicht abzurechnen"
 
 #. module: stock_location
 #: field:stock.location.path,delay:0
@@ -436,6 +532,7 @@ msgstr ""
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
 msgstr ""
+"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_procurement_order
@@ -468,7 +565,7 @@ msgstr "Aktionstyp"
 #. module: stock_location
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 951927bf874..818b9f45d77 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-27 18:49+0000\n"
+"PO-Revision-Date: 2010-12-28 08:51+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/stock_location.pot b/addons/stock_location/i18n/stock_location.pot
index 43969cff36e..069fc087a46 100644
--- a/addons/stock_location/i18n/stock_location.pot
+++ b/addons/stock_location/i18n/stock_location.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:15+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:15+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:34+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:34+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,7 @@ msgid "Internal"
 msgstr ""
 
 #. module: stock_location
-#: code:addons/stock_location/procurement_pull.py:0
+#: code:addons/stock_location/procurement_pull.py:98
 #, python-format
 msgid "Pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)"
 msgstr ""
@@ -326,7 +326,7 @@ msgid "Products"
 msgstr ""
 
 #. module: stock_location
-#: code:addons/stock_location/procurement_pull.py:0
+#: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location via procurement %d"
 msgstr ""
@@ -348,7 +348,7 @@ msgid "Delay (days)"
 msgstr ""
 
 #. module: stock_location
-#: code:addons/stock_location/procurement_pull.py:0
+#: code:addons/stock_location/procurement_pull.py:67
 #, python-format
 msgid "Picking for pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)"
 msgstr ""
@@ -359,7 +359,7 @@ msgid "Pushed Flow"
 msgstr ""
 
 #. module: stock_location
-#: code:addons/stock_location/procurement_pull.py:0
+#: code:addons/stock_location/procurement_pull.py:89
 #, python-format
 msgid "Move for pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)"
 msgstr ""
diff --git a/addons/stock_location/security/ir.model.access.csv b/addons/stock_location/security/ir.model.access.csv
index a50f18a493c..09773a66893 100644
--- a/addons/stock_location/security/ir.model.access.csv
+++ b/addons/stock_location/security/ir.model.access.csv
@@ -2,16 +2,12 @@
 "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_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_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
diff --git a/addons/stock_no_autopicking/i18n/de.po b/addons/stock_no_autopicking/i18n/de.po
index d77be297699..11684f7fa11 100644
--- a/addons/stock_no_autopicking/i18n/de.po
+++ b/addons/stock_no_autopicking/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-01 09:46+0000\n"
+"PO-Revision-Date: 2010-12-31 10:22+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:43+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -38,6 +38,21 @@ msgid ""
 "    supplier in the routing of the assembly operation.\n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung ermöglicht die Zwischenschaltung eines Liefervorgangs "
+"für die\n"
+"    Beistellung von Bauteilen oder Rohmaterialien zu Fertigungsaufträgen.\n"
+"\n"
+"    Ein Beispiel für eine sinnvolle Anwendung ist dabei die Fertigung bei "
+"einem Ihrer Lieferanten, \n"
+"    der für Sie als Subunternehmer Ihren Fertigungsvorgang durchführt.\n"
+"    Um diesen Anwendungsfall umzusetzen, aktivieren Sie für das "
+"fremdzufertigende Produkt\n"
+"    das Kennzeichen \"Kein Automatischer Lieferauftrag\" und hinterlegen den "
+"Lagerort des\n"
+"    Subherstellers / Lieferant beim Fertigungsvorgang, der aus einzelnen "
+"Arbeitsaufträgen besteht.\n"
+"    "
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
@@ -57,7 +72,7 @@ msgstr "Automatischer Packauftrag für Kaufteile von Fertigungsaufträgen"
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
@@ -67,7 +82,7 @@ msgstr "keine automatische Packliste"
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "Bestellmengen können nicht negativ oder '0' sein !"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
diff --git a/addons/stock_no_autopicking/i18n/es.po b/addons/stock_no_autopicking/i18n/es.po
index d84a82b6b13..a74bc5531e9 100644
--- a/addons/stock_no_autopicking/i18n/es.po
+++ b/addons/stock_no_autopicking/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 08:51+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 13:01+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -38,6 +37,19 @@ msgid ""
 "    supplier in the routing of the assembly operation.\n"
 "    "
 msgstr ""
+"\n"
+"    Este módulo permite un proceso de recogida intermedio para proveer "
+"materias\n"
+"    primas a las órdenes de fabricación.\n"
+"\n"
+"    Un ejemplo de uso de este módulo es gestionar la producción realizada "
+"por sus\n"
+"    proveedores (subcontratación). Para conseguir esto, establezca los "
+"productos ensamblados\n"
+"    que serán subcontratados a \"No Auto-Recogida\" y establezca la "
+"ubicación del nuevo\n"
+"    proveedor en el proceso de la operación de ensamblado.\n"
+"    "
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
index b802c2d2b0a..b858e5f92a1 100644
--- a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
+++ b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:15+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:15+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:34+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:34+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/stock_planning/i18n/es.po b/addons/stock_planning/i18n/es.po
index 42caebc76a7..a38aeca999e 100644
--- a/addons/stock_planning/i18n/es.po
+++ b/addons/stock_planning/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:45+0000\n"
-"PO-Revision-Date: 2010-12-16 18:07+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-12-31 10:24+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:56+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -89,32 +89,34 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: stock_planning
 #: field:stock.planning,incoming_left:0
 msgid "Incoming Left"
-msgstr ""
+msgstr "Entrada restante"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Requisition history"
-msgstr ""
+msgstr "Historial demandas"
 
 #. module: stock_planning
 #: view:stock.sale.forecast.createlines:0
 msgid "Create Forecasts Lines"
-msgstr ""
+msgstr "Crear líneas de previsiones"
 
 #. module: stock_planning
 #: help:stock.planning,outgoing:0
 msgid "Quantity of all confirmed outgoing moves in calculated Period."
 msgstr ""
+"Cantidad de todos los movimientos salientes confirmados en el periodo "
+"calculado."
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Daily Periods"
-msgstr ""
+msgstr "Crear periodos diarios"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -124,7 +126,7 @@ msgstr ""
 #: field:stock.sale.forecast,company_id:0
 #: field:stock.sale.forecast.createlines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -133,6 +135,8 @@ msgid ""
 "\n"
 " Initial Stock: "
 msgstr ""
+"\n"
+" Stock inicial: "
 
 #. module: stock_planning
 #: help:stock.planning,warehouse_forecast:0
@@ -140,11 +144,13 @@ msgid ""
 "All sales forecasts for selected Warehouse of selected Product during "
 "selected Period."
 msgstr ""
+"Todas las previsiones de ventas para el almacén seleccionado del producto "
+"seleccionado durante el periodo seleccionado."
 
 #. module: stock_planning
 #: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
 msgid "Create Stock and Sales Periods"
-msgstr ""
+msgstr "Crear periodos de stock y ventas"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -154,12 +160,12 @@ msgstr ""
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,period_id:0
 msgid "Period which forecasts will concern."
-msgstr ""
+msgstr "Periodo al que conciernen las previsiones."
 
 #. module: stock_planning
 #: field:stock.planning,stock_only:0
 msgid "Stock Location Only"
-msgstr ""
+msgstr "Sólo ubicaciones de stock"
 
 #. module: stock_planning
 #: help:stock.planning,already_out:0
@@ -177,12 +183,12 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Current Period Situation"
-msgstr ""
+msgstr "Situación del periodo actual"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Monthly Periods"
-msgstr ""
+msgstr "Crear periodos mensuales"
 
 #. module: stock_planning
 #: help:stock.planning,supply_warehouse_id:0
@@ -204,12 +210,12 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning.createlines,forecasted_products:0
 msgid "All Products with Forecast"
-msgstr ""
+msgstr "Todos los productos con previsión"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Periods :"
-msgstr ""
+msgstr "Periodos :"
 
 #. module: stock_planning
 #: help:stock.planning,already_in:0
@@ -226,7 +232,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Stock and Sales Forecast"
-msgstr ""
+msgstr "Previsiones de stock y ventas"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast
@@ -236,7 +242,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_dept_id:0
 msgid "This Department"
-msgstr ""
+msgstr "Este departamento"
 
 #. module: stock_planning
 #: field:stock.planning,to_procure:0
@@ -246,7 +252,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,stock_simulation:0
 msgid "Stock Simulation"
-msgstr ""
+msgstr "Simulación de stock"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning_createlines
@@ -264,12 +270,12 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Search  Sales Forecast"
-msgstr ""
+msgstr "Buscar previsiones de ventas"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_user:0
 msgid "This User Period5"
-msgstr ""
+msgstr "El periodo de este usuario5"
 
 #. module: stock_planning
 #: help:stock.planning,history:0
@@ -286,23 +292,23 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_user:0
 msgid "This User Period1"
-msgstr ""
+msgstr "El periodo de este usuario1"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_user:0
 msgid "This User Period3"
-msgstr ""
+msgstr "El periodo de este usuario3"
 
 #. module: stock_planning
 #: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
 #: view:stock.planning:0
 msgid "Stock Planning"
-msgstr ""
+msgstr "Planificación de inventario"
 
 #. module: stock_planning
 #: field:stock.planning,minimum_op:0
 msgid "Minimum Rule"
-msgstr ""
+msgstr "Regla de mínimos"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -325,7 +331,7 @@ msgstr ""
 #: view:stock.planning.createlines:0
 #: view:stock.sale.forecast.createlines:0
 msgid "Create"
-msgstr ""
+msgstr "Crear"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
@@ -339,7 +345,7 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "  Creation Date: "
-msgstr ""
+msgstr "  Fecha de creación: "
 
 #. module: stock_planning
 #: field:stock.planning,period_id:0
@@ -347,7 +353,7 @@ msgstr ""
 #: field:stock.sale.forecast,period_id:0
 #: field:stock.sale.forecast.createlines,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Periodo"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -355,7 +361,7 @@ msgstr ""
 #: field:stock.planning,state:0
 #: field:stock.sale.forecast,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,product_categ_id:0
@@ -365,7 +371,7 @@ msgstr ""
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period
 msgid "stock period"
-msgstr ""
+msgstr "periodo stock"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
@@ -378,7 +384,7 @@ msgstr ""
 #: field:stock.sale.forecast,warehouse_id:0
 #: field:stock.sale.forecast.createlines,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Almacén"
 
 #. module: stock_planning
 #: help:stock.planning,stock_simulation:0
@@ -399,12 +405,12 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Search Stock Planning"
-msgstr ""
+msgstr "Buscar planificación de stock"
 
 #. module: stock_planning
 #: field:stock.planning,incoming_before:0
@@ -415,7 +421,7 @@ msgstr ""
 #: field:stock.planning.createlines,product_categ_id:0
 #: field:stock.sale.forecast.createlines,product_categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Categoría de producto"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -423,18 +429,18 @@ msgstr ""
 #: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡ Error !"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "Manual planning for "
-msgstr ""
+msgstr "Planificación manual para "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_user_id:0
 msgid "This User"
-msgstr ""
+msgstr "Este usuario"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -447,7 +453,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecasts"
-msgstr ""
+msgstr "Previsiones"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -457,7 +463,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculate Planning"
-msgstr ""
+msgstr "Calcular planificación"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -469,17 +475,17 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "¡Acción inválida!"
 
 #. module: stock_planning
 #: help:stock.planning,stock_start:0
 msgid "Stock quantity one day before current period."
-msgstr ""
+msgstr "Cantidad stock un día antes del periodo actual."
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create Weekly Periods"
-msgstr ""
+msgstr "Crear periodos semanales"
 
 #. module: stock_planning
 #: help:stock.planning,maximum_op:0
@@ -490,33 +496,34 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "You must specify a Source Warehouse !"
-msgstr ""
+msgstr "¡Debe especificar un almacén origen!"
 
 #. module: stock_planning
 #: view:stock.planning.createlines:0
 msgid "Creates planning lines for selected period and warehouse."
 msgstr ""
+"Crea líneas de planificación para el periodo y almacen seleccionados."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_user:0
 msgid "This User Period4"
-msgstr ""
+msgstr "Este periodo de usuario4"
 
 #. module: stock_planning
 #: view:stock.planning.createlines:0
 #: view:stock.sale.forecast.createlines:0
 msgid "Note: Doesn't duplicate existing lines created by you."
-msgstr ""
+msgstr "Nota: No duplica las líneas creadas por usted."
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Stock and Sales Period"
-msgstr ""
+msgstr "Periodo de stock y ventas"
 
 #. module: stock_planning
 #: field:stock.planning,company_forecast:0
 msgid "Company Forecast"
-msgstr ""
+msgstr "Previsión de la compañía"
 
 #. module: stock_planning
 #: help:stock.planning,product_uom:0
@@ -529,25 +536,25 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per User :"
-msgstr ""
+msgstr "Por usuario :"
 
 #. module: stock_planning
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
 #: view:stock.sale.forecast:0
 msgid "Sales Forecasts"
-msgstr ""
+msgstr "Previsiones de ventas"
 
 #. module: stock_planning
 #: field:stock.period,name:0
 #: field:stock.period.createlines,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Nombre del período"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,user_id:0
 msgid "Created/Validated by"
-msgstr ""
+msgstr "Creado/Validado por"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -557,28 +564,28 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_company:0
 msgid "This Company Period4"
-msgstr ""
+msgstr "El periodo de esta compañía4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_company:0
 msgid "This Company Period5"
-msgstr ""
+msgstr "El periodo de esta compañía5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_company:0
 msgid "This Company Period2"
-msgstr ""
+msgstr "El periodo de esta compañía2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_company:0
 msgid "This Company Period3"
-msgstr ""
+msgstr "El periodo de esta compañía3"
 
 #. module: stock_planning
 #: field:stock.period,date_start:0
 #: field:stock.period.createlines,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Fecha inicio"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -591,7 +598,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,confirmed_forecasts_only:0
 msgid "Validated Forecasts"
-msgstr ""
+msgstr "Previsiones validadas"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,product_categ_id:0
@@ -608,30 +615,30 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Department :"
-msgstr ""
+msgstr "Por departamento:"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Forecast"
-msgstr ""
+msgstr "Previsión"
 
 #. module: stock_planning
 #: selection:stock.period,state:0
 #: selection:stock.planning,state:0
 #: selection:stock.sale.forecast,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Closed"
-msgstr ""
+msgstr "Cerrada"
 
 #. module: stock_planning
 #: view:stock.planning:0
 #: view:stock.sale.forecast:0
 msgid "Warehouse "
-msgstr ""
+msgstr "Almacén "
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -644,7 +651,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Create periods for Stock and Sales Planning"
-msgstr ""
+msgstr "Crear periodos para planificación de stock y ventas"
 
 #. module: stock_planning
 #: help:stock.planning,planned_outgoing:0
@@ -891,7 +898,7 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "Cannot delete Validated Sale Forecasts !"
-msgstr ""
+msgstr "¡ No se pueden borrar previsiones de ventas validadas !"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -913,12 +920,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
 #: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
 msgid "Create Sales Forecasts"
-msgstr ""
+msgstr "Crear previsiones de ventas"
 
 #. module: stock_planning
 #: view:stock.sale.forecast.createlines:0
 msgid "Creates forecast lines for selected warehouse and period."
-msgstr ""
+msgstr "Crear líneas de previsión para el almacén y periodo seleccionados."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -937,7 +944,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_id:0
 msgid "Period4"
-msgstr ""
+msgstr "Periodo4"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -948,61 +955,61 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_id:0
 msgid "Period2"
-msgstr ""
+msgstr "Periodo2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_id:0
 msgid "Period3"
-msgstr ""
+msgstr "Periodo3"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_id:0
 msgid "Period1"
-msgstr ""
+msgstr "Periodo1"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "    Minimum stock: "
-msgstr ""
+msgstr "    Stock mínimo: "
 
 #. module: stock_planning
 #: field:stock.planning,active_uom:0
 #: field:stock.sale.forecast,active_uom:0
 msgid "Active UoM"
-msgstr ""
+msgstr "UdM activa"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
 #: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
 #: view:stock.planning.createlines:0
 msgid "Create Stock Planning Lines"
-msgstr ""
+msgstr "Crear líneas de planificación de stock"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "General Info"
-msgstr ""
+msgstr "Información general"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
 msgid "Sales Forecast"
-msgstr ""
+msgstr "Previsión de ventas"
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Planning and Situation for Calculated Period"
-msgstr ""
+msgstr "Planificación y situación para el periodo calculado"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
 msgid "This Warehouse Period1"
-msgstr ""
+msgstr "Peridodo de este almacen1"
 
 #. module: stock_planning
 #: field:stock.planning,warehouse_forecast:0
 msgid "Warehouse Forecast"
-msgstr ""
+msgstr "Previsión almacen"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1013,22 +1020,22 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Sales history"
-msgstr ""
+msgstr "Histórico de ventas"
 
 #. module: stock_planning
 #: field:stock.planning,supply_warehouse_id:0
 msgid "Source Warehouse"
-msgstr ""
+msgstr "Almacén origen"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_qty:0
 msgid "Forecasted quantity."
-msgstr ""
+msgstr "Cantidad prevista."
 
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Stock"
-msgstr ""
+msgstr "Stock"
 
 #. module: stock_planning
 #: field:stock.planning,stock_supply_location:0
@@ -1038,12 +1045,12 @@ msgstr ""
 #. module: stock_planning
 #: help:stock.period.createlines,date_stop:0
 msgid "Ending date for planning period."
-msgstr ""
+msgstr "Fecha de fin para el periodo planificado."
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_user:0
 msgid "This User Period2"
-msgstr ""
+msgstr "El periodo de este usuario2"
 
 #. module: stock_planning
 #: help:stock.planning.createlines,forecasted_products:0
@@ -1062,7 +1069,7 @@ msgstr ""
 #: field:stock.planning,product_uos_categ:0
 #: field:stock.sale.forecast,product_uom_categ:0
 msgid "Product UoM Category"
-msgstr ""
+msgstr "Categoría UdM producto"
 
 #. module: stock_planning
 #: field:stock.planning,incoming:0
@@ -1072,48 +1079,48 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,line_time:0
 msgid "Past/Future"
-msgstr ""
+msgstr "Pasado/Futuro"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uos_categ:0
 msgid "Product UoS Category"
-msgstr ""
+msgstr "Categoría UdV producto"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_qty:0
 msgid "Product Quantity"
-msgstr ""
+msgstr "Cantidad de producto"
 
 #. module: stock_planning
 #: field:stock.sale.forecast.createlines,copy_forecast:0
 msgid "Copy Last Forecast"
-msgstr ""
+msgstr "Copiar última previsión"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,product_id:0
 msgid "Shows which product this forecast concerns."
-msgstr ""
+msgstr "Muestra a qué producto concierne esta previsión"
 
 #. module: stock_planning
 #: selection:stock.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
 
 #. module: stock_planning
 #: field:stock.period.createlines,period_ids:0
 msgid "Periods"
-msgstr ""
+msgstr "Periodos"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid " according to state:"
-msgstr ""
+msgstr " según el estado:"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -1121,19 +1128,19 @@ msgstr ""
 #: view:stock.planning.createlines:0
 #: view:stock.sale.forecast.createlines:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 #: selection:stock.sale.forecast,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Validado"
 
 #. module: stock_planning
 #: view:stock.period:0
 #: selection:stock.period,state:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,copy_forecast:0
@@ -1143,37 +1150,37 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_dept:0
 msgid "This Dept Period1"
-msgstr ""
+msgstr "El periodo de este depto.1"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_dept:0
 msgid "This Dept Period3"
-msgstr ""
+msgstr "El periodo de este depto.3"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_dept:0
 msgid "This Dept Period2"
-msgstr ""
+msgstr "El periodo de este depto.2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_dept:0
 msgid "This Dept Period5"
-msgstr ""
+msgstr "El periodo de este depto.5"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_dept:0
 msgid "This Dept Period4"
-msgstr ""
+msgstr "El periodo de este depto.4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
 msgid "This Warehouse Period2"
-msgstr ""
+msgstr "El periodo de este almacén2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
 msgid "This Warehouse Period3"
-msgstr ""
+msgstr "El periodo de este almacén3"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing:0
@@ -1183,32 +1190,32 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,create_uid:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsable"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Default UOM"
-msgstr ""
+msgstr "UdM por defecto"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
 msgid "This Warehouse Period4"
-msgstr ""
+msgstr "El periodo de este almacén4"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
 msgid "This Warehouse Period5"
-msgstr ""
+msgstr "El periodo de este almacén5"
 
 #. module: stock_planning
 #: view:stock.period:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning
 msgid "stock.planning"
-msgstr ""
+msgstr "stock.planificación"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,warehouse_id:0
@@ -1229,6 +1236,8 @@ msgid ""
 "\n"
 " Stock Simulation: "
 msgstr ""
+"\n"
+" Simulación de stock: "
 
 #. module: stock_planning
 #: help:stock.planning,to_procure:0
@@ -1241,7 +1250,7 @@ msgstr ""
 #. module: stock_planning
 #: help:stock.planning.createlines,period_id:0
 msgid "Period which planning will concern."
-msgstr ""
+msgstr "Periodo al cual concierne la planificación"
 
 #. module: stock_planning
 #: field:stock.planning,already_out:0
@@ -1256,7 +1265,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Warehouse :"
-msgstr ""
+msgstr "Por almacén :"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1265,16 +1274,18 @@ msgid ""
 "\n"
 " Warehouse Forecast: "
 msgstr ""
+"\n"
+" Previsión almacén: "
 
 #. module: stock_planning
 #: field:stock.planning,history:0
 msgid "Procurement History"
-msgstr ""
+msgstr "Histórico abastecimientos"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_start:0
 msgid "Starting date for planning period."
-msgstr ""
+msgstr "Fecha inicial para el periodo planificado"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1285,7 +1296,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyze_company:0
 msgid "Per Company"
-msgstr ""
+msgstr "Por compañía"
 
 #. module: stock_planning
 #: help:stock.planning,incoming_left:0
@@ -1304,7 +1315,7 @@ msgstr ""
 #: field:stock.period,date_stop:0
 #: field:stock.period.createlines,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "Fecha de fin"
 
 #. module: stock_planning
 #: help:stock.planning,stock_supply_location:0
@@ -1332,7 +1343,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,product_uom:0
 msgid "UoM"
-msgstr ""
+msgstr "UdM"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -1345,7 +1356,7 @@ msgstr ""
 #: view:stock.sale.forecast:0
 #: field:stock.sale.forecast,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Producto"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1354,11 +1365,13 @@ msgid ""
 "\n"
 "For period: "
 msgstr ""
+"\n"
+"Por periodo: "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "UdM de producto"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1380,7 +1393,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprobar"
 
 #. module: stock_planning
 #: help:stock.planning,period_id:0
@@ -1392,12 +1405,12 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Calculate Sales History"
-msgstr ""
+msgstr "Calcular historial de ventas"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,product_amt:0
 msgid "Product Amount"
-msgstr ""
+msgstr "Cantidad de producto"
 
 #. module: stock_planning
 #: help:stock.planning,confirmed_forecasts_only:0
diff --git a/addons/stock_planning/i18n/fr.po b/addons/stock_planning/i18n/fr.po
index c9fc4fcdfb8..a5ff9966643 100644
--- a/addons/stock_planning/i18n/fr.po
+++ b/addons/stock_planning/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 11:36+0000\n"
+"PO-Revision-Date: 2010-12-31 10:19+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:55+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -22,6 +22,8 @@ msgstr ""
 msgid ""
 "No forecasts for selected period or no products in selected category !"
 msgstr ""
+"Aucune prévision pour la période sélectionnée ou aucun produit dans la "
+"catégorie sélectionnée !"
 
 #. module: stock_planning
 #: help:stock.planning,stock_only:0
@@ -34,12 +36,12 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,maximum_op:0
 msgid "Maximum Rule"
-msgstr ""
+msgstr "Règle du stock maximum"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_company:0
 msgid "This Copmany Period1"
-msgstr ""
+msgstr "Période 1 de cette société"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -53,12 +55,14 @@ msgid ""
 "Forecast value which will be converted to Product Quantity according to "
 "prices."
 msgstr ""
+"Valeur de la prévision qui sera convertie en quantité de produit en fonction "
+"des prix."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "Incoming Left must be greater than 0 !"
-msgstr ""
+msgstr "Le reste à venir doit être plus grand que 0 !"
 
 #. module: stock_planning
 #: help:stock.planning,outgoing_before:0
diff --git a/addons/stock_planning/i18n/ru.po b/addons/stock_planning/i18n/ru.po
index 56dde5ebcba..63d33603872 100644
--- a/addons/stock_planning/i18n/ru.po
+++ b/addons/stock_planning/i18n/ru.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-11-14 08:14+0000\n"
+"PO-Revision-Date: 2011-01-01 11:52+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@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: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -35,7 +35,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,maximum_op:0
 msgid "Maximum Rule"
-msgstr ""
+msgstr "Правило максимума"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_per_company:0
diff --git a/addons/stock_planning/i18n/stock_planning.pot b/addons/stock_planning/i18n/stock_planning.pot
index 6cb82017e9b..38c606aa18f 100644
--- a/addons/stock_planning/i18n/stock_planning.pot
+++ b/addons/stock_planning/i18n/stock_planning.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:16+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:16+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:35+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:35+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
 #, python-format
 msgid "No forecasts for selected period or no products in selected category !"
 msgstr ""
@@ -48,7 +48,8 @@ msgid "Forecast value which will be converted to Product Quantity according to p
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
 #, python-format
 msgid "Incoming Left must be greater than 0 !"
 msgstr ""
@@ -59,7 +60,7 @@ msgid "Planned Out in periods before calculated. Between start date of current p
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
 #, python-format
 msgid "No products in selected category !"
 msgstr ""
@@ -115,7 +116,8 @@ msgid "Company"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:640
+#: code:addons/stock_planning/stock_planning.py:682
 #, python-format
 msgid "\n"
 " Initial Stock: "
@@ -197,7 +199,8 @@ msgid "Quantity which is already picked up to this warehouse in current period."
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
 #, python-format
 msgid "    Confirmed In Before: "
 msgstr ""
@@ -284,13 +287,14 @@ msgid "Procure Incoming Left"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
 #, python-format
 msgid "    Incoming Left: "
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:715
 #, python-format
 msgid "Pick List "
 msgstr ""
@@ -310,7 +314,8 @@ msgid "Master Procurement Schedule"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:636
+#: code:addons/stock_planning/stock_planning.py:678
 #, python-format
 msgid "  Creation Date: "
 msgstr ""
@@ -390,15 +395,18 @@ msgid "Product Category"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#: code:addons/stock_planning/stock_planning.py:665
+#: code:addons/stock_planning/stock_planning.py:667
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
 #, python-format
 msgid "Error !"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:626
 #, python-format
 msgid "Manual planning for "
 msgstr ""
@@ -409,7 +417,8 @@ msgid "This User"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
 #, python-format
 msgid "\n"
 " Confirmed Out: "
@@ -431,13 +440,13 @@ msgid "Calculate Planning"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:636
 #, python-format
 msgid "Procurement created in MPS by user: "
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:140
 #, python-format
 msgid "Invalid action !"
 msgstr ""
@@ -458,7 +467,7 @@ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:665
 #, python-format
 msgid "You must specify a Source Warehouse !"
 msgstr ""
@@ -550,7 +559,8 @@ msgid "Start Date"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
 #, python-format
 msgid "\n"
 " Already Out: "
@@ -600,7 +610,8 @@ msgid "Warehouse "
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
 #, python-format
 msgid "\n"
 " Expected Out: "
@@ -734,20 +745,21 @@ msgid "\n"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:140
 #, python-format
 msgid "Cannot delete Validated Sale Forecasts !"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
 #, python-format
 msgid "\n"
 " Planned Out: "
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:667
 #, python-format
 msgid "You must specify a Source Warehouse different than calculated (destination) Warehouse !"
 msgstr ""
@@ -764,7 +776,7 @@ msgid "Creates forecast lines for selected warehouse and period."
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:655
 #, python-format
 msgid "Requisition ("
 msgstr ""
@@ -780,7 +792,8 @@ msgid "Period4"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
 #, python-format
 msgid "    Already In: "
 msgstr ""
@@ -801,7 +814,8 @@ msgid "Period1"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
 #, python-format
 msgid "    Minimum stock: "
 msgstr ""
@@ -845,7 +859,8 @@ msgid "Warehouse Forecast"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
 #, python-format
 msgid "    Confirmed In: "
 msgstr ""
@@ -943,7 +958,8 @@ msgid "Periods"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
 #, python-format
 msgid " according to state:"
 msgstr ""
@@ -1059,7 +1075,8 @@ msgid "Warehouse which planning will concern."
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
 #, python-format
 msgid "\n"
 " Stock Simulation: "
@@ -1091,7 +1108,8 @@ msgid "Per Warehouse :"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:639
+#: code:addons/stock_planning/stock_planning.py:681
 #, python-format
 msgid "\n"
 " Warehouse Forecast: "
@@ -1108,7 +1126,8 @@ msgid "Starting date for planning period."
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
 #, python-format
 msgid "    Planned In: "
 msgstr ""
@@ -1173,7 +1192,8 @@ msgid "Product"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
 #, python-format
 msgid "\n"
 "For period: "
@@ -1185,13 +1205,15 @@ msgid "Product UoM"
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:671
+#: code:addons/stock_planning/stock_planning.py:693
 #, python-format
 msgid "MPS("
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:678
 #, python-format
 msgid "Pick created from MPS by user: "
 msgstr ""
@@ -1256,7 +1278,8 @@ msgid "Shows who created this forecast, or who validated."
 msgstr ""
 
 #. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
 #, python-format
 msgid "\n"
 " Planned Out Before: "
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index aaf7e77c0b2..9995752cb03 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -40,7 +40,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_stock_period_search" model="ir.ui.view">
             <field name="name">stock.period.search</field>
             <field name="model">stock.period</field>
@@ -178,10 +178,10 @@
                 </graph>
             </field>
         </record>
-        
+
         <!-- Forecast section -->
-        
-        <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts" 
+
+        <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts"
                 parent="base.menu_base_partner" sequence="6" groups="base.group_extended"/>
 
         <record id="view_stock_sale_forecast_filter" model="ir.ui.view">
@@ -224,7 +224,7 @@
                   action="action_view_stock_sale_forecast_form"/>
 
         <!-- Planning section -->
-        
+
         <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root" sequence="2"/>
 
         <record id="view_stock_planning_form" model="ir.ui.view">
@@ -319,6 +319,7 @@
             <field name="arch" type="xml">
                 <tree string="Master Procurement Schedule" colors ="blue:line_time=='Past';black:line_time=='Future'">
                     <field name="period_id"/>
+                    <field name="company_id" invisible="1"/>
                     <field name="product_id" on_change="product_id_change(product_id)" />
                     <field name="product_uom"/>
                     <field name="warehouse_forecast" string="Forecast"/>
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods.py b/addons/stock_planning/wizard/stock_planning_create_periods.py
index 13a822ed3fe..7d4012453de 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods.py
+++ b/addons/stock_planning/wizard/stock_planning_create_periods.py
@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-import time
 from datetime import datetime
-from dateutil.relativedelta import relativedelta 
+from dateutil.relativedelta import relativedelta
 
 from osv import osv, fields
 
@@ -35,7 +34,7 @@ class stock_period_createlines(osv.osv_memory):
         result = cr.fetchone()
         last_date = result and result[0] or False
         if last_date:
-            period_start = datetime(last_date,"%Y-%m-%d %H:%M:%S")+ relativedelta(days=1)
+            period_start = datetime.strptime(last_date,"%Y-%m-%d %H:%M:%S")+ relativedelta(days=1)
             period_start = period_start - relativedelta(hours=period_start.hour, minutes=period_start.minute, seconds=period_start.second)
         else:
             period_start = datetime.today()
@@ -51,7 +50,7 @@ class stock_period_createlines(osv.osv_memory):
     _defaults={
         'date_start': _get_new_period_start,
     }
-    
+
     def create_stock_periods(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -60,37 +59,50 @@ class stock_period_createlines(osv.osv_memory):
         period_obj = self.pool.get('stock.period')
         lines = []
         for p in self.browse(cr, uid, ids, context=context):
-            dt = p.date_start
+            dt_stp = datetime.strptime(p.date_stop, '%Y-%m-%d')
             ds = datetime.strptime(p.date_start, '%Y-%m-%d')
-            while ds.strftime('%Y-%m-%d') < p.date_stop:
+
+            while ds <= dt_stp:
                 if name =='Daily':
-                    de = ds + relativedelta(days=interval, minutes =-1)
-                    new_name = de.strftime('%Y-%m-%d')
+                    de = ds + relativedelta(days=(interval + 1), seconds =-1)
                     new_id = period_obj.create(cr, uid, {
-                    'name': new_name,
-                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'name': de.strftime('%Y-%m-%d'),
+                    'date_start': ds.strftime('%Y-%m-%d %H:%M:%S'),
                     'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
                     })
-                    ds = ds + relativedelta(days=interval) + 1
+                    ds = ds + relativedelta(days=(interval + 1))
                 if name =="Weekly":
-                    de = ds + relativedelta(days=interval, minutes =-1)
-                    new_name = de.strftime('%Y, week %W')
+                    de = ds + relativedelta(days=(interval + 1), seconds =-1)
+                    if dt_stp < de:
+                        de = dt_stp + relativedelta(days=1, seconds =-1)
+                    else:
+                        de = ds + relativedelta(days=(interval + 1), seconds =-1)
+                    new_name = ds.strftime('Week %W-%Y')
+                    if ds.strftime('%Y') != de.strftime('%Y'):
+                        new_name = ds.strftime('Week %W-%Y') + ', ' + de.strftime('Week %W-%Y')
                     new_id = period_obj.create(cr, uid, {
                     'name': new_name,
-                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'date_start': ds.strftime('%Y-%m-%d %H:%M:%S'),
                     'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
                     })
-                    ds = ds + relativedelta(days=interval) + 1
+                    ds = ds + relativedelta(days=(interval + 1))
                 if name == "Monthly":
-                    de = ds + relativedelta(months=interval, minutes=-1)
+                    de = ds + relativedelta(months=interval, seconds=-1)
+                    if dt_stp < de:
+                        de = dt_stp + relativedelta(days=1, seconds =-1)
+                    else:
+                        de = ds + relativedelta(months=interval, seconds=-1)
                     new_name = ds.strftime('%Y/%m')
+                    if ds.strftime('%m') != de.strftime('%m'):
+                        new_name = ds.strftime('%Y/%m') + '-' + de.strftime('%Y/%m')
                     new_id =period_obj.create(cr, uid, {
-                    'name': new_name,
-                    'date_start': ds.strftime('%Y-%m-%d'),
+                    'name': new_name, 
+                    'date_start': ds.strftime('%Y-%m-%d %H:%M:%S'),
                     'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
                     })
                     ds = ds + relativedelta(months=interval)
                 lines.append(new_id)
+
         return {
             'domain': "[('id','in', ["+','.join(map(str, lines))+"])]",
             'view_type': 'form',
diff --git a/addons/subscription/i18n/subscription.pot b/addons/subscription/i18n/subscription.pot
index dac501f8714..e40336a6d5c 100644
--- a/addons/subscription/i18n/subscription.pot
+++ b/addons/subscription/i18n/subscription.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:16+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:16+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:35+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:35+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -78,7 +78,7 @@ msgid "Today"
 msgstr ""
 
 #. module: subscription
-#: code:addons/subscription/subscription.py:0
+#: code:addons/subscription/subscription.py:44
 #, python-format
 msgid "Error !"
 msgstr ""
@@ -159,7 +159,7 @@ msgid "Name"
 msgstr ""
 
 #. module: subscription
-#: code:addons/subscription/subscription.py:0
+#: code:addons/subscription/subscription.py:44
 #, python-format
 msgid "You cannot modify the Object linked to the Document Type!\n"
 "Create another Document instead !"
@@ -280,7 +280,7 @@ msgid "Document Types"
 msgstr ""
 
 #. module: subscription
-#: code:addons/subscription/subscription.py:0
+#: code:addons/subscription/subscription.py:115
 #, python-format
 msgid "Wrong Source Document !"
 msgstr ""
@@ -303,7 +303,7 @@ msgid "Invoice"
 msgstr ""
 
 #. module: subscription
-#: code:addons/subscription/subscription.py:0
+#: code:addons/subscription/subscription.py:115
 #, python-format
 msgid "Please provide another source document.\n"
 "This one does not exist !"
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index 90e2cca7723..e3a36dea442 100644
--- a/addons/survey/i18n/de.po
+++ b/addons/survey/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-09 09:18+0000\n"
+"PO-Revision-Date: 2010-12-31 10:57+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
@@ -405,6 +405,8 @@ msgstr "Text"
 #: 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: survey
 #: selection:survey.print,paper_size:0
@@ -448,7 +450,7 @@ msgstr "Spät"
 #. module: survey
 #: 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: survey
 #: field:survey.send.invitation,mail_from:0
@@ -591,6 +593,16 @@ msgid ""
 "invitation of the survey\n"
 "    "
 msgstr ""
+"\n"
+"    Diese Anwendung wird allgemein für Umfragen verwendet. Es besteht bei "
+"dieser Anwendung eine Abhängigkeit zur \n"
+"     Anzahl möglicher Antworten aus diversen Modulen. Eine Umfrage "
+"beinhaltet immer zuerst eine multidimensionale Seite. \n"
+"    Jede Seite kann sich dabei aus Antworten zusammensetzen, je nachdem wie "
+"Ihre Fragestellungen definiert werden. \n"
+"    Partner können desweiteren, außer den selbst zu schreibenden Emails "
+"keine neuen weiteren Lieferauftrag erstellen.\n"
+"    "
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:0
@@ -843,7 +855,7 @@ msgstr "Nachricht"
 #: view:survey:0
 #: view:survey.request:0
 msgid "MY"
-msgstr ""
+msgstr "MJ"
 
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
@@ -1497,6 +1509,8 @@ msgid ""
 "than the number of answer.                                    Please use a "
 "number that is smaller than %d."
 msgstr ""
+"# Die Angabe der erforderlichen Anzahl Antworten ist grösser als die Anzahl "
+"der verfügbaren Antworten. Bitte tragen Sie eine Anzahl kleiner als %d ein."
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:0
@@ -1558,6 +1572,8 @@ msgid ""
 "greater than the number of answer.                                    Please "
 "use a number that is smaller than %d."
 msgstr ""
+"Minimal erforderliche Antworten übersteigt die Anzahl vorhandener Fragen. "
+"Bitte tragen Sie eine Anzahl kleiner als %d ein."
 
 #. module: survey
 #: field:survey.answer,menu_choice:0
@@ -1578,6 +1594,8 @@ msgid ""
 "Maximum Required Answer is greater                                     than "
 "Minimum Required Answer"
 msgstr ""
+"Die maximale Anzahl der Antworten übersteigt die minimal erforderliche "
+"Antwortanzahl."
 
 #. module: survey
 #: view:survey.send.invitation.log:0
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index 26cd1c4b618..6ee3c507089 100644
--- a/addons/survey/i18n/es.po
+++ b/addons/survey/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-27 20:14+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-31 08: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-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
@@ -640,7 +639,7 @@ msgstr "Mensaje de error"
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "You must enter one or more menu choices in column heading"
-msgstr ""
+msgstr "Debe introducir una o más opciones de menú en la cabecera de columna"
 
 #. module: survey
 #: field:survey.request,date_deadline:0
@@ -679,7 +678,7 @@ msgstr "Solicitudes de encuestas"
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "You must enter one or more column heading."
-msgstr ""
+msgstr "Debe introducir una o más cabeceras de columna."
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:0
@@ -690,7 +689,7 @@ msgstr "Por favor introduzca un valor numérico entero"
 #. module: survey
 #: model:ir.model,name:survey.model_survey_browse_answer
 msgid "survey.browse.answer"
-msgstr ""
+msgstr "encuesta.explorar.respuestas"
 
 #. module: survey
 #: selection:survey.question,comment_field_type:0
@@ -778,7 +777,7 @@ msgstr "Usuario responsable de la encuesta"
 #. module: survey
 #: field:survey.question,comment_column:0
 msgid "Add comment column in matrix"
-msgstr ""
+msgstr "Añadir columna de comentarios en la matriz"
 
 #. module: survey
 #: field:survey.answer,response:0
@@ -835,7 +834,7 @@ msgstr "Mensaje"
 #: view:survey:0
 #: view:survey.request:0
 msgid "MY"
-msgstr ""
+msgstr "MI"
 
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
@@ -851,7 +850,7 @@ msgstr "Número de página"
 #: code:addons/survey/wizard/survey_answer.py:0
 #, python-format
 msgid "Cannot locate survey for the question wizard!"
-msgstr ""
+msgstr "¡No se pudo localizar la encuesta para el asistente de preguntas!"
 
 #. module: survey
 #: view:survey:0
@@ -1036,7 +1035,7 @@ msgstr "Detalles encuesta"
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes With Different Type"
-msgstr ""
+msgstr "Multiples cuadros de texto con tipo diferente"
 
 #. module: survey
 #: view:survey.question.column.heading:0
@@ -1085,7 +1084,7 @@ msgstr "Entero"
 #. module: survey
 #: model:ir.model,name:survey.model_survey_send_invitation
 msgid "survey.send.invitation"
-msgstr ""
+msgstr "encuesta.enviar.invitacion"
 
 #. module: survey
 #: field:survey.history,user_id:0
@@ -1120,7 +1119,7 @@ msgstr "Columna"
 #. module: survey
 #: model:ir.model,name:survey.model_survey_tbl_column_heading
 msgid "survey.tbl.column.heading"
-msgstr ""
+msgstr "encuesta.tbl.columna.cabecera"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response_line
@@ -1162,7 +1161,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Numerical Textboxes"
-msgstr ""
+msgstr "Cuadros de texto numéricos"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
@@ -1252,7 +1251,7 @@ msgstr "Probar  encuesta"
 #. module: survey
 #: field:survey.question,rating_allow_one_column_require:0
 msgid "Allow Only One Answer per Column (Forced Ranking)"
-msgstr ""
+msgstr "Permitir una sóla respuesta por columna (clasificación forzada)"
 
 #. module: survey
 #: view:survey:0
@@ -1274,7 +1273,7 @@ msgstr "Cerrar"
 #: field:survey.question,comment_minimum_float:0
 #: field:survey.question,validation_minimum_float:0
 msgid "Minimum decimal number"
-msgstr ""
+msgstr "Número decimal mínimo"
 
 #. module: survey
 #: view:survey:0
@@ -1298,7 +1297,7 @@ msgstr ""
 #. module: survey
 #: help:survey,max_response_limit:0
 msgid "Set to one if survey is answerable only once"
-msgstr ""
+msgstr "Establecer a uno si la encuesta puede responderse sólo una vez"
 
 #. module: survey
 #: selection:survey.response,state:0
@@ -1308,12 +1307,12 @@ msgstr "Terminado "
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_column_heading
 msgid "Survey Question Column Heading"
-msgstr ""
+msgstr "Cabecera de columna de pregunta de encuesta"
 
 #. module: survey
 #: field:survey.answer,average:0
 msgid "#Avg"
-msgstr ""
+msgstr "#Prom."
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -1328,7 +1327,7 @@ msgstr ""
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.usuarios"
 
 #. module: survey
 #: view:survey:0
@@ -1437,7 +1436,7 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Required Answer"
-msgstr ""
+msgstr "Respuesta requerida"
 
 #. module: survey
 #: code:addons/survey/survey.py:0
@@ -1451,7 +1450,7 @@ msgstr ""
 #: code:addons/survey/survey.py:0
 #, python-format
 msgid "You must enter one or more answer."
-msgstr ""
+msgstr "Debe dar una o más respuestas."
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_browse_response
@@ -1508,7 +1507,7 @@ msgstr "#Preguntas"
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
 msgid "survey.response"
-msgstr ""
+msgstr "encuesta.respuesta"
 
 #. module: survey
 #: field:survey.question,comment_valid_err_msg:0
@@ -1593,7 +1592,7 @@ msgstr ""
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_answer
 msgid "survey.print.answer"
-msgstr ""
+msgstr "encuesta.imprimir.respuesta"
 
 #. module: survey
 #: view:survey.answer:0
@@ -1671,12 +1670,12 @@ msgstr ""
 #. module: survey
 #: field:survey,response_user:0
 msgid "Maximum Answer per User"
-msgstr ""
+msgstr "Máximo respuestas por usuario"
 
 #. module: survey
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
-msgstr ""
+msgstr "Posición página"
 
 #~ msgid "All Questions"
 #~ msgstr "Todas las preguntas"
diff --git a/addons/survey/i18n/fr_BE.po b/addons/survey/i18n/fr_BE.po
deleted file mode 100644
index ca415987b3e..00000000000
--- a/addons/survey/i18n/fr_BE.po
+++ /dev/null
@@ -1,688 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* survey
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-26 06:01:25+0000\n"
-"PO-Revision-Date: 2009-11-26 06:01:25+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: survey
-#: model:ir.ui.menu,name:survey.menu_survey_form
-msgid "Surveys"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.report.xml,name:survey.survey
-msgid "Survey Analysis Report"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.act_survey_page_question
-#: model:ir.ui.menu,name:survey.menu_survey_question_form1
-msgid "Survey Questions"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.response:0
-msgid "Set to draft"
-msgstr ""
-
-#. module: survey
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: survey
-#: field:survey.history,date:0
-msgid "Date started"
-msgstr ""
-
-#. module: survey
-#: field:survey,history:0
-msgid "History Lines"
-msgstr ""
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,init,mail:0
-msgid "Body"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_view_survey_name
-#: model:ir.ui.menu,name:survey.menu_run_survey_form
-msgid "Give Survey Response"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.act_survey_question
-msgid "All Questions"
-msgstr ""
-
-#. module: survey
-#: field:survey,date_open:0
-msgid "Survey Open Date"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_name_wiz
-msgid "survey.name.wiz"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-msgid "Users Details"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
-#: model:ir.model,name:survey.model_survey_question
-#: view:survey:0
-#: view:survey.page:0
-#: view:survey.question:0
-msgid "Survey Question"
-msgstr ""
-
-#. module: survey
-#: help:survey,response_user:0
-msgid "Set to one if  you require only one response per user"
-msgstr ""
-
-#. module: survey
-#: field:survey.page,title:0
-msgid "Page Title"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_history
-msgid "Survey History"
-msgstr ""
-
-#. module: survey
-#: field:survey.response,comment:0
-#: field:survey.response.answer,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: survey
-#: field:survey.question,tot_resp:0
-msgid "Total Response"
-msgstr ""
-
-#. module: survey
-#: view:survey.question.wiz:0
-msgid "Your Messages"
-msgstr ""
-
-#. module: survey
-#: selection:survey,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: survey
-#: field:survey.question,allow_comment:0
-msgid "Allow Comment Field"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,init:0
-#: wizard_field:wizard.send.invitation,init,send_mail_existing:0
-msgid "Send reminder for existing user"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_new_survey_question_form
-#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1
-msgid "New Survey Question"
-msgstr ""
-
-#. module: survey
-#: view:survey.response:0
-msgid "Skip"
-msgstr ""
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,init,partner_ids:0
-msgid "Partner"
-msgstr ""
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,init,mail_subject:0
-#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0
-msgid "Subject"
-msgstr ""
-
-#. module: survey
-#: field:survey,max_response_limit:0
-msgid "Maximum Response Limit"
-msgstr ""
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,init,mail_from:0
-msgid "From"
-msgstr ""
-
-#. module: survey
-#: field:survey.response,response_type:0
-msgid "Response Type"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,transfer:0
-msgid "Page Transfer"
-msgstr ""
-
-#. module: survey
-#: field:survey.answer,question_id:0
-#: field:survey.page,question_ids:0
-#: field:survey.question,question:0
-#: field:survey.response,question_id:0
-msgid "Question"
-msgstr ""
-
-#. module: survey
-#: wizard_button:wizard.send.invitation,init,send:0
-msgid "Send"
-msgstr ""
-
-#. module: survey
-#: field:survey.answer,response:0
-msgid "#Response"
-msgstr ""
-
-#. module: survey
-#: field:survey.response,response_answer_ids:0
-msgid "Response Answer"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Response Summary"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,init:0
-#: wizard_field:wizard.send.invitation,init,send_mail:0
-msgid "Send mail for new user"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Skipped Question"
-msgstr ""
-
-#. module: survey
-#: wizard_button:wizard.send.invitation,send,end:0
-msgid "_Ok"
-msgstr ""
-
-#. module: survey
-#: selection:survey.response,response_type:0
-msgid "Link"
-msgstr ""
-
-#. module: survey
-#: model:ir.ui.menu,name:survey.menu_survey_config
-msgid "Configuration"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_question_wiz
-msgid "survey.question.wiz"
-msgstr ""
-
-#. module: survey
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_response_answer
-#: view:survey.response.answer:0
-msgid "Survey Response Answer"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Page :-"
-msgstr ""
-
-#. module: survey
-#: field:survey,response_user:0
-msgid "Maximum Response per User"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Total Started Survey :-"
-msgstr ""
-
-#. module: survey
-#: view:survey.response:0
-msgid "Comment"
-msgstr ""
-
-#. module: survey
-#: field:survey.response,date_modify:0
-msgid "Modify Date"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Answered Question"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "You can not give response for this survey more than %s times"
-msgstr ""
-
-#. module: survey
-#: selection:survey.response,response_type:0
-msgid "Manually"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_form1
-msgid "All Surveys"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: field:survey,users:0
-msgid "Users"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,init:0
-msgid "Message"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,page_no:0
-msgid "Page Number"
-msgstr ""
-
-#. module: survey
-#: wizard_field:wizard.send.invitation,send,note:0
-msgid "Log"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_question_form
-msgid "All Survey Questions"
-msgstr ""
-
-#. module: survey
-#: field:survey,date_close:0
-msgid "Survey Close Date"
-msgstr ""
-
-#. module: survey
-#: view:survey.name.wiz:0
-msgid "Start"
-msgstr ""
-
-#. module: survey
-#: selection:survey,state:0
-#: selection:survey.response,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: survey
-#: selection:survey,state:0
-msgid "Closed"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: field:survey.answer,answer:0
-#: view:survey.page:0
-#: view:survey.question:0
-#: field:survey.question,answer_choice_ids:0
-#: field:survey.response.answer,answer_id:0
-msgid "Answer"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_survey_page_form
-msgid "All Survey Pages"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,store_ans:0
-msgid "Store Answer"
-msgstr ""
-
-#. module: survey
-#: field:survey,state:0
-#: field:survey.response,state:0
-msgid "Status"
-msgstr ""
-
-#. module: survey
-#: model:ir.module.module,shortdesc:survey.module_meta_information
-msgid "Survey Module"
-msgstr ""
-
-#. module: survey
-#: model:ir.module.module,description:survey.module_meta_information
-msgid "\n"
-"    This module is used for surveing. It depends on the answers or reviews of some questions by different users.\n"
-"    A survey may have multiple pages. Each page may contain multiple questions and each question may have multiple answers.\n"
-"    Different users may give different answers of question and according to that survey is done. \n"
-"    Partners are also sent mails with user name and password for the invitation of the survey\n"
-"    "
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.name.wiz:0
-msgid "Survey Details"
-msgstr ""
-
-#. module: survey
-#: field:survey.question,is_require_answer:0
-msgid "Required Answer"
-msgstr ""
-
-#. module: survey
-#: field:survey.history,user_id:0
-#: field:survey.response,response_id:0
-msgid "User"
-msgstr ""
-
-#. module: survey
-#: field:res.users,survey_id:0
-msgid "Groups"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.page:0
-#: view:survey.question:0
-#: field:survey.question,response_ids:0
-#: view:survey.response:0
-#: field:survey.response.answer,response_id:0
-msgid "Response"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_new_survey_form1
-#: model:ir.ui.menu,name:survey.menu_new_survey_form
-msgid "New Survey"
-msgstr ""
-
-#. module: survey
-#: model:ir.ui.menu,name:survey.main_menu_survey
-msgid "Survey Management"
-msgstr ""
-
-#. module: survey
-#: selection:survey.response,state:0
-msgid "Skiped"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_answer
-#: view:survey.answer:0
-msgid "Survey Answer"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/wizard/wizard_survey.py:0
-#, python-format
-msgid "Attention!"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey
-#: view:res.users:0
-#: view:survey:0
-#: field:survey.history,survey_id:0
-#: view:survey.name.wiz:0
-#: field:survey.name.wiz,survey_id:0
-#: field:survey.page,survey_id:0
-#: field:survey.question,survey:0
-msgid "Survey"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Total Completed Survey :-"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-msgid "History"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.answer:0
-#: view:survey.page:0
-#: view:survey.question:0
-msgid "Seq"
-msgstr ""
-
-#. module: survey
-#: field:survey,tot_comp_survey:0
-msgid "Total Completed Survey"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Response Percentage"
-msgstr ""
-
-#. module: survey
-#: field:survey.question.wiz,name:0
-msgid "Number"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Survey Title :-"
-msgstr ""
-
-#. module: survey
-#: view:survey.response:0
-msgid "Done"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/survey.py:0
-#, python-format
-msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer."
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.name.wiz:0
-#: wizard_button:wizard.send.invitation,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-msgid "Close"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: selection:survey,state:0
-msgid "Open"
-msgstr ""
-
-#. module: survey
-#: field:survey,tot_start_survey:0
-msgid "Total Started Survey"
-msgstr ""
-
-#. module: survey
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: survey
-#: model:ir.model,name:survey.model_survey_response
-#: view:survey.response:0
-msgid "Survey Response"
-msgstr ""
-
-#. module: survey
-#: field:survey.answer,average:0
-msgid "#Avg"
-msgstr ""
-
-#. module: survey
-#: field:survey,responsible_id:0
-msgid "Responsible"
-msgstr ""
-
-#. module: survey
-#: selection:survey.response,state:0
-msgid "Answered"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-msgid "Other"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.wizard,name:survey.wizard_send_invitation
-#: wizard_view:wizard.send.invitation,init:0
-msgid "Send Invitation"
-msgstr ""
-
-#. module: survey
-#: field:survey,title:0
-msgid "Survey Title"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "%"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: field:survey,note:0
-#: field:survey.name.wiz,note:0
-#: view:survey.page:0
-#: field:survey.page,note:0
-#: view:survey.response:0
-msgid "Description"
-msgstr ""
-
-#. module: survey
-#: view:survey.name.wiz:0
-msgid "Select Survey"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.action_new_survey_page_form
-#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1
-msgid "New Survey Page"
-msgstr ""
-
-#. module: survey
-#: view:survey:0
-#: view:survey.page:0
-#: field:survey.question,page_id:0
-msgid "Survey Page"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.act_survey_answer
-msgid "Survey Answers"
-msgstr ""
-
-#. module: survey
-#: view:survey.page:0
-msgid "#Questions"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Que:"
-msgstr ""
-
-#. module: survey
-#: field:survey,page_ids:0
-msgid "Page"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,send:0
-msgid "User creation"
-msgstr ""
-
-#. module: survey
-#: field:survey.answer,sequence:0
-#: field:survey.page,sequence:0
-#: field:survey.question,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,send:0
-msgid "Results :"
-msgstr ""
-
-#. module: survey
-#: code:addons/survey/wizard/wizard_survey.py:0
-#, python-format
-msgid "%sSurvey is not in open state"
-msgstr ""
-
-#. module: survey
-#: wizard_view:wizard.send.invitation,init:0
-msgid "Select Partner"
-msgstr ""
-
-#. module: survey
-#: field:survey.response,date_create:0
-msgid "Create Date"
-msgstr ""
-
-#. module: survey
-#: model:ir.actions.act_window,name:survey.act_survey_pages
-#: model:ir.model,name:survey.model_survey_page
-#: model:ir.ui.menu,name:survey.menu_survey_page_form1
-msgid "Survey Pages"
-msgstr ""
-
-#. module: survey
-#: rml:survey_analysis_report:0
-msgid "Response Count"
-msgstr ""
-
-#. module: survey
-#: field:survey.name.wiz,page:0
-msgid "Page Position"
-msgstr ""
-
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index d46876b2803..341fbfea242 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:18+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:18+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:37+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Print Option"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:422
 #, python-format
 msgid "Minimum Required Answer you                                     entered is greater than the number of answer.                                      Please use a number that is smaller than %d."
 msgstr ""
@@ -39,7 +39,7 @@ msgid "Text Validation"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:434
 #, python-format
 msgid "Maximum Required Answer you                                     entered for your maximum is greater than the number of answer.                                      Please use a number that is smaller than %d."
 msgstr ""
@@ -113,7 +113,7 @@ msgid "History Lines"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:448
 #, python-format
 msgid "You must enter one or more menu                                 choices in column heading (white spaces not allowed)"
 msgstr ""
@@ -176,7 +176,7 @@ msgid "Add Comment Field"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:401
 #, python-format
 msgid "#Required Answer you entered                                     is greater than the number of answer.                                     Please use a number that is smaller than %d."
 msgstr ""
@@ -207,7 +207,7 @@ msgid "Matrix of Choices (Only One Answers Per Row)"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:475
 #, python-format
 msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
 msgstr ""
@@ -283,7 +283,7 @@ msgid "Answer a Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:92
 #, python-format
 msgid "Error!"
 msgstr ""
@@ -321,10 +321,49 @@ msgid "Comment Field Type"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
-#: code:addons/survey/wizard/survey_answer.py:0
-#: code:addons/survey/wizard/survey_selection.py:0
-#: code:addons/survey/wizard/survey_send_invitation.py:0
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:387
+#: code:addons/survey/survey.py:401
+#: code:addons/survey/survey.py:406
+#: code:addons/survey/survey.py:416
+#: code:addons/survey/survey.py:422
+#: code:addons/survey/survey.py:428
+#: code:addons/survey/survey.py:434
+#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:444
+#: code:addons/survey/survey.py:448
+#: code:addons/survey/survey.py:458
+#: code:addons/survey/survey.py:462
+#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:475
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:482
+#: code:addons/survey/survey.py:484
+#: code:addons/survey/survey.py:642
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:131
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
+#: code:addons/survey/wizard/survey_selection.py:134
+#: code:addons/survey/wizard/survey_selection.py:138
+#: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -466,11 +505,16 @@ msgid "Number"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:444
 #, python-format
 msgid "You must enter one or more menu choices                                 in column heading"
 msgstr ""
 
+#. module: survey
+#: model:ir.actions.act_window,help:survey.action_survey_form1
+msgid "You can create survey for different purposes: recruitment interviews, employee's periodical evaluations, marketing campaigns, etc. A survey is made of pages containing questions of several types: text, multiple choices, etc. You can edit survey manually or click on the 'Edit Survey' for a WYSIWYG interface."
+msgstr ""
+
 #. module: survey
 #: view:survey:0
 #: view:survey.request:0
@@ -539,7 +583,7 @@ msgid "Question Type"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:131
 #, python-format
 msgid "You can not answer this survey more than %s times"
 msgstr ""
@@ -560,7 +604,7 @@ msgid "\n"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:124
 #, python-format
 msgid "You can not answer because the survey is not open"
 msgstr ""
@@ -597,7 +641,7 @@ msgid "Minimum Required Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:484
 #, python-format
 msgid "You must enter one or more menu choices in column heading (white spaces not allowed)"
 msgstr ""
@@ -608,7 +652,7 @@ msgid "Error Message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:482
 #, python-format
 msgid "You must enter one or more menu choices in column heading"
 msgstr ""
@@ -647,13 +691,15 @@ msgid "Survey Requests"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:462
 #, python-format
 msgid "You must enter one or more column heading."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
 #, python-format
 msgid "Please enter an integer value"
 msgstr ""
@@ -669,7 +715,7 @@ msgid "Paragraph of Text"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:428
 #, python-format
 msgid "Maximum Required Answer you                                     entered for your maximum is greater than the number of answer.                                     Please use a number that is smaller than %d."
 msgstr ""
@@ -766,7 +812,7 @@ msgid "When the comment is an invalid format, display this error message"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_selection.py:0
+#: code:addons/survey/wizard/survey_selection.py:138
 #, python-format
 msgid "You can not give more response. Please contact the author of this survey for further assistance."
 msgstr ""
@@ -809,7 +855,7 @@ msgid "Page Number"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:92
 #, python-format
 msgid "Cannot locate survey for the question wizard!"
 msgstr ""
@@ -861,7 +907,7 @@ msgid "Start"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:477
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer"
 msgstr ""
@@ -1087,7 +1133,7 @@ msgid "Survey Response Line"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_selection.py:0
+#: code:addons/survey/wizard/survey_selection.py:134
 #, python-format
 msgid "You can not give response for this survey more than %s times"
 msgstr ""
@@ -1244,7 +1290,7 @@ msgid "Total Started Survey"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:467
 #, python-format
 msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
 msgstr ""
@@ -1295,7 +1341,7 @@ msgid "Answered"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:432
 #, python-format
 msgid "Complete Survey Answer"
 msgstr ""
@@ -1322,7 +1368,7 @@ msgid "Send Invitation"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:792
 #, python-format
 msgid "You cannot select the same answer more than one time"
 msgstr ""
@@ -1394,13 +1440,13 @@ msgid "Required Answer"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:473
 #, python-format
 msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:458
 #, python-format
 msgid "You must enter one or more answer."
 msgstr ""
@@ -1427,13 +1473,13 @@ msgid "Pages"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:406
 #, python-format
 msgid "#Required Answer you entered is                                     greater than the number of answer.                                    Please use a number that is smaller than %d."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:984
 #, python-format
 msgid "You cannot select same answer more than one time'"
 msgstr ""
@@ -1479,13 +1525,13 @@ msgid "Send mail for new user"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:387
 #, python-format
 msgid "You must enter one or more Answer."
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:416
 #, python-format
 msgid "Minimum Required Answer                                     you entered is greater than the number of answer.                                    Please use a number that is smaller than %d."
 msgstr ""
@@ -1503,7 +1549,7 @@ msgid "Page"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:438
 #, python-format
 msgid "Maximum Required Answer is greater                                     than Minimum Required Answer"
 msgstr ""
@@ -1555,7 +1601,7 @@ msgid "Single Textboxes"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:0
+#: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "%sSurvey is not in open state"
 msgstr ""
@@ -1601,7 +1647,7 @@ msgid "Table"
 msgstr ""
 
 #. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:642
 #, python-format
 msgid "You cannot duplicate the resource!"
 msgstr ""
diff --git a/addons/survey/report/survey_analysis_report.py b/addons/survey/report/survey_analysis_report.py
index 34bcd366d0f..a12cac7f639 100644
--- a/addons/survey/report/survey_analysis_report.py
+++ b/addons/survey/report/survey_analysis_report.py
@@ -118,7 +118,7 @@ class survey_analysis(report_rml):
 
         for survey in surv_obj.browse(cr, uid, ids):
             rml += """<story>
-                    <para style="Title">Answer Summary</para>
+                    <para style="Title">Answers Summary</para>
                     <para style="Standard"><font></font></para>
                     <para style="P2">
                       <font color="white"> </font>
@@ -317,7 +317,6 @@ class survey_analysis(report_rml):
                                     rating_weight_sum += int(col_weight[1]) * tot_res
                                     tot_per = round((float(tot_res) * 100) / int(res_count), 2)
                                 else:
-                                    tor_res = 0
                                     tot_per = 0.0
                                 if tot_res:
                                     rml += """<td><para style="answer_bold">""" + tools.ustr(tot_per) + "%(" + tools.ustr(tot_res) + """)</para></td>"""
diff --git a/addons/survey/report/survey_browse_response.py b/addons/survey/report/survey_browse_response.py
index 9fa338b2608..ba34b9c33e9 100644
--- a/addons/survey/report/survey_browse_response.py
+++ b/addons/survey/report/survey_browse_response.py
@@ -25,6 +25,7 @@ from report.interface import report_rml
 from tools import to_xml
 import tools
 import time
+from report import report_sxw
 
 class survey_browse_response(report_rml):
     def create(self, cr, uid, ids, datas, context):
@@ -176,6 +177,7 @@ class survey_browse_response(report_rml):
                     <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="12" spaceBefore="0.0" spaceAfter="1.0"/>
                     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
                     <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+                    <paraStyle name="terp_default_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
                     <paraStyle name="terp_tblheader_General_Centre_simple" fontName="Helvetica" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
                     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="10.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
                     <paraStyle name="terp_tblheader_General_right_simple" fontName="Helvetica" fontSize="10.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -186,6 +188,7 @@ class survey_browse_response(report_rml):
                   <images/>
                   <story>"""
         surv_resp_obj = pooler.get_pool(cr.dbname).get('survey.response')
+        rml_obj=report_sxw.rml_parse(cr, uid, surv_resp_obj._name,context)
         if datas.has_key('form') and datas['form'].has_key('response_ids'):
             response_id = datas['form']['response_ids']
         elif context.has_key('response_id') and context['response_id']:
@@ -195,20 +198,26 @@ class survey_browse_response(report_rml):
 
         surv_resp_line_obj = pooler.get_pool(cr.dbname).get('survey.response.line')
         surv_obj = pooler.get_pool(cr.dbname).get('survey')
-        surv_ans_obj = pooler.get_pool(cr.dbname).get('survey.answer')
 
         for response in surv_resp_obj.browse(cr, uid, response_id):
             for survey in surv_obj.browse(cr, uid, [response.survey_id.id]):
                 tbl_width = float(_tbl_widths.replace('cm', ''))
-                colwidth =  "4.6cm,5cm," + str(tbl_width - 16.4) +"cm,4cm,3cm"
+                colwidth =  "2.5cm,4.8cm," + str(tbl_width - 15.0) +"cm,3.2cm,4.5cm"
                 resp_create = tools.ustr(time.strftime('%d-%m-%Y %I:%M:%S %p', time.strptime(response.date_create.split('.')[0], '%Y-%m-%d %H:%M:%S')))
                 rml += """<blockTable colWidths='""" + colwidth + """' style="Table_heading">
                           <tr>
-                            <td><para style="terp_tblheader_General_Centre">Answer Create Date:- </para></td>
-                            <td><para style="terp_tblheader_General_Centre_simple">""" + to_xml(resp_create) +  """</para></td>
-                            <td><para style="terp_tblheader_General_Centre"></para></td>
-                            <td><para style="terp_tblheader_General_right">Answer By:- </para></td>
-                            <td><para style="terp_tblheader_General_right_simple">""" + to_xml(response.user_id.login or '') + """</para></td>
+                            <td><para style="terp_default_9_Bold">Print Date : </para></td>
+                            <td><para style="terp_default_9">""" + to_xml(rml_obj.formatLang(time.strftime("%Y-%m-%d %H:%M:%S"),date_time=True)) + """</para></td>
+                            <td><para style="terp_default_9"></para></td>
+                            <td><para style="terp_default_9_Bold">Answered by : </para></td>
+                            <td><para style="terp_default_9">""" + to_xml(response.user_id.login or '') + """</para></td>
+                          </tr>
+                          <tr>
+                            <td><para style="terp_default_9"></para></td>
+                            <td><para style="terp_default_9"></para></td>
+                            <td><para style="terp_default_9"></para></td>
+                            <td><para style="terp_default_9_Bold">Answer Date : </para></td>
+                            <td><para style="terp_default_9">""" + to_xml(resp_create) +  """</para></td>
                           </tr>
                         </blockTable><para style="P2"></para>"""
 
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 646f1d30f98..ab8d50323d9 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -271,10 +271,10 @@
                    </group>
                    <newline/>
                    <group expand="0" string="Group By..." colspan="4" col="20">
-	                   <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
+                       <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
-	                   <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
-	                   <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
+                       <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'type'}"/>
+                       <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                    </group>
                </search>
             </field>
@@ -287,6 +287,7 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="survey_tree"></field>
             <field name="search_view_id" ref="survey_search"/>
+            <field name="help">You can create survey for different purposes: recruitment interviews, employee's periodical evaluations, marketing campaigns, etc. A survey is made of pages containing questions of several types: text, multiple choices, etc. You can edit survey manually or click on the 'Edit Survey' for a WYSIWYG interface.</field>
         </record>
 
 
@@ -1104,11 +1105,11 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-	                    <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <separator orientation="vertical"/>
-	                    <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
+                        <filter string="Survey" icon="terp-stock_align_left_24" domain="[]"  context="{'group_by':'survey_id'}"/>
                         <separator orientation="vertical"/>
-	                    <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'state'}"/>
                     </group>
                </search>
             </field>
diff --git a/addons/survey/test/survey_report.yml b/addons/survey/test/survey_report.yml
index adb3ddb28ed..3b54feb2354 100644
--- a/addons/survey/test/survey_report.yml
+++ b/addons/survey/test/survey_report.yml
@@ -1,24 +1,29 @@
 -
-  In order to test the PDF reports defined on a Survey, we will print Survey Analysis Report
-- 
-  !python {model: survey}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.survey.analysis').create(cr, uid, [ref('survey.survey_partner_feedback')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'survey-survey_analysis_report.'+format), 'wb+').write(data)
+ Print the Survey Browse Response Report through the wizard
 -
-  In order to test the PDF reports defined on a Survey, we will print Survey Browse Response Report
-- 
   !python {model: survey}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.survey.browse.response').create(cr, uid, [ref('survey.survey_partner_feedback')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'survey-survey_browse_response_report.'+format), 'wb+').write(data)
+    ctx={}
+    ctx.update({'model': 'survey','active_ids': [(6,0,[ref('survey.survey_partner_feedback')])]})
+    data_dict = {'response_ids' : [(6,0,[ref('survey.survey_partner_feedback')])], 'page_number' : True, 'without_pagebreak': True}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_view_survey_print_answer',wiz_data=data_dict, context=ctx, our_module='survey')
+
+-
+ Print the Survey Analysis Report through the wizard
 -
-  In order to test the PDF reports defined on a Survey, we will print Survey Form Report
-- 
   !python {model: survey}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.survey.form').create(cr, uid, [ref('survey.survey_partner_feedback')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'survey-survey_form_report.'+format), 'wb+').write(data)
\ No newline at end of file
+    ctx={}
+    ctx.update({'model': 'survey','active_ids': [(6,0,[ref('survey.survey_partner_feedback')])]})
+    data_dict = {'survey_ids' : [(6,0,[ref('survey.survey_partner_feedback')])]}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_view_survey_print_statistics',wiz_data=data_dict, context=ctx, our_module='survey')
+
+-
+ Print the Survey Form Report through the wizard
+-
+  !python {model: survey}: |
+    ctx={}
+    ctx.update({'model': 'survey','active_ids': [(6,0,[ref('survey.survey_partner_feedback')])]})
+    data_dict = {'survey_ids' : [(6,0,[ref('survey.survey_partner_feedback')])], 'page_number' : True, 'without_pagebreak': True}
+    from tools import test_reports
+    test_reports.try_report_action(cr, uid, 'action_view_survey_print',wiz_data=data_dict, context=ctx, our_module='survey')
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 90d702f13ed..23315d51c65 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -65,7 +65,10 @@ class survey_question_wiz(osv.osv_memory):
             context = {}
         if view_type in ['form']:
             wiz_id = 0
-            if not context.has_key('sur_name_id'):
+            sur_name_rec = None
+            if 'sur_name_id' in context:
+                sur_name_rec = surv_name_wiz.browse(cr, uid, context['sur_name_id'], context=context)
+            elif 'survey_id' in context:
                 res_data = {
                     'survey_id': context.get('survey_id', False),
                     'page_no': -1,
@@ -76,16 +79,14 @@ class survey_question_wiz(osv.osv_memory):
                 wiz_id = surv_name_wiz.create(cr, uid, res_data)
                 sur_name_rec = surv_name_wiz.browse(cr, uid, wiz_id, context=context)
                 context.update({'sur_name_id' :wiz_id})
-            else:
-                sur_name_rec = surv_name_wiz.browse(cr, uid, context['sur_name_id'], context=context)
-
+  
             if context.has_key('active_id'):
                 context.pop('active_id')
 
             survey_id = context.get('survey_id', False)
             if not survey_id:
                 # Try one more time to find it
-                if sur_name_rec.survey_id:
+                if sur_name_rec and sur_name_rec.survey_id:
                     survey_id = sur_name_rec.survey_id[0]
                 else:
                     # raise osv.except_osv(_('Error!'), _("Cannot locate survey for the question wizard!"))
diff --git a/addons/thunderbird/i18n/de.po b/addons/thunderbird/i18n/de.po
index 92167f60a48..0b867e7881c 100644
--- a/addons/thunderbird/i18n/de.po
+++ b/addons/thunderbird/i18n/de.po
@@ -9,14 +9,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-01 08:14+0000\n"
+"PO-Revision-Date: 2010-12-31 10:37+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
@@ -88,6 +88,23 @@ msgid ""
 "\n"
 "      "
 msgstr ""
+"\n"
+"      Dieses Modul ist erforderlich, um das Thunderbird EMail Plug-in zu "
+"nutzen.\n"
+"\n"
+"       Mit Hilfe des Plugins können Sie eingehende EMails mitsamt Anhängen "
+"zu ausgewählten\n"
+"       OpenERP Objekten archivieren. Sie können dabei einen Partner, eine "
+"Aufgabe, ein Projekt, \n"
+"       ein analytisches Konto oder ein anderes Objekt auswählen und "
+"speichern die ausgewählte\n"
+"       EMail als. eml-Datei zum ausgewählten Objekt in OpenERP ab. "
+"Desweiteren können Sie \n"
+"       ausgehend von einer Email direkt aus Thunderbird Verkaufskontakte, "
+"Stellenbewerbungen \n"
+"       oder projektbezogene Problemstellungen definieren.\n"
+"\n"
+"      "
 
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
@@ -101,6 +118,10 @@ msgid ""
 "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
 "attach it to any existing one in OpenERP or create a new one."
 msgstr ""
+"Das Plugin ermöglicht die Verlinkung einer EMail mit beliebigen OpenERP "
+"Belegen. Sie können hierzu entweder\r\n"
+"die EMail zu vorhandenen Objekten abspeichern oder wahlweise neue Objekte "
+"durch eine Email in OpenERP erstellen."
 
 #. module: thunderbird
 #: model:ir.module.module,shortdesc:thunderbird.module_meta_information
@@ -143,7 +164,7 @@ msgstr "Thunderbird Plug-In Konfiguration"
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_partner
 msgid "Thunderbid Plugin Tools"
-msgstr ""
+msgstr "Thunderbird Plugin Anwendung"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
diff --git a/addons/thunderbird/i18n/es.po b/addons/thunderbird/i18n/es.po
index 1abc6106ffa..b09250c2f62 100644
--- a/addons/thunderbird/i18n/es.po
+++ b/addons/thunderbird/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-27 18:48+0000\n"
+"PO-Revision-Date: 2010-12-28 09:16+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: 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-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/fr_BE.po b/addons/thunderbird/i18n/fr_BE.po
deleted file mode 100644
index f1c043dba6c..00000000000
--- a/addons/thunderbird/i18n/fr_BE.po
+++ /dev/null
@@ -1,83 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* thunderbird
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-26 06:05:17+0000\n"
-"PO-Revision-Date: 2009-11-26 06:05:17+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,copy_to:0
-msgid "Copy To"
-msgstr ""
-
-#. module: thunderbird
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,description:0
-msgid "Description"
-msgstr ""
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,reference:0
-msgid "Reference"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.model,name:thunderbird.model_tinythunderbird_partner
-msgid "Thunderbid mails"
-msgstr ""
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,attachments:0
-msgid "Attached Files"
-msgstr ""
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,res_user_id:0
-msgid "User"
-msgstr ""
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,receiver:0
-msgid "Receiver"
-msgstr ""
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,date:0
-msgid "Date"
-msgstr ""
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,title:0
-msgid "Subject"
-msgstr ""
-
-#. module: thunderbird
-#: code:addons/thunderbird/partner/partner.py:0
-#, python-format
-msgid "Archive"
-msgstr ""
-
-#. module: thunderbird
-#: model:ir.module.module,shortdesc:thunderbird.module_meta_information
-msgid "Thunderbird Interface"
-msgstr ""
-
-#. module: thunderbird
-#: field:tinythunderbird.partner,sender:0
-msgid "Sender"
-msgstr ""
-
diff --git a/addons/thunderbird/i18n/thunderbird.pot b/addons/thunderbird/i18n/thunderbird.pot
index 591e65a1627..22b89b86da7 100644
--- a/addons/thunderbird/i18n/thunderbird.pot
+++ b/addons/thunderbird/i18n/thunderbird.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:18+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:18+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:37+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,13 +22,13 @@ msgid "Thunderbird Plug-in"
 msgstr ""
 
 #. module: thunderbird
-#: help:thunderbird.installer,thunderbird:0
-msgid "Allows you to select an object that you’d like to add to your email and its attachments."
+#: help:thunderbird.installer,plugin_file:0
+msgid "Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."
 msgstr ""
 
 #. module: thunderbird
-#: help:thunderbird.installer,plugin_file:0
-msgid "Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."
+#: help:thunderbird.installer,thunderbird:0
+msgid "Allows you to select an object that you would like to add to your email and its attachments."
 msgstr ""
 
 #. module: thunderbird
@@ -52,8 +52,8 @@ msgid "Installation Manual"
 msgstr ""
 
 #. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "Configure"
+#: field:thunderbird.installer,description:0
+msgid "Description"
 msgstr ""
 
 #. module: thunderbird
@@ -61,20 +61,6 @@ msgstr ""
 msgid "title"
 msgstr ""
 
-#. module: thunderbird
-#: model:ir.module.module,description:thunderbird.module_meta_information
-msgid "\n"
-"      This module is required for the thuderbird plug-in to work\n"
-"      properly.\n"
-"      The Plugin allows you archive email and its attachments to the selected \n"
-"      OpenERP objects. You can select a partner, a task, a project, an analytical\n"
-"      account,or any other object and attach selected mail as .eml file in \n"
-"      attachment of selected record. You can create Documents for crm Lead,\n"
-"      HR Applicant and project issue from selected mails.\n"
-"\n"
-"      "
-msgstr ""
-
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
 #: view:thunderbird.installer:0
@@ -102,19 +88,14 @@ msgstr ""
 msgid "File name"
 msgstr ""
 
-#. module: thunderbird
-#: field:thunderbird.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Installation and Configuration Steps"
 msgstr ""
 
 #. module: thunderbird
-#: field:thunderbird.installer,description:0
-msgid "Description"
+#: field:thunderbird.installer,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
 #. module: thunderbird
@@ -129,6 +110,11 @@ msgstr ""
 msgid "Thunderbid Plugin Tools"
 msgstr ""
 
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Configure"
+msgstr ""
+
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Skip"
@@ -139,3 +125,17 @@ msgstr ""
 msgid "Image"
 msgstr ""
 
+#. module: thunderbird
+#: model:ir.module.module,description:thunderbird.module_meta_information
+msgid "\n"
+"      This module is required for the thuderbird plug-in to work\n"
+"      properly.\n"
+"      The Plugin allows you archive email and its attachments to the selected \n"
+"      OpenERP objects. You can select a partner, a task, a project, an analytical\n"
+"      account,or any other object and attach selected mail as eml file in \n"
+"      attachment of selected record. You can create Documents for crm Lead,\n"
+"      HR Applicant and project issue from selected mails.\n"
+"\n"
+"      "
+msgstr ""
+
diff --git a/addons/users_ldap/i18n/de.po b/addons/users_ldap/i18n/de.po
index abfe541ff3b..d923ff165ca 100644
--- a/addons/users_ldap/i18n/de.po
+++ b/addons/users_ldap/i18n/de.po
@@ -8,25 +8,27 @@ 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-01 07:03+0000\n"
+"PO-Revision-Date: 2010-12-31 11:02+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 
 #. module: users_ldap
 #: 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: users_ldap
 #: field:res.company,ldaps:0
@@ -101,7 +103,7 @@ msgstr "Sequenz"
 #. module: users_ldap
 #: 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: users_ldap
 #: model:ir.module.module,shortdesc:users_ldap.module_meta_information
diff --git a/addons/users_ldap/i18n/es.po b/addons/users_ldap/i18n/es.po
index 6ff40a09221..6d6ae98d691 100644
--- a/addons/users_ldap/i18n/es.po
+++ b/addons/users_ldap/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:45+0000\n"
-"PO-Revision-Date: 2010-12-27 10:46+0000\n"
+"PO-Revision-Date: 2010-12-28 08:43+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: users_ldap
diff --git a/addons/users_ldap/i18n/fr.po b/addons/users_ldap/i18n/fr.po
index 9f77a39dd39..ada4105da35 100644
--- a/addons/users_ldap/i18n/fr.po
+++ b/addons/users_ldap/i18n/fr.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-21 11:19+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-31 10:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: users_ldap
@@ -91,7 +90,7 @@ msgstr "res.company.ldap"
 #. module: users_ldap
 #: model:ir.module.module,description:users_ldap.module_meta_information
 msgid "Adds support for authentication by ldap server"
-msgstr ""
+msgstr "Ajoute le support de l'authetification à travers un serveur LDAP"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
diff --git a/addons/users_ldap/i18n/it.po b/addons/users_ldap/i18n/it.po
index 8ed4bb9d006..50eb5a819f5 100644
--- a/addons/users_ldap/i18n/it.po
+++ b/addons/users_ldap/i18n/it.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-11-27 14:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2011-01-01 22:03+0000\n"
+"Last-Translator: Roberto Onnis <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:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Errore! Non è possibile creare aziende ricorsive."
 
 #. module: users_ldap
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "L'azienda scelta non è fra la aziende permesse per questo utente"
 
 #. module: users_ldap
 #: field:res.company,ldaps:0
@@ -90,7 +90,7 @@ msgstr "res.company.ldap"
 #. module: users_ldap
 #: model:ir.module.module,description:users_ldap.module_meta_information
 msgid "Adds support for authentication by ldap server"
-msgstr ""
+msgstr "Aggiunge il supporto per l'autenticazione mediante un server ldap"
 
 #. module: users_ldap
 #: field:res.company.ldap,sequence:0
@@ -100,7 +100,7 @@ msgstr "Sequenza"
 #. module: users_ldap
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Non è possibile avere due utenti con lo stesso login!"
 
 #. module: users_ldap
 #: model:ir.module.module,shortdesc:users_ldap.module_meta_information
diff --git a/addons/users_ldap/i18n/pl.po b/addons/users_ldap/i18n/pl.po
index efb8d94455c..700cb160bf7 100644
--- a/addons/users_ldap/i18n/pl.po
+++ b/addons/users_ldap/i18n/pl.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-27 14:13+0000\n"
-"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
+"PO-Revision-Date: 2010-12-28 09:09+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: users_ldap
diff --git a/addons/users_ldap/i18n/users_ldap.pot b/addons/users_ldap/i18n/users_ldap.pot
index 39d5d66bc20..feedf6ace4e 100644
--- a/addons/users_ldap/i18n/users_ldap.pot
+++ b/addons/users_ldap/i18n/users_ldap.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:38+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/warning/i18n/de.po b/addons/warning/i18n/de.po
index 88abcb4b4ee..087abf5654a 100644
--- a/addons/warning/i18n/de.po
+++ b/addons/warning/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:45+0000\n"
-"PO-Revision-Date: 2010-12-01 08:19+0000\n"
+"PO-Revision-Date: 2010-12-31 10:33+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:48+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -36,7 +36,7 @@ msgstr "Bachricht bei Beschaffungsauftragsposition"
 #. module: warning
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Fehler! Sie können keine rekursiven Elemente anlegen"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
@@ -165,7 +165,7 @@ msgstr ""
 #: code:addons/warning/warning.py:0
 #, python-format
 msgid "Alert for %s !"
-msgstr ""
+msgstr "Warnhinweis an %s"
 
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
@@ -201,7 +201,7 @@ msgstr "Warnung beim Verkaufsauftrag"
 #. module: warning
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fehler: Falscher EAN code"
 
 #. module: warning
 #: field:res.partner,picking_warn_msg:0
@@ -216,12 +216,12 @@ msgstr "Partner"
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Verkaufsauftrag"
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Auftragsposition"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index 2ef3562f3c7..7e673fbdd71 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/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-27 18:39+0000\n"
+"PO-Revision-Date: 2010-12-28 08:51+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/warning.pot b/addons/warning/i18n/warning.pot
index 3c9348b735a..3766847a6b8 100644
--- a/addons/warning/i18n/warning.pot
+++ b/addons/warning/i18n/warning.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:38+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -56,6 +56,12 @@ msgstr ""
 msgid "Product"
 msgstr ""
 
+#. module: warning
+#: sql_constraint:purchase.order:0
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
 #. module: warning
 #: view:product.product:0
 #: view:res.partner:0
@@ -140,7 +146,7 @@ msgid "Message for Purchase Order"
 msgstr ""
 
 #. module: warning
-#: code:addons/warning/warning.py:0
+#: code:addons/warning/warning.py:32
 #: help:product.product,purchase_line_warn:0
 #: help:product.product,sale_line_warn:0
 #: help:res.partner,invoice_warn:0
@@ -152,7 +158,12 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec
 msgstr ""
 
 #. module: warning
-#: code:addons/warning/warning.py:0
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:213
+#: code:addons/warning/warning.py:246
 #, python-format
 msgid "Alert for %s !"
 msgstr ""
@@ -178,7 +189,12 @@ msgid "Warning on the Purchase Order"
 msgstr ""
 
 #. module: warning
-#: code:addons/warning/warning.py:0
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:134
+#: code:addons/warning/warning.py:164
+#: code:addons/warning/warning.py:214
+#: code:addons/warning/warning.py:247
 #, python-format
 msgid "Warning for %s"
 msgstr ""
diff --git a/addons/web_livechat/i18n/web_livechat.pot b/addons/web_livechat/i18n/web_livechat.pot
index c8631e2f76a..246a948527f 100644
--- a/addons/web_livechat/i18n/web_livechat.pot
+++ b/addons/web_livechat/i18n/web_livechat.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:38+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/web_uservoice/i18n/web_uservoice.pot b/addons/web_uservoice/i18n/web_uservoice.pot
index 3fe8cd89045..72c2d93ab12 100644
--- a/addons/web_uservoice/i18n/web_uservoice.pot
+++ b/addons/web_uservoice/i18n/web_uservoice.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/wiki/i18n/de.po b/addons/wiki/i18n/de.po
index 5f353738ec4..cc0d5747021 100644
--- a/addons/wiki/i18n/de.po
+++ b/addons/wiki/i18n/de.po
@@ -8,14 +8,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-01 07:31+0000\n"
+"PO-Revision-Date: 2010-12-31 11:00+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <kde-i18n-doc@kde.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:45+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -269,6 +269,13 @@ msgid ""
 "keep track for the wiki groups, pages, and history\n"
 "    "
 msgstr ""
+"\n"
+"Diese Anwendung ist das Basismodul für die Verwaltung eines "
+"Dokumenten(wiki)\n"
+"\n"
+"Definieren Sie Wiki Gruppen, Wiki Seiten und verfolgen Sie die Historie der "
+"Dokumente.\n"
+"    "
 
 #. module: wiki
 #: view:wiki.groups:0
diff --git a/addons/wiki/i18n/es.po b/addons/wiki/i18n/es.po
index eab4b0cf288..f69e0660c69 100644
--- a/addons/wiki/i18n/es.po
+++ b/addons/wiki/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:45+0000\n"
-"PO-Revision-Date: 2010-12-27 10:43+0000\n"
+"PO-Revision-Date: 2010-12-28 09:12+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/fr.po b/addons/wiki/i18n/fr.po
index 14453b09705..3213a945aab 100644
--- a/addons/wiki/i18n/fr.po
+++ b/addons/wiki/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-20 03:53+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2010-12-31 10:32+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:44+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+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"
+"Module de base de gestion documentaire ( wiki )\n"
+"\n"
+"suivi des groupes wiki , des pages, et historisation\n"
+"    "
 
 #. module: wiki
 #: view:wiki.groups:0
diff --git a/addons/wiki/i18n/wiki.pot b/addons/wiki/i18n/wiki.pot
index 01fc3cd4ac5..b591fc4c91a 100644
--- a/addons/wiki/i18n/wiki.pot
+++ b/addons/wiki/i18n/wiki.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -129,13 +129,13 @@ msgid "Page Content"
 msgstr ""
 
 #. module: wiki
-#: code:addons/wiki/wiki.py:0
+#: code:addons/wiki/wiki.py:236
 #, python-format
 msgid "Warning !"
 msgstr ""
 
 #. module: wiki
-#: code:addons/wiki/wiki.py:0
+#: code:addons/wiki/wiki.py:236
 #, python-format
 msgid "There are no changes in revisions"
 msgstr ""
@@ -192,7 +192,12 @@ msgid "Keywords"
 msgstr ""
 
 #. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:0
+#: model:ir.actions.act_window,help:wiki.action_wiki
+msgid "With Wiki Pages you can share ideas and questions with your coworkers. You can create a new document that can be linked to one or several applications (CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. There is a basic wiki editing for text format."
+msgstr ""
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "Warning"
 msgstr ""
@@ -361,7 +366,7 @@ msgid "Create Index"
 msgstr ""
 
 #. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:0
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
 msgstr ""
@@ -371,11 +376,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: wiki
-#: model:ir.actions.act_window,help:wiki.action_wiki
-msgid "Wiki Pages  allows you to share ideas and questions with your coworkers. You can create a new document that can be link to one or several applications (CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. There is a basic wiki editing for text format."
-msgstr ""
-
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
 #: view:wiki.create.menu:0
@@ -409,7 +409,7 @@ msgid "Modify By"
 msgstr ""
 
 #. module: wiki
-#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:0
+#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
 #: field:wiki.wiki,toc:0
 #, python-format
 msgid "Table of Contents"
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index e337fc9fdff..654a9ff3898 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -86,7 +86,7 @@ class wiki_create_menu(osv.osv_memory):
                         'action': 'ir.actions.act_window,'+ str(action_id),
                         }, context)
         obj_wiki_group.write(cr, uid, [group_id], {'menu_id':menu_id})        
-        return {}
+        return {'type':  'ir.actions.act_window_close'}
 
 
 wiki_create_menu()
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
index 6b159b7ac30..1e2dae8f92d 100644
--- a/addons/wiki/wizard/wiki_make_index.py
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -87,7 +87,7 @@ class wiki_make_index(osv.osv_memory):
             for rs in result:
                 wiki_pool.write(cr, uid, [rs[1]], {'section':rs[0]})
 
-        return {}
+        return {'type':  'ir.actions.act_window_close'}
 
 wiki_make_index()
 
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index d2458c796ff..215a49f29fe 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from osv import osv
 
 class wiki_wiki_page_open(osv.osv_memory):
     """ wizard Open Page """
diff --git a/addons/wiki_faq/i18n/es.po b/addons/wiki_faq/i18n/es.po
index c05f2f4f4e7..e1ac4cf5ed5 100644
--- a/addons/wiki_faq/i18n/es.po
+++ b/addons/wiki_faq/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:45+0000\n"
-"PO-Revision-Date: 2010-12-27 10:44+0000\n"
+"PO-Revision-Date: 2010-12-28 07:46+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-28 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_faq
diff --git a/addons/wiki_faq/i18n/wiki_faq.pot b/addons/wiki_faq/i18n/wiki_faq.pot
index 7f87e960dcd..2b547b04347 100644
--- a/addons/wiki_faq/i18n/wiki_faq.pot
+++ b/addons/wiki_faq/i18n/wiki_faq.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:40+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:40+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/wiki_faq/wiki_faq.xml b/addons/wiki_faq/wiki_faq.xml
index 046451eec93..ecefecec712 100644
--- a/addons/wiki_faq/wiki_faq.xml
+++ b/addons/wiki_faq/wiki_faq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         <record id="wiki_groups_faq" model="wiki.groups">
             <field name="name">Internal FAQ</field>
             <field name="method">list</field>
diff --git a/addons/wiki_quality_manual/i18n/es.po b/addons/wiki_quality_manual/i18n/es.po
index b0bed5c7fe2..67e9a9a8fcc 100644
--- a/addons/wiki_quality_manual/i18n/es.po
+++ b/addons/wiki_quality_manual/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:45+0000\n"
-"PO-Revision-Date: 2010-12-27 10:44+0000\n"
+"PO-Revision-Date: 2010-12-28 09:12+0000\n"
 "Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: 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-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_quality_manual
diff --git a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot b/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
index b57e24749c6..1bbc43b81cd 100644
--- a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
+++ b/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:40+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:40+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/wiki_quality_manual/wiki_quality_manual.xml b/addons/wiki_quality_manual/wiki_quality_manual.xml
index 9ef451f8a77..e8601867e4a 100644
--- a/addons/wiki_quality_manual/wiki_quality_manual.xml
+++ b/addons/wiki_quality_manual/wiki_quality_manual.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
       <record id="wiki_quality_manual" model="wiki.wiki">
         <field name="name">Quality Manual</field>
         <field name="tags">quality, faq, manual</field>
diff --git a/addons/wiki_sale_faq/i18n/es.po b/addons/wiki_sale_faq/i18n/es.po
index 13bcc93f03f..fda2c17d2dc 100644
--- a/addons/wiki_sale_faq/i18n/es.po
+++ b/addons/wiki_sale_faq/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-11-23 09:37+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-29 10:25+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-31 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq
@@ -27,6 +26,12 @@ msgid ""
 "used to easily tag wiki pages. You should use this application with the "
 "OpenERP web client interface."
 msgstr ""
+"Las páginas wiki le permiten compartir ideas y cuestiones con sus compañeros "
+"de trabajo. Puede crear un nuevo documento que puede ser enlazado a una o "
+"varias aplicaciones (especificaciones de un proyecto, una página de "
+"preguntas frecuentes para el equipo de ventas, etc.). Pueden usarse palabras "
+"claves fácilmente para etiquetar páginas wiki. Debería utilizar esta "
+"aplicación con la interfaz del cliente web de OpenERP."
 
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
@@ -64,6 +69,12 @@ msgid ""
 "the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and "
 ".PDF documents."
 msgstr ""
+"Documentos le da acceso a todos los archivos adjuntos a cualquier registro. "
+"Es un repositorio de todos los documentos como correos, adjuntos "
+"relacionados con proyectos o cualquier otro documento. Desde esta vista, "
+"puede buscar los contenidos de los documentos. OpenERP automáticamente "
+"asigna meta-datos según el registro, como el tercero asociado o los índices "
+"del contenido de archivos .DOC, .ODT, .TXT, .SXW y .PDF."
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information
diff --git a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot b/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
index 400e5fe1ca0..bb7dd731fae 100644
--- a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
+++ b/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:40+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:40+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,11 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid "Wiki pages allow you to share ideas and questions with co-workers. You can create a new document that can be linked to one or several applications (specifications of a project, a FAQ for sales teams, etc.). Keywords can be used to easily tag wiki pages. You should use this application with the OpenERP web client interface."
-msgstr ""
-
 #. module: wiki_sale_faq
 #: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
 #: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
@@ -44,8 +39,8 @@ msgid "This module provides a wiki FAQ Template\n"
 msgstr ""
 
 #. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid "Documents gives you an access to all attached files to any record. It is a repository of all documents such as emails, project related attachments or any other documents. From this view, you can search on the content of the documents. OpenERP automatically assign meta-data based on the record like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and .PDF documents."
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid "Wiki pages allow you to share ideas and questions with coworkers. You can create a new document that can be linked to one or several applications (specifications of a project, FAQ for sales teams, etc.). Keywords can be used to easily tag wiki pages. You should use this application with the OpenERP web client interface."
 msgstr ""
 
 #. module: wiki_sale_faq
@@ -53,3 +48,8 @@ msgstr ""
 msgid "Wiki -Sale - FAQ"
 msgstr ""
 
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid "Documents give you access to all files attached to any record. It is a repository of all documents such as emails, project-related attachments or any other documents. From this view, you can search through the content of the documents. OpenERP automatically assign meta data based on the record like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and .PDF documents."
+msgstr ""
+