[Merge]: Merge with Parent branch

bzr revid: rpa@tinyerp.com-20091130054543-42dsu82bluet4jjy

174 files changed, 9656 insertions, 2589 deletions

diff --git a/addons/account/account.py b/addons/account/account.py
index 7c9405c2d70..0229297c2de 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -103,7 +103,7 @@ class account_payment_term_line(osv.osv):
     _constraints = [
         (_check_percent, _('Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2% '), ['value_amount']),
     ]
-    
+
 account_payment_term_line()
 
 
@@ -418,7 +418,7 @@ class account_account(osv.osv):
             line_obj = self.pool.get('account.move.line')
             account_ids = self.search(cr, uid, [('id', 'child_of', ids)])
             if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
-                raise osv.except_osv(_('Error !'), _('You can not deactivate an account that contains account moves.'))
+                raise osv.except_osv(_('Error !'), _('You can not deactivate an account that contains Ledger Postings.'))
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
 account_account()
 
@@ -1426,11 +1426,11 @@ class account_tax(osv.osv):
         for tax in taxes:
             if (tax.type=='percent') and not tax.include_base_amount:
                 tax_parent_tot += tax.amount
-                
+
         for tax in taxes:
             if (tax.type=='fixed') and not tax.include_base_amount:
                 cur_price_unit -= tax.amount
-                
+
         for tax in taxes:
             if tax.type=='percent':
                 if tax.include_base_amount:
diff --git a/addons/account/account_assert_test.xml b/addons/account/account_assert_test.xml
index a7ff8e236ae..585c6bda124 100644
--- a/addons/account/account_assert_test.xml
+++ b/addons/account/account_assert_test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <assert model="account.move" search="[]" string="For all account moves, the state is valid implies that the sum of credits equals the sum of debits">
+        <assert model="account.move" search="[]" string="For all Ledger Postings, the state is valid implies that the sum of credits equals the sum of debits">
             <test expr="not len(line_id) or line_id[0].state != 'valid' or (sum([l.debit - l.credit for l in line_id]) &lt;= 0.00001)"/>
         </assert>
 
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 0b9b8868ca2..7e289f695ea 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -213,7 +213,7 @@ class account_bank_statement(osv.osv):
                     'period_id': st.period_id.id,
                     'currency_id': st.currency.id,
                 }
-                
+
                 amount = res_currency_obj.compute(cr, uid, st.currency.id,
                         company_currency_id, move.amount, context=context,
                         account=acc_cur)
@@ -249,7 +249,7 @@ class account_bank_statement(osv.osv):
                             'statement_id': st.id,
                             'journal_id': st.journal_id.id,
                             'period_id': st.period_id.id,
-                            'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,                            
+                            'analytic_account_id':newline.analytic_id and newline.analytic_id.id or False,
 
                         }, context=context)
 
@@ -282,7 +282,7 @@ class account_bank_statement(osv.osv):
                         context=context):
                     if line.state <> 'valid':
                         raise osv.except_osv(_('Error !'),
-                                _('Account move line "%s" is not valid') % line.name)
+                                _('Ledger Posting line "%s" is not valid') % line.name)
 
                 if move.reconcile_id and move.reconcile_id.line_ids:
                     torec += map(lambda x: x.id, move.reconcile_id.line_ids)
@@ -501,7 +501,7 @@ class account_bank_statement_reconcile_line(osv.osv):
         'account_id': fields.many2one('account.account', 'Account', required=True),
         'line_id': fields.many2one('account.bank.statement.reconcile', 'Reconcile'),
         'amount': fields.float('Amount', required=True),
-        'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")        
+        'analytic_id': fields.many2one('account.analytic.account',"Analytic Account")
     }
     _defaults = {
         'name': lambda *a: 'Write-Off',
@@ -588,13 +588,13 @@ class account_bank_statement_line(osv.osv):
         'note': fields.text('Notes'),
         'reconcile_amount': fields.function(_reconcile_amount,
             string='Amount reconciled', method=True, type='float'),
-        'sequence': fields.integer('Sequence'),            
+        'sequence': fields.integer('Sequence'),
     }
     _defaults = {
         'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'),
         'date': lambda *a: time.strftime('%Y-%m-%d'),
         'type': lambda *a: 'general',
-        'sequence': lambda *a: 10,        
+        'sequence': lambda *a: 10,
     }
 
 account_bank_statement_line()
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 217af3e22f9..d728eed9ffc 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -346,7 +346,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="view_id" ref="invoice_tree"/>
             <field name="context">{'type':'out_invoice'}</field>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -369,7 +369,7 @@
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -401,7 +401,7 @@
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="account.menu_finance_invoice"/>
         <record id="action_invoice_tree2_new" model="ir.actions.act_window">
@@ -422,7 +422,7 @@
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="account.menu_finance_invoice"/>
 
@@ -444,7 +444,7 @@
             <field eval="False" name="view_id"/>
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="account.menu_finance_invoice"/>
 
@@ -467,7 +467,7 @@
             <field name="domain">[('state','=','draft'),('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -489,7 +489,7 @@
             <field name="domain">[('state','=','proforma2'),('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -511,7 +511,7 @@
             <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree7_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -533,7 +533,7 @@
             <field name="domain">[('state','=','draft'),('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree8_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -555,7 +555,7 @@
             <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree9_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -577,7 +577,7 @@
             <field name="domain">[('state','=','draft'),('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree10_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -599,7 +599,7 @@
             <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree11_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -621,7 +621,7 @@
             <field name="domain">[('state','=','draft'),('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree12_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -643,7 +643,7 @@
             <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>            
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
         </record>
         <record id="action_invoice_tree13_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index c0aeac66920..97cf55e4ff4 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -12,7 +12,7 @@
         <menuitem id="menu_finance_legal_statement" name="Legal Statements" parent="account.menu_finance" sequence="8"/>
         <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>
 
-        <menuitem id="menu_finance_entries" name="Entries Encoding" parent="account.menu_finance" sequence="2"
+        <menuitem id="menu_finance_entries" name="Making Entries" parent="account.menu_finance" sequence="2"
             groups="group_account_user"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurrent Entries" parent="account.menu_finance_entries" sequence="15"/>
 
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 02882fad1e7..cc1f1fcd3b0 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -46,12 +46,12 @@ class account_move_line(osv.osv):
 
         if context.get('date_from', False) and context.get('date_to', False):
             where_move_lines_by_date = " AND " +obj+".move_id in ( select id from account_move  where date >= '" +context['date_from']+"' AND date <= '"+context['date_to']+"')"
-            
+
         if state:
             if state.lower() not in ['all']:
                 where_move_state= " AND "+obj+".move_id in (select id from account_move where account_move.state = '"+state+"')"
-        
-                
+
+
         if context.get('periods', False):
             ids = ','.join([str(x) for x in context['periods']])
             return obj+".state<>'draft' AND "+obj+".period_id in (SELECT id from account_period WHERE fiscalyear_id in (%s) AND id in (%s)) %s %s" % (fiscalyear_clause, ids,where_move_state,where_move_lines_by_date)
@@ -292,7 +292,7 @@ class account_move_line(osv.osv):
         if not len(res):
             return [('id', '=', '0')]
         return [('id', 'in', [x[0] for x in res])]
-    
+
     def _invoice_search(self, cursor, user, obj, name, args):
         if not len(args):
             return []
@@ -553,7 +553,7 @@ class account_move_line(osv.osv):
 
     def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context={}):
         id_set = ','.join(map(str, ids))
-        
+
         lines = self.browse(cr, uid, ids, context=context)
         unrec_lines = filter(lambda x: not x['reconcile_id'], lines)
         credit = debit = 0.0
@@ -829,7 +829,7 @@ class account_move_line(osv.osv):
                 if res:
                     if res[1] != 'draft':
                         raise osv.except_osv(_('UserError'),
-                                _('The account move (%s) for centralisation ' \
+                                _('The Ledger Posting (%s) for centralisation ' \
                                         'has been confirmed!') % res[2])
                     vals['move_id'] = res[0]
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5cbc8ef8d4a..8b2d942847b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -336,7 +336,7 @@
                         <page string="Entry encoding">
                             <field colspan="4" name="line_ids" nolabel="1">
                                 <tree editable="bottom" string="Statement lines">
-                                    <field name="sequence"/>                                
+                                    <field name="sequence"/>
                                     <field name="date"/>
                                     <field name="ref"/>
                                     <field name="name"/>
@@ -358,7 +358,7 @@
                                     <field name="amount"/>
                                     <field context="{'partner_id':partner_id,'amount':amount,'account_id':account_id,'currency_id': parent.currency,'journal_id':parent.journal_id, 'date':date}" name="reconcile_id"/>
                                     <field name="ref"/>
-                                    <field name="sequence"/>                                    
+                                    <field name="sequence"/>
                                     <separator colspan="4" string="Notes"/>
                                     <field colspan="4" name="note" nolabel="1"/>
                                 </form>
@@ -392,7 +392,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_bank_statement_tree2" model="ir.actions.act_window">
@@ -458,7 +458,6 @@
                     <field name="code" select="1"/>
                     <field name="sequence"/>
                     <field name="sign"/>
-            
                     <field name="close_method"/>
                     <field name="partner_account"/>
                 </form>
@@ -657,7 +656,7 @@
             <field eval="True" name="object"/>
         </record>
 
-        <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries Encoding by Line"/>
+        <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Making Entries by Line"/>
         <menuitem icon="STOCK_JUSTIFY_FILL" action="action_move_journal_line_form" id="menu_action_move_journal_line_form" parent="account.menu_finance_entries" type="wizard" sequence="5"/>
 
         <!--
@@ -793,13 +792,13 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">account.move.line.select</field>
             <field name="model">account.move.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Move Lines">
+                <search string="Search Entry Lines">
                     <group col='10' colspan='4'>
                         <filter icon="terp-account" string="Draft" domain="[('state','=','draft')]" help="Draft Move Lines"/>
                         <filter icon="terp-account" string="Posted" domain="[('state','=','valid')]" help="Posted Move Lines"/>
@@ -819,9 +818,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tree"/>
-            <field name="search_view_id" ref="view_account_move_line_filter"/>            
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
-        
+
         <record id="action_view_move_line" model="ir.actions.act_window">
             <field name="name">Lines to reconcile</field>
             <field name="res_model">account.move.line</field>
@@ -830,7 +829,7 @@
             <field name="domain">[('account_id.reconcile', '=', True),('reconcile_id','=',False)]</field>
             <field eval="False" name="view_id"/>
             <field eval="True" name="filter"/>
-            <field name="search_view_id" ref="view_account_move_line_filter"/>            
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
 
         <!--
@@ -886,7 +885,7 @@
                             <field name="debit" select="1"/>
                             <field name="credit" select="1"/>
                             <field name="date" select="1"/>
-                            
+
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
@@ -962,12 +961,12 @@
         <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
-            <field name="name">Entries Encoding by Move</field>
+            <field name="name">Making Entries by Move</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_tree"/>
-            <field name="search_view_id" ref="view_account_move_filter"/>            
+            <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
 
         <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
@@ -1092,7 +1091,7 @@
         <!--
     TODO:
         Print Journal (and change state)
-        Close Journal (and verify that there is no draft move lines)
+        Close Journal (and verify that there is no draft Entry Lines)
 -->
 
         <record id="view_journal_period_tree" model="ir.ui.view">
@@ -1346,7 +1345,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','running')]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_subscription_form_new" model="ir.actions.act_window">
@@ -1414,7 +1413,7 @@
         </record>
 
         <record id="action_tax_code_line_open" model="ir.actions.act_window">
-            <field name="name">account.move.line</field>
+            <field name="name">Account Entry Lines</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 9e06d1dd788..2c91c8c53c2 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -85,10 +85,10 @@
 
 
         <!-- account.move validate -->
-        <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Account Moves"/>
+        <wizard id="wizard_validate_account_moves" menu="False" model="account.move" name="account.move.validate" string="Validate Ledger Postings"/>
         <menuitem action="wizard_validate_account_moves" id="menu_validate_account_moves" parent="account.menu_finance_periodical_processing" type="wizard"/>
 
-        <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Account Moves"/>
+        <wizard id="wizard_validate_account_moves_line" menu="True" model="account.move.line" name="account.move_line.validate" string="Validate Ledger Postings"/>
 
 		<!-- Use Models -->
         <wizard string="Create Entries From Models" model="account.model" name="account_use_models" menu="False" id="wizard_account_use_model"/>
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index 06d1fe9f5d2..a2a36e5ad40 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:12+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-30 01:35+0000\n"
+"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -24,7 +25,7 @@ msgstr "Nom intern"
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Codi compte impostos"
+msgstr "Codi impost comptable"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -415,7 +416,7 @@ msgstr "Conciliació del pagament"
 #. module: account
 #: model:account.journal,name:account.expenses_journal
 msgid "Journal de frais"
-msgstr ""
+msgstr "Diari de despeses"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
@@ -1169,7 +1170,7 @@ msgstr "wizard.multi.charts.accounts"
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Diari de vendes"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -1596,7 +1597,7 @@ msgstr "Obre per la conciliació"
 #. module: account
 #: model:account.journal,name:account.bilan_journal
 msgid "Journal d'ouverture"
-msgstr ""
+msgstr "Diari d'obertura"
 
 #. module: account
 #: selection:account.tax,tax_group:0
@@ -1934,7 +1935,7 @@ msgstr "Paga factura"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Error: Número BVR no vàlid (checksum erroni)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
@@ -2394,7 +2395,7 @@ msgstr "Plantilla del pla comptable"
 #. module: account
 #: model:account.journal,name:account.refund_sales_journal
 msgid "Journal d'extourne"
-msgstr ""
+msgstr "Diari d'inversió"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -3228,7 +3229,7 @@ msgstr "Compte"
 #. module: account
 #: model:account.journal,name:account.bank_journal
 msgid "Journal de Banque CHF"
-msgstr ""
+msgstr "Diari de banc"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,state:0
@@ -3361,7 +3362,7 @@ msgstr "Codi impost arrel"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "Error: La referència BVR és necessària."
 
 #. module: account
 #: field:account.tax.code,notprintable:0
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index def3f85f6f3..fcab33df1f1 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:50+0000\n"
-"Last-Translator: pmgmarques <pmgmarques@gmail.com>\n"
+"PO-Revision-Date: 2009-11-28 23:48+0000\n"
+"Last-Translator: Paulino <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: 2009-11-18 04:37+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -24,7 +24,7 @@ msgstr "Nome Interno"
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Código de imposto da conta"
+msgstr "Código do imposto da conta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
@@ -35,17 +35,17 @@ msgstr "Facturas de fornecedores não pagas"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr "Codificações de entrada"
+msgstr "Introdução de movimentos"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Especifique a mensagem para o relatório de pagamentos em atraso"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr "Confirmar declaração de rascunho"
+msgstr "Confirmar extracto rascunho"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -55,12 +55,12 @@ msgstr "Activo"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "A moeda usada para inserir declaração"
+msgstr "A divisa usada para inserir o extrato"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -73,11 +73,14 @@ msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
 msgstr ""
+"Esta conta será usada para valorizar as entradas de existências para a "
+"categoria do produto actual."
 
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
+"Manténha vazio para usar o período da data de validação (da factura)."
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,reconcile:0
@@ -87,14 +90,14 @@ msgstr "Resultado da reconciliação"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "Entradas em aberto"
+msgstr "Movimentos por reconciliar"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "Código base"
+msgstr "Código Base"
 
 #. module: account
 #: view:account.account:0
@@ -115,7 +118,7 @@ msgstr "Pai"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr "Voucher do jornal"
+msgstr "Voucher do Diário"
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -139,7 +142,7 @@ msgstr "Anular conciliação de movimentos"
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr ""
+msgstr "Erro! A duração do(s) período(s) não é/são válida(s). "
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
new file mode 100644
index 00000000000..677acee6f34
--- /dev/null
+++ b/addons/account/i18n/sk.po
@@ -0,0 +1,5932 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-11-27 12:40+0000\n"
+"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-28 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account
+#: field:account.tax.template,description:0
+msgid "Internal Name"
+msgstr "Interný názov"
+
+#. module: account
+#: view:account.tax.code:0
+msgid "Account Tax Code"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree9
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
+msgid "Unpaid Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_entries
+msgid "Entries Encoding"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
+msgid "Specify The Message for the Overdue Payment Report."
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement from draft"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_asset
+msgid "Asset"
+msgstr "Aktíva"
+
+#. module: account
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account
+#: help:account.journal,currency:0
+msgid "The currency used to enter statement"
+msgstr ""
+
+#. module: account
+#: wizard_view:account_use_models,init_form:0
+msgid "Select Message"
+msgstr "Výber správy"
+
+#. module: account
+#: help:product.category,property_account_income_categ:0
+msgid ""
+"This account will be used to value incoming stock for the current product "
+"category"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,period_id:0
+msgid "Keep empty to use the period of the validation(invoice) date."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.automatic.reconcile,reconcile:0
+msgid "Reconciliation result"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+msgid "Unreconciled entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_code_id:0
+#: field:account.tax,base_code_id:0
+#: field:account.tax.template,base_code_id:0
+msgid "Base Code"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Account Statistics"
+msgstr "Štatistiky účtu"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_vat_declaration
+#: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
+msgid "Print Taxes Report"
+msgstr "Tlač reportu daní"
+
+#. module: account
+#: field:account.account,parent_id:0
+msgid "Parent"
+msgstr "Rodič"
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Journal Voucher"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,residual:0
+msgid "Residual"
+msgstr "Zostatok"
+
+#. 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
+#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
+#: model:ir.ui.menu,name:account.menu_unreconcile_select
+msgid "Unreconcile entries"
+msgstr ""
+
+#. module: account
+#: constraint:account.period:0
+msgid "Error ! The duration of the Period(s) is/are invalid. "
+msgstr "Chyba! Obdobie trvania je / sú neplatné. "
+
+#. module: account
+#: view:account.bank.statement.reconcile:0
+#: field:account.bank.statement.reconcile,line_ids:0
+#: field:account.move,line_id: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
+#: model:ir.ui.menu,name:account.menu_action_move_line_form
+msgid "Entries"
+msgstr "Položky"
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+msgid "Debit Centralisation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
+msgid "Confirm draft invoices"
+msgstr "Potvrdiť návrh faktúry"
+
+#. 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 ""
+"Deň v mesiaci je nastavený ako -1 na posledný deň aktuálneho mesiaca. Ak je "
+"nastavená hodnota 1 (kladná hodnota) ,tá určuje deň nasledujúci mesiac. "
+"Nastavte 0 pre čistej dní (inak je to na začiatku mesiaca)."
+
+#. module: account
+#: view:account.move:0
+msgid "Total Credit"
+msgstr ""
+
+#. module: account
+#: field:account.config.wizard,charts:0
+msgid "Charts of Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_move_line_select
+msgid "Move line select"
+msgstr "Presunúť vybraný riadok"
+
+#. module: account
+#: rml:account.journal.period.print:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Entry label"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_model_line
+msgid "Account Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum_period:0
+msgid "Period Sum"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Compute Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.aged.trial.balance,init:0
+msgid "Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
+msgid "Recurrent Entries"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,amount:0
+#: field:account.bank.statement.line,amount:0
+#: field:account.bank.statement.reconcile.line,amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.tax,amount:0
+#: field:account.move,amount:0
+#: field:account.tax,amount:0
+#: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
+msgid "Amount"
+msgstr "Suma"
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger
+#: model:ir.actions.wizard,name:account.wizard_third_party_ledger
+#: model:ir.ui.menu,name:account.menu_third_party_ledger
+msgid "Partner Ledger"
+msgstr "Účtovná kniha partnera"
+
+#. module: account
+#: field:product.template,supplier_taxes_id:0
+msgid "Supplier Taxes"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Total Debit"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Accounting Entries-"
+msgstr ""
+
+#. module: account
+#: help:account.journal,view_id:0
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tell Open ERP 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
+#: 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
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_overdue
+#: view:res.company:0
+msgid "Overdue Payments"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.analytic.account.analytic.check.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
+#: wizard_view:account.analytic.account.cost_ledger.report,init:0
+#: wizard_view:account.analytic.account.inverted.balance.report,init:0
+#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
+#: wizard_view:account.vat.declaration,init:0
+msgid "Select period"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,origin:0
+#: field:account.invoice.line,origin:0
+msgid "Origin"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Move Name"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Reference"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.subscription.generate,init:0
+msgid "Subscription Compute"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+msgid "Account Num."
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Delta Debit"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr "Daň"
+
+#. module: account
+#: rml:account.general.journal:0
+msgid "Debit Trans."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,account_id:0
+#: field:account.invoice.line,account_analytic_id:0
+#: field:account.move.line,analytic_account_id:0
+#: field:report.hr.timesheet.invoice.journal,account_id:0
+msgid "Analytic Account"
+msgstr "Analytický účet"
+
+#. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Children"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
+#: field:account.journal,name:0
+msgid "Journal Name"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on invoices"
+msgstr "Popis na faktúrach"
+
+#. module: account
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Chyba! Nemôžete vytvárať rekurzívne analytické účty."
+
+#. module: account
+#: field:account.bank.statement.reconcile,total_entry:0
+msgid "Total entries"
+msgstr "Položky spolu"
+
+#. 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 "Zdroj účtu"
+
+#. module: account
+#: field:account.journal,update_posted:0
+msgid "Allow Cancelling Entries"
+msgstr "Povoliť zrušenie položiek"
+
+#. module: account
+#: model:process.transition,name:account.process_transition_paymentorderbank0
+#: model:process.transition,name:account.process_transition_paymentorderreconcilation0
+msgid "Payment Reconcilation"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.expenses_journal
+msgid "Journal de frais"
+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
+#: rml:account.overdue:0
+msgid "Date:"
+msgstr "Dátum:"
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Negative"
+msgstr ""
+
+#. module: account
+#: rml:account.partner.balance:0
+msgid "(Account/Partner) Name"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Contra"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,state:0
+#: field:account.bank.statement,state:0
+#: field:account.invoice,state:0
+#: view:account.move:0
+#: view:account.move.line:0
+#: view:account.subscription:0
+msgid "State"
+msgstr "Štát"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree13
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
+msgid "Unpaid Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Special Computation"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
+msgid "Confirm statement with/without reconciliation from draft statement"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.bank.reconcile,init:0
+#: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
+#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
+msgid "Bank reconciliation"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+#: field:account.model,ref:0
+#: field:account.move,ref:0
+#: rml:account.overdue:0
+#: field:account.subscription,ref:0
+msgid "Ref"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use In"
+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
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodical Processing"
+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
+#: view:account.invoice:0
+msgid "Supplier invoice"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_reconcilepaid0
+#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
+msgid "Reconcile Paid"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.chart,init,target_move:0
+msgid "Target Moves"
+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
+#: field:account.invoice,reconciled:0
+msgid "Paid/Reconciled"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,close_method:0
+msgid "Deferral Method"
+msgstr ""
+
+#. module: account
+#: field:account.tax.template,include_base_amount:0
+msgid "Include in Base Amount"
+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 ""
+
+#. module: account
+#: view:account.invoice.line:0
+msgid "Line"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+msgid "J.C. or Move name"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,applicable_type:0
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
+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
+#: model:ir.model,name:account.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+msgid "Printing Date"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+msgid "Mvt"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_aged_trial_balance
+#: model:ir.ui.menu,name:account.menu_aged_trial_balance
+msgid "Aged Partner Balance"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Entry Controls"
+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
+#: wizard_view:account.analytic.account.chart,init:0
+#: wizard_view:account.analytic.line,init:0
+msgid "(Keep empty to open the current situation)"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account
+msgid "Fiscal Position Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date:0
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr ""
+
+#. module: account
+#: view:account.move.reconcile:0
+msgid "Account Entry Reconcile"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.bank.reconcile,init,open:0
+msgid "Open for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,init_full,writeoff:0
+#: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
+msgid "Write-Off amount"
+msgstr ""
+
+#. module: account
+#: help:account.fiscalyear,company_id:0
+msgid "Keep empty if the fiscal year belongs to several companies."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_analytic_accounting
+msgid "Analytic Accounting"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,line_ids:0
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.ui.menu,name:account.next_id_41
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "month"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,comment:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+msgid "Customer Refund"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.chart,init:0
+msgid "Select the Period for Analysis"
+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
+#: help:res.partner,credit:0
+msgid "Total amount this customer owes you."
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "St."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_tax_code_line_open
+msgid "account.move.line"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_supplieranalyticcost0
+msgid "Analytic Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,field:0
+msgid "Field Name"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sign:0
+#: field:account.tax.code.template,sign:0
+msgid "Sign for parent"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,end_journal_period_id:0
+msgid "End of Year Entries Journal"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchase Properties"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paymententries0
+msgid "Can be draft or validated"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.pay,init,reconcile:0
+msgid "Partial Payment"
+msgstr ""
+
+#. module: account
+#: wizard_view:account_use_models,create:0
+msgid "Move Lines Created."
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,state:0
+#: field:account.journal.period,state:0
+#: field:account.move,state:0
+#: field:account.move.line,state:0
+#: field:account.period,state:0
+#: field:account.subscription,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Period to"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,partner_account:0
+msgid "Partner account"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.subscription.generate,init:0
+msgid "Generate entries before:"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+#: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
+msgid "Cost Ledger"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "(Keep empty for all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_lines:0
+msgid "Move Lines"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_config_wizard
+msgid "account.config.wizard"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree
+#: model:ir.ui.menu,name:account.report_account_analytic_journal_print
+msgid "Account cost and revenue by journal"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,user_type:0
+msgid ""
+"These types are defined according to your country. The type contain more "
+"information about the account and it's specificities."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "6"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_30
+msgid "Bank Reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_account_template
+msgid "Templates for Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
+#: model:ir.model,name:account.model_account_analytic_account
+#: model:ir.ui.menu,name:account.account_analytic_def_account
+msgid "Analytic Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.print.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_print_journal
+#: model:ir.ui.menu,name:account.menu_print_journal
+msgid "Print Journal"
+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
+#: wizard_button:account.invoice.refund,init,cancel_invoice:0
+msgid "Cancel Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,required:0
+msgid "Required"
+msgstr ""
+
+#. module: account
+#: field:product.category,property_account_expense_categ:0
+#: field:product.template,property_account_expense:0
+msgid "Expense Account"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,addendum,journal_id:0
+msgid "Write-Off Journal"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,amount_currency:0
+#: field:account.move.line,amount_currency:0
+msgid "Amount Currency"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_categ:0
+msgid "Expense Category Account"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,fy2_id:0
+msgid "New Fiscal Year"
+msgstr ""
+
+#. module: account
+#: help:account.tax,tax_group:0
+msgid ""
+"If a default tax is given in the partner it only overrides taxes from "
+"accounts (or products) in the same group."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
+msgid "Fiscal Year to Open"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Select Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,quantity:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: field:account.analytic.line,unit_amount:0
+#: rml:account.invoice:0
+#: field:account.invoice.line,quantity:0
+#: field:account.model.line,quantity:0
+#: field:account.move.line,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,date_to:0
+#: wizard_field:account.general.ledger.report,checktype,date_to:0
+#: wizard_field:account.partner.balance.report,init,date2:0
+#: wizard_field:account.third_party_ledger.report,init,date2:0
+msgid "End date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,base_amount:0
+msgid "Base Code Amount"
+msgstr ""
+
+#. module: account
+#: help:account.journal,user_id:0
+msgid "The user responsible for this journal"
+msgstr ""
+
+#. module: account
+#: field:account.journal,default_debit_account_id:0
+msgid "Default Debit Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Entries by Statements"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_analyticinvoice0
+msgid "analytic Invoice"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,period_id:0
+#: field:account.bank.statement,period_id:0
+#: wizard_field:account.central.journal.report,init,period_id:0
+#: view:account.fiscalyear:0
+#: rml:account.general.journal:0
+#: wizard_field:account.general.journal.report,init,period_id:0
+#: wizard_field:account.invoice.pay,init,period_id:0
+#: field:account.journal.period,period_id:0
+#: field:account.move,period_id:0
+#: wizard_field:account.move.journal,init,period_id:0
+#: field:account.move.line,period_id:0
+#: wizard_field:account.move.validate,init,period_id:0
+#: view:account.period:0
+#: wizard_field:account.print.journal.report,init,period_id:0
+#: field:account.subscription,period_nbr:0
+msgid "Period"
+msgstr ""
+
+#. module: account
+#: rml:account.partner.balance:0
+msgid "Grand total"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_accounting
+msgid "Financial Accounting"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Net Total:"
+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.account.template,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
+#: model:ir.model,name:account.model_account_fiscal_position
+#: field:res.partner,property_account_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,product_uom_id:0
+#: field:account.move.line,product_uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.third_party_ledger.report,init,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
+#: model:ir.model,name:account.model_account_fiscal_position_tax
+msgid "Fiscal Position Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2_new
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2_new
+msgid "New Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,init,amount:0
+msgid "Amount paid"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,type:0
+#: model:process.transition,name:account.process_transition_customerinvoice0
+#: model:process.transition,name:account.process_transition_suppliercustomerinvoice0
+msgid "Customer Invoice"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.open_closed_fiscalyear,init:0
+msgid "Choose Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:account.sequence.fiscalyear,sequence_main_id:0
+msgid "Main Sequence"
+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
+#: rml:account.tax.code.entries:0
+msgid "Voucher Nb"
+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
+#: field:account.bank.statement.reconcile,total_new:0
+msgid "Total write-off"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Compute Code for Taxes included prices"
+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
+#: 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
+#: field:account.chart.template,property_account_income_categ:0
+msgid "Income Category Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.analytic_account_form
+#: model:ir.ui.menu,name:account.account_analytic_form
+msgid "New Analytic 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
+#: rml:account.invoice:0
+#: field:account.invoice.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Period from :"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.sales_journal
+msgid "Journal de vente"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,amount_currency:0
+msgid "The amount expressed in an optional other currency."
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,name:0
+msgid "Fiscal Position Template"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term,line_ids:0
+msgid "Terms"
+msgstr ""
+
+#. module: account
+#: rml:account.vat.declaration:0
+msgid "Tax Report"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.analytic.account.chart,init,open:0
+#: wizard_button:account.chart,init,open:0
+msgid "Open Charts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.fiscalyear.close.state,init:0
+msgid "Are you sure you want to close the fiscal year ?"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Bank Receipt"
+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
+#: model:process.transition,name:account.process_transition_invoiceimport0
+msgid "Invoice import"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
+msgid "Standard entry"
+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
+#: field:account.account,company_currency_id:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Fiscal Position Template Account Mapping"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.reconcile,init_partial,addendum:0
+msgid "Reconcile With Write-Off"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,tax_amount:0
+msgid "Tax/Base Amount"
+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.bank.statement,balance_end_real:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,name:0
+msgid "Line Name"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Analytic Credit"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,reconcile_partial_id:0
+#: wizard_button:account.move.line.reconcile,init_partial,partial:0
+msgid "Partial Reconcile"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,reconcile,unreconciled:0
+msgid "Not reconciled transactions"
+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
+#: view:account.config.wizard:0
+msgid "Continue"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value:0
+msgid "Value"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0
+#: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0
+msgid "Write-Off account"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,model_id:0
+#: field:account.subscription,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
+msgid "Close a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralised counterpart"
+msgstr ""
+
+#. module: account
+#: view:wizard.company.setup:0
+msgid "Message"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Select invoices you want to pay and manages advances"
+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.analytic.account,type:0
+#: field:account.journal,view_id:0
+msgid "View"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,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.move.line,analytic_lines:0
+#: model:ir.model,name:account.model_account_analytic_line
+msgid "Analytic lines"
+msgstr ""
+
+#. module: account
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingentries0
+#: model:process.node,note:account.process_node_supplieraccountingentries0
+msgid "Validated accounting entries."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.line.unreconcile,init:0
+#: wizard_view:account.reconcile.unreconcile,init: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
+#: model:process.node,name:account.process_node_electronicfile0
+msgid "Electronic File"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Credit"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,tax_line:0
+msgid "Tax Lines"
+msgstr ""
+
+#. module: account
+#: field:ir.sequence,fiscal_ids:0
+msgid "Sequences"
+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
+#: wizard_field:account.automatic.reconcile,init,journal_id:0
+#: field:account.bank.statement,journal_id:0
+#: wizard_field:account.central.journal.report,init,journal_id:0
+#: wizard_field:account.general.journal.report,init,journal_id:0
+#: field:account.invoice,journal_id:0
+#: field:account.journal.period,journal_id:0
+#: field:account.model,journal_id:0
+#: field:account.move,journal_id:0
+#: wizard_field:account.move.bank.reconcile,init,journal_id:0
+#: wizard_field:account.move.journal,init,journal_id:0
+#: field:account.move.line,journal_id:0
+#: wizard_field:account.move.validate,init,journal_id:0
+#: wizard_field:account.print.journal.report,init,journal_id:0
+#: field:fiscalyear.seq,journal_id:0
+#: model:ir.actions.report.xml,name:account.account_journal
+#: model:ir.model,name:account.model_account_journal
+#: wizard_field:populate_statement_from_inv,init,journal_id:0
+#: field:report.hr.timesheet.invoice.journal,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_id:0
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.account,check_history:0
+msgid "Display History"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.third_party_ledger.report,init,date1:0
+msgid "        Start date"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,display_account:0
+#: wizard_field:account.general.ledger.report,checktype,display_account:0
+msgid "Display accounts "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_reconcile_line
+msgid "Statement reconcile line"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement.reconcile:0
+#: field:account.bank.statement.reconcile,line_new_ids:0
+#: wizard_view:account.move.line.reconcile,init_full:0
+#: wizard_view:account.move.line.reconcile,init_partial:0
+msgid "Write-Off"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank:0
+msgid ""
+"The partner bank account to pay\n"
+"Keep empty to use the default"
+msgstr ""
+
+#. module: account
+#: field:res.partner,debit:0
+msgid "Total Payable"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.fiscalyear.close.state,init,close:0
+msgid "Close states"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_wizard_company_setup
+msgid "wizard.company.setup"
+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
+#: field:account.journal,refund_journal:0
+msgid "Refund Journal"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+msgid "Supplier"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_amount:0
+msgid "Tax Code Amount"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,sign:0
+msgid "Positive"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.general.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_general_journal
+#: model:ir.ui.menu,name:account.menu_general_journal
+msgid "Print General Journal"
+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
+#: field:account.invoice,move_id:0
+msgid "Invoice Movement"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
+#: model:ir.ui.menu,name:account.menu_wizard
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_legal_statement
+msgid "Legal Statements"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,parent_id:0
+#: field:account.tax.code.template,parent_id:0
+msgid "Parent Code"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.reconcile.select,init,open:0
+msgid "Open for reconciliation"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.bilan_journal
+msgid "Journal d'ouverture"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,tax_group:0
+#: selection:account.tax.template,tax_group:0
+msgid "VAT"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Account n°"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the expense account"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,account_ids:0
+msgid "Account to reconcile"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: field:account.model.line,partner_id:0
+#: field:account.move.line,partner_id:0
+msgid "Partner Ref."
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance.report,init,result_selection:0
+#: selection:account.third_party_ledger.report,init,result_selection:0
+msgid "Receivable and Payable Accounts"
+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
+#: selection:account.journal,type:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Purchase"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Total quantity"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,date_due:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.period.close,init:0
+#: wizard_button:account.period.close,init,close:0
+msgid "Close Period"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Due"
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+msgid "Third party"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Type Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
+#: view:account.journal.period:0
+#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
+#: model:ir.ui.menu,name:account.menu_action_account_journal_period_tree
+msgid "Journals"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Max Qty:"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.refund,init,refund:0
+msgid "Refund Invoice"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_period_tree
+#: model:ir.actions.wizard,name:account.wizard_period_close
+#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
+msgid "Close a Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
+msgid "Costs & Revenues"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Account Number"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Skip"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,sequence:0
+msgid "Gives the sequence order when displaying a list of account types."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Re-Open"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.fiscalyear.close,init:0
+msgid "Are you sure you want to create entries?"
+msgstr ""
+
+#. module: account
+#: field:account.tax,include_base_amount:0
+msgid "Include in base amount"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Delta Credit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
+#: model:ir.actions.wizard,name:account.wizard_unreconcile
+msgid "Unreconcile Entries"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_supplierdraftinvoices0
+msgid "Pre-generated invoice from control"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
+msgid "Cost Legder for period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
+msgid "New Statement"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.chart,init,from_date:0
+#: wizard_field:account.analytic.line,init,from_date:0
+msgid "From"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_reconciliation0
+#: model:process.node,note:account.process_node_supplierreconciliation0
+msgid "Reconciliation of entries from invoice(s) and payment(s)"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.central.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_central_journal
+#: model:ir.ui.menu,name:account.menu_central_journal
+msgid "Print Central Journal"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.aged.trial.balance,init,period_length:0
+msgid "Period length (days)"
+msgstr ""
+
+#. module: account
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type: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
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+#: selection:account.tax,type_tax_use:0
+#: selection:account.tax.template,type_tax_use:0
+msgid "Sale"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.account.balance.report,account_selection,checktype:0
+#: wizard_button:account.general.ledger.report,account_selection,checktype:0
+msgid "Next"
+msgstr ""
+
+#. module: account
+#: help:res.partner,property_account_position:0
+msgid ""
+"The fiscal position will determine taxes and the accounts used for the the "
+"partner."
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+msgid "Date or Code"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "to :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,init_full,debit:0
+#: wizard_field:account.move.line.reconcile,init_partial,debit:0
+msgid "Debit amount"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.account.balance.report,checktype,report:0
+#: wizard_button:account.analytic.account.analytic.check.report,init,report:0
+#: wizard_button:account.analytic.account.balance.report,init,report:0
+#: wizard_button:account.analytic.account.cost_ledger.report,init,report:0
+#: wizard_button:account.analytic.account.inverted.balance.report,init,report:0
+#: wizard_button:account.analytic.account.journal.report,init,report:0
+#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,report:0
+#: wizard_button:account.central.journal.report,init,print:0
+#: wizard_button:account.general.journal.report,init,print:0
+#: wizard_button:account.general.ledger.report,checktype,checkreport:0
+#: wizard_button:account.partner.balance.report,init,report:0
+#: wizard_button:account.print.journal.report,init,print:0
+#: wizard_button:account.third_party_ledger.report,init,checkreport:0
+msgid "Print"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,date_from:0
+msgid "Start date"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.refund_expenses_journal
+msgid "x Expenses Credit Notes Journal"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,type:0
+#: field:account.bank.statement.line,type:0
+#: field:account.invoice,type:0
+#: field:account.journal,type:0
+#: field:account.move,type:0
+#: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
+msgid "Type"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Accounts Allowed (empty for no control)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Untaxed amount"
+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
+#: view:account.move.line:0
+msgid "Analytic Lines"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.invoice.pay,init:0
+#: model:ir.actions.wizard,name:account.wizard_invoice_pay
+msgid "Pay invoice"
+msgstr ""
+
+#. module: account
+#: constraint:account.invoice:0
+msgid "Error: Invalid Bvr Number (wrong checksum)."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree5
+#: model:ir.ui.menu,name:account.menu_invoice_draft
+msgid "Draft Customer Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription_line
+msgid "Account Subscription Line"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "No Filter"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reference:0
+msgid "The partner reference of this invoice."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,sortbydate:0
+msgid "Sort by:"
+msgstr ""
+
+#. module: account
+#: field:account.move,to_check:0
+msgid "To Be Verified"
+msgstr ""
+
+#. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "7"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_transfers
+msgid "Transfers"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Li."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.chart,init:0
+msgid "Account charts"
+msgstr ""
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be displayed on reports"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.partner.balance.report,init,date1:0
+msgid "          Start date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.journal.report,init:0
+msgid "Analytic Journal Report"
+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 ""
+
+#. module: account
+#: rml:account.vat.declaration:0
+msgid "Tax Amount"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "J.C./Move name"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,name:0
+msgid "Journal-Period Name"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,name:0
+#: field:account.tax.code.template,name:0
+msgid "Tax Case Name"
+msgstr ""
+
+#. module: account
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want new account moves to pass through the "
+"'draft' state and instead goes directly to the 'posted state' without any "
+"manual validation."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,partner_id:0
+#: field:account.bank.statement.reconcile,partner_id:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,partner_id:0
+#: field:account.move,partner_id:0
+#: wizard_field:account.partner.balance.report,init,result_selection:0
+#: wizard_field:account.third_party_ledger.report,init,result_selection:0
+#: field:wizard.company.setup,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,number:0
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_expense
+msgid "Expense"
+msgstr ""
+
+#. module: account
+#: field:account.journal,invoice_sequence_id:0
+msgid "Invoice Sequence"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.automatic.reconcile,init:0
+msgid "Options"
+msgstr ""
+
+#. module: account
+#: model:process.process,name:account.process_process_invoiceprocess0
+msgid "Customer Invoice Process"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,period_id:0
+msgid "Opening Entries Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_validate_account_moves
+#: model:ir.actions.wizard,name:account.wizard_validate_account_moves_line
+#: model:ir.ui.menu,name:account.menu_validate_account_moves
+msgid "Validate Account Moves"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,period_type:0
+msgid "days"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,init,direction_selection:0
+msgid "Past"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,company_currency_id:0
+#: field:account.bank.accounts.wizard,currency_id:0
+#: field:account.bank.statement,currency:0
+#: field:account.bank.statement.reconcile,total_currency:0
+#: field:account.bank.statement.reconcile,total_second_currency:0
+#: rml:account.general.ledger:0
+#: field:account.invoice,currency_id:0
+#: field:account.journal,currency:0
+#: field:account.model.line,currency_id:0
+#: field:account.move.line,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
+msgid "Unpaid invoices"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_paymentreconcile0
+msgid "Payment Reconcile"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form
+#: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree
+msgid "Statements reconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_new
+#: model:ir.ui.menu,name:account.menu_action_subscription_form_new
+msgid "New Subscription"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Computation"
+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
+#: 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
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+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
+#: view:account.fiscalyear:0
+msgid "Create 3 Months Periods"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "(keep empty to use the current period)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree8
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree8
+msgid "Draft Supplier Invoices"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.refund,init,period:0
+msgid "Force period"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Detail"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+msgid "Consolidation"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,account_root_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid ""
+"Exception made of a mistake of our side, it seems that the following bills "
+"stay unpaid. Please, take appropriate measures in order to carry out this "
+"payment in the next 8 days."
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,account_selection,Account_list:0
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.actions.wizard,name:account.wizard_account_chart
+#: model:ir.ui.menu,name:account.menu_action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.check_journal
+msgid "x Checks Journal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_generate_subscription
+#: model:ir.ui.menu,name:account.menu_generate_subscription
+msgid "Create subscription entries"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,journal_id:0
+msgid "Opening Entries Journal"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Create a Fiscal Year"
+msgstr ""
+
+#. module: account
+#: field:product.template,taxes_id:0
+msgid "Customer Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,date_invoice:0
+msgid "Date Invoiced"
+msgstr ""
+
+#. module: account
+#: help:account.account.balance.report,checktype,periods:0
+#: help:account.general.ledger.report,checktype,periods:0
+#: help:account.partner.balance.report,init,periods:0
+#: help:account.third_party_ledger.report,init,periods:0
+#: help:account.vat.declaration,init,periods:0
+msgid "All periods if empty"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Liability"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "2"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.chart,init:0
+msgid "(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,base_code_id:0
+msgid "The account basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,date:0
+#: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
+#: field:account.bank.statement.reconcile,name:0
+#: rml:account.general.ledger:0
+#: selection:account.general.ledger.report,checktype,sortbydate:0
+#: rml:account.journal.period.print:0
+#: field:account.move,date:0
+#: rml:account.overdue:0
+#: wizard_field:account.subscription.generate,init,date:0
+#: field:account.subscription.line,date:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
+msgid "Date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Reference Type"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.unreconcile,init,unrec:0
+#: wizard_button:account.reconcile.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account
+#: field:account.tax,type:0
+#: field:account.tax.template,type:0
+msgid "Tax Type"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_statemententries0
+msgid "Statement Entries"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,user_id:0
+#: field:account.journal,user_id:0
+msgid "User"
+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
+#: view:account.chart.template:0
+msgid "Chart of Accounts Template"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.refund_sales_journal
+msgid "Journal d'extourne"
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+msgid "Voucher No"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_automatic_reconcile
+#: model:ir.ui.menu,name:account.menu_automatic_reconcile
+msgid "Automatic reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Import Invoice"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
+msgid "and Journals"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,move_id:0
+msgid "Move Line"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,acc_no:0
+msgid "Account No."
+msgstr ""
+
+#. module: account
+#: help:account.tax,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
+#: rml:account.central.journal:0
+msgid "Journal Code"
+msgstr ""
+
+#. module: account
+#: help:account.tax,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax won't appear on "
+"the invoice."
+msgstr ""
+
+#. module: account
+#: field:account.model,lines_id:0
+msgid "Model Entries"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.move.reconcile,line_id:0
+#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_tree1
+#: model:ir.ui.menu,name:account.menu_action_move_line_search
+msgid "Entry Lines"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Applicable Code (if type=code)"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.journal,init,open:0
+msgid "Open Journal"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "KI"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.action_account_analytic_line
+#: model:ir.actions.wizard,name:account.action_move_journal_line_form
+#: model:ir.ui.menu,name:account.account_entries_analytic_entries
+#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
+msgid "Entries Encoding by Line"
+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
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Period from"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement
+#: model:process.node,name:account.process_node_bankstatement0
+#: model:process.node,name:account.process_node_supplierbankstatement0
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
+msgid "Information addendum"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_entriesreconcile0
+#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
+msgid "Entries Reconcile"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.reconcile,total_second_amount:0
+msgid "The amount in the currency of the journal"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,landscape:0
+msgid "Landscape Mode"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_analyticinvoice0
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid "From analytic accounts, Create invoice."
+msgstr ""
+
+#. module: account
+#: wizard_button:account.account.balance.report,account_selection,end:0
+#: wizard_button:account.account.balance.report,checktype,end:0
+#: wizard_button:account.aged.trial.balance,init,end:0
+#: wizard_button:account.analytic.account.analytic.check.report,init,end:0
+#: wizard_button:account.analytic.account.balance.report,init,end:0
+#: wizard_button:account.analytic.account.chart,init,end:0
+#: wizard_button:account.analytic.account.cost_ledger.report,init,end:0
+#: wizard_button:account.analytic.account.inverted.balance.report,init,end:0
+#: wizard_button:account.analytic.account.journal.report,init,end:0
+#: wizard_button:account.analytic.account.quantity_cost_ledger.report,init,end:0
+#: wizard_button:account.analytic.line,init,end:0
+#: wizard_button:account.automatic.reconcile,init,end:0
+#: view:account.bank.statement:0
+#: wizard_button:account.central.journal.report,init,end:0
+#: wizard_button:account.chart,init,end:0
+#: wizard_button:account.fiscalyear.close,init,end:0
+#: wizard_button:account.fiscalyear.close.state,init,end:0
+#: wizard_button:account.general.journal.report,init,end:0
+#: wizard_button:account.general.ledger.report,account_selection,end:0
+#: wizard_button:account.general.ledger.report,checktype,end:0
+#: view:account.invoice:0
+#: wizard_button:account.invoice.pay,addendum,end:0
+#: wizard_button:account.invoice.pay,init,end:0
+#: wizard_button:account.invoice.refund,init,end:0
+#: view:account.move:0
+#: wizard_button:account.move.bank.reconcile,init,end:0
+#: wizard_button:account.move.journal,init,end:0
+#: wizard_button:account.move.line.reconcile,addendum,end:0
+#: wizard_button:account.move.line.reconcile,init_full,end:0
+#: wizard_button:account.move.line.reconcile,init_partial,end:0
+#: wizard_button:account.move.line.reconcile.select,init,end:0
+#: wizard_button:account.move.line.unreconcile,init,end:0
+#: wizard_button:account.move.line.unreconcile.select,init,end:0
+#: wizard_button:account.move.validate,init,end:0
+#: wizard_button:account.open_closed_fiscalyear,init,end:0
+#: wizard_button:account.partner.balance.report,init,end:0
+#: wizard_button:account.period.close,init,end:0
+#: wizard_button:account.print.journal.report,init,end:0
+#: wizard_button:account.reconcile.unreconcile,init,end:0
+#: wizard_button:account.subscription.generate,init,end:0
+#: wizard_button:account.third_party_ledger.report,init,end:0
+#: wizard_button:account.vat.declaration,init,end:0
+#: wizard_button:account_use_models,init_form,end:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,name:0
+msgid "Acc. Type Name"
+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
+#: field:account.move.line,blocked:0
+msgid "Litigation"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+#: wizard_view:account.move.validate,init:0
+#: view:account.payment.term:0
+msgid "Information"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_tax_report
+msgid "Taxes Reports"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_payable:0
+msgid "Account Payable"
+msgstr ""
+
+#. module: account
+#: wizard_view:populate_statement_from_inv,init:0
+msgid "Import Invoices in Statement"
+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
+#: 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
+#: rml:account.analytic.account.journal:0
+#: model:ir.ui.menu,name:account.next_id_40
+#: model:process.node,name:account.process_node_analytic0
+#: model:process.node,name:account.process_node_analyticcost0
+msgid "Analytic"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_invoiceinvoice0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+msgid "Equity"
+msgstr ""
+
+#. module: account
+#: field:wizard.company.setup,overdue_msg:0
+msgid "Overdue Payment Message"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
+
+#. module: account
+#: rml:account.partner.balance:0
+msgid "In dispute"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,type:0
+msgid ""
+"This type is used to differenciate types with special effects in Open ERP: "
+"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 deprecated "
+"accounts."
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
+msgid "End of Year Treatments"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_generic_report
+msgid "Generic Reports"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,power:0
+msgid "Power"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.line,init:0
+msgid "Account Analytic Lines Analysis"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "-"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "asgfas"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.wizard,name:account.wizard_analytic_account_chart
+#: model:ir.ui.menu,name:account.account_analytic_chart_balance
+#: model:ir.ui.menu,name:account.account_analytic_def_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Analytic Chart of Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.line,init:0
+msgid "View Account Analytic Lines"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.validate,init:0
+msgid "Select Period and Journal for Validation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,number:0
+msgid "Invoice Number"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_stop:0
+msgid "End of Period"
+msgstr ""
+
+#. module: account
+#: wizard_button:populate_statement_from_inv,go,finish:0
+msgid "O_k"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,amount_untaxed:0
+msgid "Untaxed"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
+#: model:ir.actions.wizard,name:account.account_analytic_account_inverted_balance_report
+msgid "Inverted Analytic Balance"
+msgstr ""
+
+#. module: account
+#: field:account.tax,applicable_type:0
+#: field:account.tax.template,applicable_type:0
+msgid "Applicable Type"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: account
+#: field:account.account,name:0
+#: field:account.account.template,name:0
+#: rml:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,name:0
+#: field:account.bank.statement.line,name:0
+#: field:account.chart.template,name:0
+#: field:account.config.wizard,name:0
+#: field:account.model.line,name:0
+#: field:account.move,name:0
+#: field:account.move.line,name:0
+#: field:account.move.reconcile,name:0
+#: field:account.subscription,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.line.reconcile,init_full:0
+#: wizard_view:account.move.line.reconcile,init_partial:0
+msgid "Reconciliation transactions"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.aged.trial.balance,init,direction_selection:0
+msgid "Analysis Direction"
+msgstr ""
+
+#. module: account
+#: wizard_button:populate_statement_from_inv,init,go:0
+msgid "_Go"
+msgstr ""
+
+#. module: account
+#: field:res.partner,ref_companies:0
+msgid "Companies that refers to partner"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,date:0
+msgid "Effective date"
+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
+#: 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
+#: selection:account.move.line,centralisation:0
+msgid "Credit Centralisation"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Customer Ref:"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Partner ID"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.automatic.reconcile,init:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
+msgid "Write-Off Move"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree1_new
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree1_new
+msgid "New Customer Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,reconcile:0
+#: wizard_button:account.automatic.reconcile,init,reconcile:0
+#: field:account.bank.statement.line,reconcile_id:0
+#: view:account.bank.statement.reconcile:0
+#: field:account.bank.statement.reconcile.line,line_id:0
+#: field:account.move.line,reconcile_id:0
+#: wizard_button:account.move.line.reconcile,addendum,reconcile:0
+#: wizard_button:account.move.line.reconcile,init_full,reconcile:0
+msgid "Reconcile"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Best regards."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
+msgid "Analytic account costs and revenues"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.invoice.refund,init:0
+msgid "Are you sure you want to refund this invoice ?"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_paid_open
+msgid "Open State"
+msgstr ""
+
+#. module: account
+#: field:account.journal,entry_posted:0
+msgid "Skip 'Draft' State for Created Entries"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,account_id:0
+#: field:account.move.line,tax_code_id:0
+msgid "Tax Account"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_statemententries0
+msgid "From statement, create entries"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
+msgid "1cm 27.7cm 20cm 27.7cm"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree12
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree12
+msgid "Draft Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_accountingstatemententries0
+msgid "Accounting Statement"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Document: Customer account statement"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+#: view:res.partner:0
+msgid "Accounting"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Taxes Mapping"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.line.unreconcile,init:0
+#: wizard_view:account.reconcile.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentorderbank0
+#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
+msgid "Reconcilation of entries from payment order."
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement,move_line_ids:0
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
+#: model:ir.model,name:account.model_account_move_line
+msgid "Entry lines"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.automatic.reconcile,init:0
+#: wizard_view:account.move.line.reconcile,init_full:0
+#: wizard_view:account.move.line.reconcile,init_partial:0
+#: wizard_view:account.move.line.reconcile.select,init:0
+#: model:ir.ui.menu,name:account.next_id_20
+#: model:process.node,name:account.process_node_reconciliation0
+#: model:process.node,name:account.process_node_supplierreconciliation0
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,centralisation:0
+msgid "Centralisation"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,tax_code_id:0
+#: field:account.tax,description:0
+#: field:account.tax,tax_code_id:0
+#: field:account.tax.template,tax_code_id:0
+#: model:ir.model,name:account.model_account_tax_code
+msgid "Tax Code"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.journal:0
+msgid "Analytic Journal -"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Analytic Debit"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_mode:0
+msgid "Outgoing Currencies Rate"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree10
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree10
+msgid "Draft Customer Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,readonly:0
+msgid "Readonly"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,date_maturity:0
+msgid ""
+"The maturity date of the generated entries for this model. You can chosse "
+"between the date of the creation action or the the date of the creation of "
+"the entries plus the partner payment terms."
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+msgid "Situation"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: xsl:account.transfer:0
+msgid "Document"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,move_id:0
+msgid "The move of this entry line."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,uos_id:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+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
+#: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
+#: wizard_field:account.move.line.reconcile,init_partial,trans_nbr:0
+msgid "# of Transaction"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_invoice_state_cancel
+msgid "Cancel selected invoices"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.journal:0
+#: field:account.analytic.line,journal_id:0
+#: field:account.journal,analytic_journal_id:0
+#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.actions.wizard,name:account.account_analytic_account_journal_report
+msgid "Analytic Journal"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+msgid "Entry Label"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_paymentreconcile0
+msgid "Reconcilate the entries from payment"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "("
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.period:0
+#: view:account.subscription:0
+msgid "Set to Draft"
+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
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.aged.trial.balance,init,result_selection:0
+msgid "Payable"
+msgstr ""
+
+#. module: account
+#: rml: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
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+msgid "Others"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "8"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.move:0
+#: wizard_button:account.move.validate,init,validate:0
+msgid "Validate"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+#: field:account.model,legend:0
+msgid "Legend"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftinvoices0
+msgid "Proposed invoice to be checked, validated and printed"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_move_line_select
+msgid "account.move.line.select"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: rml:account.account.balance:0
+#: wizard_field:account.account.balance.report,account_selection,Account_list:0
+#: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0
+#: field:account.bank.statement.line,account_id:0
+#: field:account.bank.statement.reconcile.line,account_id:0
+#: field:account.invoice,account_id:0
+#: field:account.invoice.line,account_id:0
+#: field:account.journal,account_control_ids:0
+#: field:account.model.line,account_id:0
+#: field:account.move.line,account_id:0
+#: wizard_field:account.move.line.reconcile.select,init,account_id:0
+#: wizard_field:account.move.line.unreconcile.select,init,account_id:0
+#: model:ir.model,name:account.model_account_account
+msgid "Account"
+msgstr ""
+
+#. module: account
+#: model:account.journal,name:account.bank_journal
+msgid "Journal de Banque CHF"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "By Date and Period"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,note:0
+#: field:account.fiscal.position,note:0
+#: view:account.invoice.line:0
+#: field:account.invoice.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"The account moves of the invoice have been reconciled with account moves of "
+"the payment(s)."
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice.line,invoice_line_tax_id:0
+#: model:ir.actions.act_window,name:account.action_tax_form
+#: model:ir.ui.menu,name:account.menu_action_tax_form
+#: model:ir.ui.menu,name:account.next_id_27
+msgid "Taxes"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.fiscalyear.close,init:0
+msgid "Close Fiscal Year with new entries"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "Average Rate"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_bankstatement0
+#: model:process.node,note:account.process_node_supplierbankstatement0
+msgid "Statement encoding produces payment entries"
+msgstr ""
+
+#. module: account
+#: field:account.account,code:0
+#: rml:account.account.balance:0
+#: field:account.account.template,code:0
+#: field:account.account.type,code:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.analytic.account.journal:0
+#: field:account.analytic.line,code:0
+#: field:account.config.wizard,code:0
+#: field:account.fiscalyear,code:0
+#: rml:account.general.journal:0
+#: field:account.journal,code:0
+#: rml:account.partner.balance:0
+#: field:account.period,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance
+msgid "Financial Management"
+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
+#: model:ir.actions.wizard,name:account.wizard_fiscalyear_close
+#: model:ir.ui.menu,name:account.menu_wizard_fy_close
+msgid "Generate Fiscal Year Opening Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_reconcile
+msgid "Reconcile Entries"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.wizard_paid_open,init:0
+msgid "(Invoice should be unreconciled if you want to open it)"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Additionnal Information"
+msgstr ""
+
+#. module: account
+#: field:account.tax,name:0
+#: field:account.tax.template,name:0
+#: rml:account.vat.declaration:0
+msgid "Tax Name"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.fiscalyear.close.state,init:0
+msgid " Close states of Fiscal year and periods"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term
+msgid "30 Days End of Month"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
+
+#. module: account
+#: constraint:account.invoice:0
+msgid "Error: BVR reference is required."
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,notprintable:0
+#: field:account.tax.code.template,notprintable:0
+msgid "Not Printable in Invoice"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,move_id:0
+msgid "Move"
+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
+#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
+#: model:ir.actions.wizard,name:account.account_analytic_account_balance_report
+msgid "Analytic Balance"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Bank Information"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account
+#: rml:account.partner.balance:0
+#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
+#: model:ir.actions.wizard,name:account.wizard_partner_balance_report
+#: model:ir.ui.menu,name:account.menu_partner_balance
+msgid "Partner Balance"
+msgstr ""
+
+#. module: account
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Third Party Ledger"
+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
+#: selection:account.tax,applicable_type:0
+#: 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
+#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
+msgid "Bank statements"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_22
+msgid "Partner Accounts"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,tax_group:0
+msgid ""
+"If a default tax if given in the partner it only override taxes from account "
+"(or product) of the same group."
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Real Entries"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_importinvoice0
+msgid "Import invoice"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:wizard.company.setup:0
+#: view:wizard.multi.charts.accounts:0
+msgid "Create"
+msgstr ""
+
+#. module: account
+#: model:process.transition.action,name:account.process_transition_action_createentries0
+msgid "Create entry"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_line
+msgid "Invoice line"
+msgstr ""
+
+#. module: account
+#: field:account.account,shortcut:0
+#: field:account.account.template,shortcut:0
+msgid "Shortcut"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.validate,init:0
+msgid ""
+"All draft account entries in this journal and period will be validated. It "
+"means you won't be able to modify their accouting fields."
+msgstr ""
+
+#. module: account
+#: selection:account.model.line,date:0
+#: selection:account.model.line,date_maturity:0
+msgid "Date of the day"
+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
+#: field:account.tax,parent_id:0
+#: field:account.tax.template,parent_id:0
+msgid "Parent Tax Account"
+msgstr ""
+
+#. module: account
+#: field:account.account,user_type:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.analytic.account,type:0
+#: model:ir.model,name:account.model_account_account_type
+msgid "Account Type"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank account owner"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "Filter on Periods"
+msgstr ""
+
+#. module: account
+#: field:res.partner,property_account_receivable:0
+msgid "Account Receivable"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.pay,addendum,reconcile:0
+msgid "Pay and reconcile"
+msgstr ""
+
+#. module: account
+#: rml:account.central.journal:0
+#: model:ir.actions.report.xml,name:account.account_central_journal
+msgid "Central Journal"
+msgstr ""
+
+#. module: account
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Balance brought forward"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_consol_ids:0
+msgid "Consolidated Children"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,fiscalyear:0
+#: wizard_field:account.chart,init,fiscalyear:0
+#: wizard_field:account.general.ledger.report,checktype,fiscalyear:0
+#: wizard_field:account.partner.balance.report,init,fiscalyear:0
+#: wizard_field:account.third_party_ledger.report,init,fiscalyear:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Balance :"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,display_account:0
+msgid "With balance is not equal to 0"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "3"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_vat_declaration
+msgid "Taxes Report"
+msgstr ""
+
+#. module: account
+#: selection:account.journal.period,state:0
+msgid "Printed"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree4_new
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree4_new
+msgid "New Supplier Refund"
+msgstr ""
+
+#. module: account
+#: view:account.model:0
+msgid "Entry Model"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,amount_currency:0
+msgid "With Currency"
+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
+#: field:account.analytic.journal,code:0
+msgid "Journal code"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.fiscalyear.close,init,close:0
+#: view:account.model:0
+msgid "Create entries"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+msgid "Project line"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,init,max_amount:0
+msgid "Maximum write-off amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,manual:0
+msgid "Manual"
+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
+#: 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
+#: wizard_field:account.invoice.pay,addendum,comment:0
+#: wizard_field:account.invoice.pay,init,name:0
+msgid "Entry Name"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,account_id:0
+msgid "The partner account used for this invoice."
+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
+#: field:account.account.type,sequence:0
+#: field:account.invoice.tax,sequence: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
+#: field:fiscalyear.seq,sequence_id:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Entry encoding"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.invoice.refund,init:0
+#: model:ir.actions.wizard,name:account.wizard_invoice_refund
+msgid "Credit Note"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.todo,note:account.config_fiscalyear
+msgid "Define Fiscal Years and Select Charts of Account"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,addendum,period_id:0
+msgid "Write-Off Period"
+msgstr ""
+
+#. module: account
+#: selection:account.config.wizard,period:0
+msgid "3 Months"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.journal,init:0
+msgid "Standard entries"
+msgstr ""
+
+#. module: account
+#: help:account.account,check_history:0
+msgid ""
+"Check this box if you want to print all entries when printing the General "
+"Ledger, otherwise it will only print its balance."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_payment_term_line
+msgid "Payment Term Line"
+msgstr ""
+
+#. module: account
+#: selection:account.config.wizard,period:0
+#: field:report.hr.timesheet.invoice.journal,name:0
+msgid "Month"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_subscription
+msgid "Account Subscription"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
+msgid "Maturity date"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Entry Subscription"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal.report,init,sort_selection:0
+msgid "By date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_config_wizard_form
+msgid "Account Configure Wizard "
+msgstr ""
+
+#. module: account
+#: field:account.config.wizard,date1:0
+#: field:account.fiscalyear,date_start:0
+#: field:account.subscription,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.general.ledger.report,account_selection:0
+msgid "Select Chart"
+msgstr ""
+
+#. module: account
+#: selection:account.chart,init,target_move:0
+#: model:ir.actions.report.xml,name:account.account_move_line_list
+msgid "All Entries"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftinvoices0
+#: model:process.node,name:account.process_node_supplierdraftinvoices0
+msgid "Draft Invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Fiscal Position Template Tax Mapping"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account
+#: selection:account.account.type,close_method:0
+msgid "Unreconciled"
+msgstr ""
+
+#. module: account
+#: field:account.account,note:0
+#: field:account.account.template,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Financial and accounting module that covers:\n"
+"    General accounting\n"
+"    Cost / Analytic accounting\n"
+"    Third party accounting\n"
+"    Taxes management\n"
+"    Budgets\n"
+"    Customer and Supplier Invoices\n"
+"    Bank statements\n"
+"    "
+msgstr ""
+
+#. module: account
+#: field:account.journal,sequence_id:0
+msgid "Entry Sequence"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+msgid "Closed"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_paymententries0
+msgid "Payment Entries"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_code_id:0
+msgid "The Account can either be a base tax code or tax code account."
+msgstr ""
+
+#. module: account
+#: help:account.automatic.reconcile,init,account_ids:0
+msgid ""
+"If no account is specified, the reconciliation will be made using every "
+"accounts that can be reconcilied"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_wizard_company_setup_form
+#: view:wizard.company.setup:0
+msgid "Overdue Payment Report Message"
+msgstr ""
+
+#. module: account
+#: selection:account.tax,tax_group:0
+#: selection:account.tax.template,tax_group:0
+msgid "Other"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.wizard,name:account.wizard_general_ledger
+#: model:ir.actions.wizard,name:account.wizard_general_ledger_report
+#: model:ir.ui.menu,name:account.menu_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: account
+#: field:account.journal.view,columns_id:0
+msgid "Columns"
+msgstr ""
+
+#. module: account
+#: selection:account.general.ledger.report,checktype,sortbydate:0
+msgid "Movement"
+msgstr ""
+
+#. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr ""
+
+#. module: account
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used instead of the default one to value outgoing stock "
+"for the current product"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_manually0
+msgid "Encode manually the statement"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_journal_form
+#: model:ir.ui.menu,name:account.menu_action_account_journal_form
+msgid "Financial Journals"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "By Period"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "."
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: account
+#: field:account.period,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: account
+#: help:account.analytic.journal,type:0
+msgid ""
+"Gives the type of the analytic journal. When a document (eg: an invoice) "
+"needs to create analytic entries, Open ERP will look for a matching journal "
+"of the same type."
+msgstr ""
+
+#. module: account
+#: field:account.journal,groups_id:0
+msgid "Groups"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Code/Date"
+msgstr ""
+
+#. module: account
+#: field:account.account,active:0
+#: field:account.analytic.account,active:0
+#: field:account.analytic.journal,active:0
+#: field:account.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
+#: model:process.node,note:account.process_node_electronicfile0
+msgid "Import from your bank statements"
+msgstr ""
+
+#. module: account
+#: view:account.chart.template:0
+msgid "Properties"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Customer Accounting Properties"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Select entries"
+msgstr ""
+
+#. module: account
+#: selection:account.chart,init,target_move:0
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.vat.declaration,init,based_on:0
+msgid "Base on"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Cash Payment"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_payable:0
+msgid "Payable Account"
+msgstr ""
+
+#. module: account
+#: field:account.account,currency_id:0
+#: field:account.account.template,currency_id:0
+msgid "Secondary Currency"
+msgstr ""
+
+#. module: account
+#: field:account.account,credit:0
+#: rml:account.account.balance:0
+#: field:account.analytic.account,credit:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.central.journal:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,credit:0
+#: field:account.move.line,credit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
+#: field:report.hr.timesheet.invoice.journal,cost:0
+msgid "Credit"
+msgstr ""
+
+#. module: account
+#: help:account.tax.template,child_depend:0
+msgid ""
+"Indicate if the tax computation is based on the value computed for the "
+"computation of child taxes or based on the total amount."
+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
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Child Codes"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,move_name:0
+msgid "Account Move"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: field:account.bank.statement,line_ids:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: account
+#: field:account.move.line,amount_taxed:0
+msgid "Taxed Amount"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,price_subtotal:0
+msgid "Subtotal w/o tax"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Ref"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,general_account_id:0
+msgid "General Account"
+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 usefull for some reports."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.third_party_ledger.report,init,reconcil:0
+msgid "       Include Reconciled Entries"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,blocked:0
+msgid ""
+"You can check this box to mark the entry line as a litigation with the "
+"associated partner"
+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:res.partner,debit_limit:0
+msgid "Payable Limit"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,state:0
+#: wizard_field:account.general.ledger.report,checktype,state:0
+#: wizard_field:account.partner.balance.report,init,state:0
+#: wizard_field:account.third_party_ledger.report,init,state:0
+msgid "Date/Period Filter"
+msgstr ""
+
+#. module: account
+#: rml: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
+#: rml:account.general.journal:0
+msgid "Credit Trans."
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,seq_journal:0
+msgid "Separated Journal Sequences"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement.reconcile,total_second_currency:0
+msgid "The currency of the journal"
+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.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.period,state:0
+#: selection:account.subscription,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,periods:0
+#: field:account.config.wizard,period:0
+#: view:account.fiscalyear:0
+#: field:account.fiscalyear,period_ids:0
+#: wizard_field:account.general.ledger.report,checktype,periods:0
+#: wizard_field:account.partner.balance.report,init,periods:0
+#: wizard_field:account.third_party_ledger.report,init,periods:0
+#: wizard_field:account.vat.declaration,init,periods: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
+#: rml:account.invoice:0
+#: view:account.invoice: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
+#: selection:account.analytic.account,state:0
+#: selection:account.invoice,state:0
+#: wizard_button:account.open_closed_fiscalyear,init,open:0
+#: wizard_button:account_use_models,create,open_move:0
+msgid "Open"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_29
+msgid "Search Entries"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_analytic0
+#: model:process.node,note:account.process_node_analyticcost0
+msgid "Analytic costs to reinvoice purchases, timesheets, ..."
+msgstr ""
+
+#. module: account
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr ""
+
+#. module: account
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+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
+#: help:account.config.wizard,code:0
+msgid "Name of the fiscal year as displayed in reports."
+msgstr ""
+
+#. module: account
+#: help:account.move.line,date_maturity:0
+msgid ""
+"This field is used for payable and receivable entries. You can put the limit "
+"date for the payment of this entry line."
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid "Third party (Country)"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_left:0
+msgid "Parent Left"
+msgstr ""
+
+#. module: account
+#: help:account.journal,sequence_id:0
+msgid "The sequence gives the display order for a list of journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,type_control_ids:0
+msgid "Type Controls"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,name:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.central.journal:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,init,date:0
+msgid "Payment date"
+msgstr ""
+
+#. module: account
+#: wizard_button:account_use_models,create,end:0
+msgid "Ok"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree7
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree7
+msgid "Unpaid Customer Invoices"
+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
+#: field:account.analytic.line,product_id:0
+#: field:account.invoice.line,product_id:0
+#: field:account.move.line,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: account
+#: rml:account.tax.code.entries:0
+msgid ")"
+msgstr ""
+
+#. module: account
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_period
+msgid "Account period"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,init,journal_id:0
+msgid "Journal/Payment Mode"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Canceled Invoice"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.general.ledger.report,checktype,soldeinit:0
+#: wizard_field:account.partner.balance.report,init,soldeinit:0
+#: wizard_field:account.third_party_ledger.report,init,soldeinit:0
+msgid "Include initial balances"
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Account Template"
+msgstr ""
+
+#. module: account
+#: field:account.tax.code,sum:0
+msgid "Year Sum"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_filestatement0
+msgid "Import file from your bank statement"
+msgstr ""
+
+#. module: account
+#: field:account.account,type:0
+#: field:account.account.template,type:0
+msgid "Internal Type"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "9"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form_running
+#: model:ir.ui.menu,name:account.menu_action_subscription_form_running
+msgid "Running Subscriptions"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Bank Payment"
+msgstr ""
+
+#. module: account
+#: selection:account.move,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Credit Notes"
+msgstr ""
+
+#. module: account
+#: field:account.config.wizard,date2:0
+#: field:account.fiscalyear,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_open_closed_fy
+msgid "Cancel Opening Entries"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_invoicemanually0
+msgid "Manually statement"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,days2:0
+msgid "Day of the Month"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,line_ids:0
+#: field:account.tax.code,line_ids:0
+msgid "Lines"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Dear Sir/Madam,"
+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
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_filestatement0
+msgid "File statement"
+msgstr ""
+
+#. module: account
+#: view:ir.sequence:0
+msgid "Fiscal Year Sequences"
+msgstr ""
+
+#. module: account
+#: view:account.model.line:0
+msgid "Entry Model Line"
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Account Tax Template"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.wizard_paid_open,init:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_draftstatement0
+msgid "Set starting and ending balance for control"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.wizard_paid_open,init:0
+msgid "Are you sure you want to open this invoice ?"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
+msgid "Partner Other Ledger"
+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
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "JNRL"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+#: view:account.period:0
+msgid "States"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: model:process.node,name:account.process_node_accountingentries0
+#: model:process.node,name:account.process_node_supplieraccountingentries0
+msgid "Accounting Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
+msgid "Receivables & Payables"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+msgid "General Ledger -"
+msgstr ""
+
+#. module: account
+#: field:report.hr.timesheet.invoice.journal,quantity:0
+msgid "Quantities"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
+msgid "Total"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_customerinvoice0
+#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
+msgid "Number of entries are generated"
+msgstr ""
+
+#. module: account
+#: model:process.transition,name:account.process_transition_suppliervalidentries0
+#: model:process.transition,name:account.process_transition_validentries0
+msgid "Valid Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_use_model
+#: model:ir.actions.wizard,name:account.wizard_line_account_use_model
+#: model:ir.ui.menu,name:account.menu_account_use_model
+msgid "Create Entries From Models"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,reconcile:0
+msgid "Allow Reconciliation"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "By Date"
+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 ""
+
+#. module: account
+#: help:account.model.line,date:0
+msgid "The date of the generated entries"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.refund,init,modify_invoice:0
+msgid "Modify Invoice"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Supplier Accounting Properties"
+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
+#: view:account.bank.statement:0
+#: field:account.bank.statement.line,statement_id:0
+#: field:account.move.line,statement_id:0
+msgid "Statement"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
+#: model:ir.ui.menu,name:account.menu_encode_entries_by_move
+msgid "Entries Encoding by Move"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.chart,init:0
+msgid "Analytic Account Charts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.aged.trial.balance,init,result_selection:0
+msgid "Filter on Partners"
+msgstr ""
+
+#. module: account
+#: field:account.tax,price_include:0
+msgid "Tax Included in Price"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
+#: model:ir.ui.menu,name:account.account_analytic_journal_entries
+msgid "Analytic Entries by Journal"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Valid entries from invoice"
+msgstr ""
+
+#. module: account
+#: field:account.account,company_id:0
+#: wizard_field:account.account.balance.report,checktype,company_id:0
+#: wizard_field:account.aged.trial.balance,init,company_id:0
+#: field:account.analytic.account,company_id:0
+#: field:account.fiscal.position,company_id:0
+#: field:account.fiscalyear,company_id:0
+#: wizard_field:account.general.ledger.report,checktype,company_id:0
+#: field:account.invoice,company_id:0
+#: field:account.journal,company_id:0
+#: wizard_field:account.partner.balance.report,init,company_id:0
+#: field:account.tax,company_id:0
+#: field:account.tax.code,company_id:0
+#: wizard_field:account.third_party_ledger.report,init,company_id:0
+#: wizard_field:account.vat.declaration,init,company_id:0
+#: field:wizard.company.setup,company_id:0
+#: field:wizard.multi.charts.accounts,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account
+#: rml:account.general.ledger:0
+msgid "Crebit"
+msgstr ""
+
+#. module: account
+#: selection:account.subscription,state:0
+msgid "Running"
+msgstr ""
+
+#. module: account
+#: help:account.tax,include_base_amount:0
+msgid ""
+"Indicate if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_draftstatement0
+msgid "Draft statement"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.journal,name:0
+msgid "Journal name"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_invoiceimport0
+msgid "Import invoice from statement"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "4"
+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
+#: model:process.node,note:account.process_node_importinvoice0
+msgid "Import from invoices or payments"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_reconcile_select
+#: model:ir.ui.menu,name:account.menu_reconcile_select
+msgid "Reconcile entries"
+msgstr ""
+
+#. module: account
+#: xsl:account.transfer:0
+msgid "Change"
+msgstr ""
+
+#. module: account
+#: field:account.journal.period,icon:0
+msgid "Icon"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_journal_period
+msgid "Journal - Period"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.move.line.reconcile,init_full,credit:0
+#: wizard_field:account.move.line.reconcile,init_partial,credit:0
+msgid "Credit amount"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.aged.trial.balance,init,print:0
+msgid "Print Aged Trial Balance"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.line,ref:0
+#: field:account.bank.statement.line,ref:0
+#: field:account.model.line,ref:0
+#: field:account.move.line,ref:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Ref."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,address_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "General Credit"
+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
+#: selection:account.invoice,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree
+msgid "Draft statements"
+msgstr ""
+
+#. module: account
+#: wizard_field:populate_statement_from_inv,init,date:0
+msgid "Date payment"
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+msgid "A/c No."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.report_account_analytic_journal_tree_month
+#: model:ir.ui.menu,name:account.report_account_analytic_journal_print_month
+msgid "Account cost and revenue by journal (This Month)"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance.report,init,result_selection:0
+#: selection:account.third_party_ledger.report,init,result_selection:0
+msgid "Receivable Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.move.line.unreconcile.select,init,open:0
+msgid "Open for unreconciliation"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.reconcile,statement_line:0
+#: model:ir.model,name:account.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.automatic.reconcile,reconcile,end:0
+msgid "OK"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
+msgid "Control Invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.account,type:0
+#: selection:account.account.template,type:0
+#: selection:account.aged.trial.balance,init,result_selection:0
+msgid "Receivable"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+#: model:ir.actions.wizard,name:account.wizard_balance_report
+#: model:ir.ui.menu,name:account.menu_account_balance_report
+msgid "Account Balance"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
+#: model:ir.actions.wizard,name:account.account_analytic_account_analytic_check_report
+msgid "Analytic Check"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "VAT:"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: rml:account.central.journal:0
+#: rml:account.general.journal:0
+#: rml:account.invoice:0
+msgid "Total:"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal
+msgid "account.analytic.journal"
+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
+#: view:product.product:0
+msgid "Sale Taxes"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_move_reconcile
+msgid "Account Reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+msgid "Confirm"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,account_selection:0
+msgid "Select parent account"
+msgstr ""
+
+#. module: account
+#: field:account.account.template,parent_id:0
+msgid "Parent Account Template"
+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
+#: field:account.bank.statement.reconcile,total_amount:0
+#: field:account.bank.statement.reconcile,total_second_amount:0
+msgid "Payment amount"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic account"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,state:0
+msgid "Valid"
+msgstr ""
+
+#. module: account
+#: field:account.account,debit:0
+#: rml:account.account.balance:0
+#: field:account.analytic.account,debit:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.central.journal:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: field:account.model.line,debit:0
+#: field:account.move.line,debit:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
+#: field:report.hr.timesheet.invoice.journal,revenue:0
+msgid "Debit"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_42
+msgid "All Months"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.refund,init,date:0
+msgid "Operation date"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,invoice_line:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account
+#: field:account.period,date_start:0
+msgid "Start of Period"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,report_name:0
+msgid "Name of new entries"
+msgstr ""
+
+#. module: account
+#: wizard_button:account_use_models,init_form,create:0
+msgid "Create Entries"
+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 ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated account moves."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
+msgid "Reconciled transactions"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_reporting
+msgid "Reporting"
+msgstr ""
+
+#. module: account
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "/"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_invoiceinvoice0
+#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
+msgid "Have a number and entries are generated"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "Analytic Check -"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance:0
+msgid "Account Balance -"
+msgstr ""
+
+#. module: account
+#: field:account.journal,group_invoice_lines:0
+msgid "Group invoice lines"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.line:0
+#: view:account.invoice:0
+msgid "Total amount"
+msgstr ""
+
+#. module: account
+#: view:account.journal:0
+msgid "Account Journal"
+msgstr ""
+
+#. module: account
+#: view:account.subscription.line:0
+msgid "Subscription lines"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income:0
+msgid "Income Account on Product Template"
+msgstr ""
+
+#. module: account
+#: help:account.account,currency_id:0
+#: help:account.account.template,currency_id:0
+msgid "Force all moves for this account to have this secondary currency."
+msgstr ""
+
+#. module: account
+#: wizard_button:populate_statement_from_inv,go,end:0
+#: wizard_button:populate_statement_from_inv,init,end:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "Select Date-Period"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.inverted.balance:0
+msgid "Inverted Analytic Balance -"
+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
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Tax Definition"
+msgstr ""
+
+#. module: account
+#: field:account.tax,tax_group:0
+#: field:account.tax.template,tax_group:0
+msgid "Tax Group"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree3_new
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree3_new
+msgid "New Customer Refund"
+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
+#: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
+msgid "Import invoices"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.line.unreconcile,init:0
+#: wizard_view:account.move.line.unreconcile.select,init:0
+#: wizard_view:account.reconcile.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_fiscalyear_seq
+msgid "Maintains Invoice sequences with Fiscal Year"
+msgstr ""
+
+#. module: account
+#: selection:account.account.balance.report,checktype,display_account:0
+#: selection:account.general.ledger.report,checktype,display_account:0
+msgid "With movements"
+msgstr ""
+
+#. module: account
+#: field:account.tax,domain:0
+#: field:account.tax.template,domain:0
+msgid "Domain"
+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
+#: view:account.subscription:0
+msgid "Subscription Periods"
+msgstr ""
+
+#. module: account
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.tax:0
+#: view:account.tax.template:0
+#: selection:account.vat.declaration,init,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
+#: model:ir.ui.menu,name:account.menu_finance_invoice
+#: wizard_field:populate_statement_from_inv,go,lines:0
+msgid "Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.balance.report,init,result_selection:0
+#: selection:account.third_party_ledger.report,init,result_selection:0
+msgid "Payable Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.line:0
+#: field:account.invoice.tax,invoice_id:0
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.invoice.pay,addendum,writeoff_journal_id:0
+msgid "Write-Off journal"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.invoice.pay,init,writeoff_check:0
+msgid "Full Payment"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Journal Purchase"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Cash Receipt"
+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
+#: model:process.transition,note:account.process_transition_invoicemanually0
+msgid "Encode manually statement comes into the draft statement"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.next_id_43
+msgid "This Month"
+msgstr ""
+
+#. module: account
+#: field:account.account.type,sign:0
+msgid "Sign on Reports"
+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
+#: view:account.invoice:0
+#: field:account.invoice,payment_ids:0
+#: selection:account.vat.declaration,init,based_on:0
+msgid "Payments"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_accountingstatemententries0
+msgid "Accounting entries at statement's confirmation"
+msgstr ""
+
+#. module: account
+#: wizard_view:account_use_models,create:0
+msgid "Use Model"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.wizard_paid_open,init,end:0
+msgid "No"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.act_account_partner_account_move
+msgid "All account entries"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The tax basis of the tax declaration."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "Date Filter"
+msgstr ""
+
+#. module: account
+#: wizard_view:populate_statement_from_inv,init:0
+msgid "Choose Journal and Payment Date"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.account,state:0
+#: selection:account.bank.statement,state:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.journal.period,state:0
+#: selection:account.move,state:0
+#: selection:account.move.line,state:0
+#: selection:account.period,state:0
+#: selection:account.subscription,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Paid"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree11
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree11
+msgid "Unpaid Customer Refunds"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.period.close,init:0
+msgid "Are you sure ?"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: view:account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account
+#: field:account.move.reconcile,line_partial_ids:0
+msgid "Partial Entry lines"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,statement_id:0
+msgid "The bank statement used for bank reconciliation"
+msgstr ""
+
+#. module: account
+#: view:account.fiscalyear:0
+msgid "Fiscalyear"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.analytic.line,init,open:0
+msgid "Open Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.account,type:0
+#: selection:account.move.line,centralisation:0
+msgid "Normal"
+msgstr ""
+
+#. module: account
+#: model:process.process,name:account.process_process_supplierinvoiceprocess0
+msgid "Supplier Invoice Process"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+#: rml:account.vat.declaration:0
+msgid "Page"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Optional Information"
+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
+#: selection:account.aged.trial.balance,init,result_selection:0
+msgid "Receivable and Payable"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance:0
+#: rml:account.general.journal:0
+msgid ":"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,reconcile_amount:0
+msgid "Amount reconciled"
+msgstr ""
+
+#. module: account
+#: selection:account.account,currency_mode:0
+msgid "At Date"
+msgstr ""
+
+#. module: account
+#: help:account.move.line,tax_amount:0
+msgid ""
+"If the Tax account is 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.bank.statement:0
+#: view:account.bank.statement.reconcile:0
+#: view:account.subscription:0
+msgid "Compute"
+msgstr ""
+
+#. module: account
+#: help:account.invoice.line,account_id:0
+msgid "The income or expense account related to the selected product."
+msgstr ""
+
+#. module: account
+#: field:account.tax,type_tax_use:0
+msgid "Tax Application"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_subscription_form
+#: model:ir.ui.menu,name:account.menu_action_subscription_form
+msgid "Subscription Entries"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree6
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree6
+msgid "PRO-FORMA Customer Invoices"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_total:0
+msgid "Number of Periods"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
+#: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
+#: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
+#: wizard_field:account.analytic.account.journal.report,init,date2:0
+#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
+#: wizard_field:account.automatic.reconcile,init,date2:0
+msgid "End of period"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: model:ir.model,name:account.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account
+#: rml:account.general.journal:0
+#: model:ir.actions.report.xml,name:account.account_general_journal
+msgid "General Journal"
+msgstr ""
+
+#. module: account
+#: field:account.account,balance:0
+#: rml:account.account.balance:0
+#: selection:account.account.type,close_method:0
+#: field:account.analytic.account,balance:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.inverted.balance:0
+#: field:account.bank.statement,balance_end:0
+#: field:account.bank.statement.reconcile,total_balance:0
+#: rml:account.general.ledger:0
+#: field:account.move.line,balance:0
+#: rml:account.partner.balance:0
+#: selection:account.payment.term.line,value:0
+#: selection:account.tax,type:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
+msgid "Balance"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
+#: model:ir.ui.menu,name:account.account_def_analytic_journal
+msgid "Analytic Journal Definition"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "account.tax.template"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Bank Accounts"
+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
+#: help:account.journal,invoice_sequence_id:0
+msgid "The sequence used for invoice numbers in this journal."
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+#: view:account.account.template:0
+#: view:account.journal:0
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "General Information"
+msgstr ""
+
+#. module: account
+#: help:populate_statement_from_inv,init,journal_id:0
+msgid ""
+"This field allow you to choose the accounting journals you want for "
+"filtering the invoices. If you left this field empty, it will search on all "
+"sale, purchase and cash journals."
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error ! The duration of the Fiscal Year is invalid. "
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.account,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,move_ids:0
+msgid "Moves"
+msgstr ""
+
+#. module: account
+#: selection:account.invoice,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_form
+#: model:ir.ui.menu,name:account.menu_action_account_form
+msgid "List of Accounts"
+msgstr ""
+
+#. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Sales Properties"
+msgstr ""
+
+#. module: account
+#: rml:account.general.journal:0
+msgid "Printing Date :"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
+#: model:ir.actions.wizard,name:account.account_analytic_account_quantity_cost_ledger_report
+msgid "Cost Ledger (Only quantities)"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.move.validate,init:0
+msgid "Validate Account Entries"
+msgstr ""
+
+#. module: account
+#: selection:account.print.journal.report,init,sort_selection:0
+msgid "Reference Number"
+msgstr ""
+
+#. module: account
+#: rml:account.overdue:0
+msgid "Total amount due:"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.analytic.account.chart,init,to_date:0
+#: wizard_field:account.analytic.line,init,to_date:0
+msgid "To"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
+msgid "Entries of Open Analytic Journals"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.tax:0
+msgid "Manual Invoice Taxes"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date:0
+msgid "Current Date"
+msgstr ""
+
+#. module: account
+#: selection:account.move,type:0
+msgid "Journal Sale"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,fy_id:0
+#: wizard_field:account.fiscalyear.close.state,init,fy_id:0
+msgid "Fiscal Year to close"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.aged.trial.balance,init,date1:0
+#: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
+#: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
+#: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
+#: wizard_field:account.analytic.account.journal.report,init,date1:0
+#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
+#: wizard_field:account.automatic.reconcile,init,date1:0
+msgid "Start of period"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_template_folder
+msgid "Templates"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.vat.declaration,init,report:0
+msgid "Print VAT Decl."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_intracom
+msgid "IntraCom"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+#: field:account.bank.statement.reconcile.line,name:0
+#: rml:account.invoice:0
+#: field:account.invoice,name:0
+#: field:account.invoice.line,name:0
+#: wizard_field:account.invoice.refund,init,description:0
+#: rml:account.overdue:0
+#: field:account.payment.term,note:0
+#: field:account.tax.code,info:0
+#: field:account.tax.code.template,info:0
+msgid "Description"
+msgstr ""
+
+#. module: account
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used instead of the default one to value incoming stock "
+"for the current product"
+msgstr ""
+
+#. module: account
+#: field:account.tax,child_ids:0
+msgid "Child Tax Accounts"
+msgstr ""
+
+#. module: account
+#: field:account.account,parent_right:0
+msgid "Parent Right"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.account_account_menu
+msgid "Financial Accounts"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr ""
+
+#. module: account
+#: view:account.config.wizard:0
+msgid "Account Configure"
+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.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
+#. module: account
+#: selection:account.automatic.reconcile,init,power:0
+msgid "5"
+msgstr ""
+
+#. module: account
+#: field:product.category,property_account_income_categ:0
+#: field:product.template,property_account_income:0
+msgid "Income Account"
+msgstr ""
+
+#. module: account
+#: field:account.period,special:0
+msgid "Opening/Closing Period"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.balance:0
+msgid "Analytic Balance -"
+msgstr ""
+
+#. module: account
+#: wizard_field:account_use_models,init_form,model:0
+#: model:ir.model,name:account.model_account_model
+msgid "Account Model"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: model:ir.actions.act_window,name:account.act_account_analytic_account_2_account_invoice_line
+msgid "Invoice lines"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.statement.line,type:0
+msgid "Customer"
+msgstr ""
+
+#. module: account
+#: field:account.subscription,period_type:0
+msgid "Period Type"
+msgstr ""
+
+#. module: account
+#: view:product.category:0
+msgid "Accounting Properties"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_sequence_fiscalyear
+msgid "account.sequence.fiscalyear"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.print.journal.report,init,sort_selection:0
+msgid "Entries Sorted By"
+msgstr ""
+
+#. module: account
+#: rml:account.journal.period.print:0
+msgid "Print Journal -"
+msgstr ""
+
+#. module: account
+#: field:account.bank.accounts.wizard,bank_account_id:0
+#: field:account.chart.template,bank_account_view_id:0
+#: field:account.invoice,partner_bank:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_model_form
+#: model:ir.ui.menu,name:account.menu_action_model_form
+msgid "Models Definition"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_moves
+#: selection:account.analytic.journal,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
+#: rml:account.overdue:0
+msgid "Maturity"
+msgstr ""
+
+#. module: account
+#: field:account.fiscalyear,name:0
+#: field:account.journal.period,fiscalyear_id:0
+#: field:account.period,fiscalyear_id:0
+#: field:account.sequence.fiscalyear,fiscalyear_id:0
+#: field:fiscalyear.seq,fiscalyear_id:0
+#: model:ir.model,name:account.model_account_fiscalyear
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account
+#: selection:account.aged.trial.balance,init,direction_selection:0
+msgid "Future"
+msgstr ""
+
+#. module: account
+#: help:account.account.balance.report,checktype,fiscalyear:0
+#: help:account.chart,init,fiscalyear:0
+#: help:account.general.ledger.report,checktype,fiscalyear:0
+#: help:account.partner.balance.report,init,fiscalyear:0
+#: help:account.third_party_ledger.report,init,fiscalyear:0
+msgid "Keep empty for all open fiscal year"
+msgstr ""
+
+#. module: account
+#: rml:account.invoice:0
+#: selection:account.invoice,type:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_entriesreconcile0
+#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
+msgid "Reconcile Entries."
+msgstr ""
+
+#. module: account
+#: field:account.subscription.line,move_id:0
+msgid "Entry"
+msgstr ""
+
+#. module: account
+#: model:process.node,note:account.process_node_paidinvoice0
+#: model:process.node,note:account.process_node_supplierpaidinvoice0
+#: model:process.transition,note:account.process_transition_reconcilepaid0
+#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
+msgid "Paid invoice when reconciled."
+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.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management"
+msgstr ""
+
+#. module: account
+#: view:account.fiscal.position.template:0
+msgid "Accounts Mapping"
+msgstr ""
+
+#. module: account
+#: help:product.category,property_account_expense_categ:0
+msgid ""
+"This account will be used to value outgoing stock for the current product "
+"category"
+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
+#: view:res.partner:0
+msgid "Bank Details"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense:0
+msgid "Expense Account on Product Template"
+msgstr ""
+
+#. module: account
+#: rml:account.analytic.account.analytic.check:0
+msgid "General Debit"
+msgstr ""
+
+#. module: account
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: account
+#: help:account.config.wizard,name:0
+msgid "Name of the fiscal year as displayed on screens."
+msgstr ""
+
+#. module: account
+#: field:account.invoice,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
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement Process"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_bank_statement_reconcile
+msgid "Statement reconcile"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.fiscalyear.close,init,sure:0
+#: wizard_field:account.fiscalyear.close.state,init,sure:0
+#: wizard_field:account.period.close,init,sure:0
+msgid "Check this box"
+msgstr ""
+
+#. module: account
+#: help:account.tax,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
+
+#. module: account
+#: field:account.journal.column,name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.account.balance.report,checktype:0
+#: wizard_view:account.general.ledger.report,checktype:0
+#: wizard_view:account.partner.balance.report,init:0
+#: wizard_view:account.third_party_ledger.report,init:0
+msgid "Filters"
+msgstr ""
+
+#. module: account
+#: wizard_button:account.wizard_paid_open,init,yes:0
+msgid "Yes"
+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
+#: wizard_button:account.subscription.generate,init,generate:0
+msgid "Compute Entry Dates"
+msgstr ""
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 88783a5b8ce..7ed77c6498e 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-18 06:41+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-26 13:54+0000\n"
+"Last-Translator: Simon Vidmar <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: 2009-11-19 04:35+0000\n"
+"X-Launchpad-Export-Date: 2009-11-27 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 7c6dd6cf957..fa55c444dd1 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -128,7 +128,7 @@ class account_invoice(osv.osv):
                 else:
                     debit+=debit_tmp
                     credit+=credit_tmp
-                    
+
             if not inv.amount_total:
                 result = 0.0
             elif inv.type in ('out_invoice','in_refund'):
@@ -139,7 +139,7 @@ class account_invoice(osv.osv):
                 result = inv.amount_total - amount
             # Use is_zero function to avoid rounding trouble => should be fixed into ORM
             res[inv.id] = not self.pool.get('res.currency').is_zero(cr, uid, inv.company_id.currency_id,result) and result or 0.0
-            
+
         return res
 
     def _get_lines(self, cr, uid, ids, name, arg, context=None):
@@ -209,7 +209,7 @@ class account_invoice(osv.osv):
                 move[line.move_id.id] = True
             for line in r.line_id:
                 move[line.move_id.id] = True
-        
+
         invoice_ids = []
         if move:
             invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context)
@@ -260,7 +260,7 @@ class account_invoice(osv.osv):
         'invoice_line': fields.one2many('account.invoice.line', 'invoice_id', 'Invoice Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
 
-        'move_id': fields.many2one('account.move', 'Invoice Movement', readonly=True, help="Link to the automatically generated account moves."),
+        'move_id': fields.many2one('account.move', 'Invoice Movement', readonly=True, help="Link to the automatically generated Ledger Postings."),
         'amount_untaxed': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])),string='Untaxed',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
@@ -291,10 +291,10 @@ class account_invoice(osv.osv):
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
                 'account.move.line': (_get_invoice_from_line, None, 50),
                 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
-            }, help="The account moves of the invoice have been reconciled with account moves of the payment(s)."),
+            }, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."),
         'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
             help='The bank account to pay to or to be paid from'),
-        'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Move Lines'),
+        'move_lines':fields.function(_get_lines , method=True,type='many2many' , relation='account.move.line',string='Entry Lines'),
         'residual': fields.function(_amount_residual, method=True, digits=(16, int(config['price_accuracy'])),string='Residual',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 50),
@@ -305,7 +305,7 @@ class account_invoice(osv.osv):
             },
             help="Remaining amount due."),
         'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
-        'move_name': fields.char('Account Move', size=64),
+        'move_name': fields.char('Ledger Posting', size=64),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position')
     }
     _defaults = {
@@ -318,6 +318,7 @@ class account_invoice(osv.osv):
                 self.pool.get('res.users').browse(cr, uid, uid,
                     context=context).company_id.id,
         'reference_type': lambda *a: 'none',
+        'check_total': lambda *a: 0.0,
     }
 
     def unlink(self, cr, uid, ids, context=None):
@@ -545,7 +546,7 @@ class account_invoice(osv.osv):
             for taxe in ait_obj.compute(cr, uid, id, context=context).values():
                 ait_obj.create(cr, uid, taxe)
          # Update the stored value (fields.function), so we write to trigger recompute
-        self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=context)    
+        self.pool.get('account.invoice').write(cr, uid, ids, {'invoice_line':[]}, context=context)
 #        self.pool.get('account.invoice').write(cr, uid, ids, {}, context=context)
         return True
 
@@ -730,7 +731,7 @@ class account_invoice(osv.osv):
                     tmp += '-'+str(l.get('product_id',"False"))
                     tmp += '-'+str(l.get('analytic_account_id',"False"))
                     tmp += '-'+str(l.get('date_maturity',"False"))
-                    
+
                     if tmp in line2:
                         am = line2[tmp]['debit'] - line2[tmp]['credit'] + (l['debit'] - l['credit'])
                         line2[tmp]['debit'] = (am > 0) and am or 0.0
@@ -971,7 +972,7 @@ class account_invoice(osv.osv):
             date=context['date_p']
         else:
             date=time.strftime('%Y-%m-%d')
-            
+
         # Take the amount in currency and the currency of the payment
         if 'amount_currency' in context and context['amount_currency'] and 'currency_id' in context and context['currency_id']:
             amount_currency = context['amount_currency']
@@ -979,7 +980,7 @@ class account_invoice(osv.osv):
         else:
             amount_currency = False
             currency_id = False
-            
+
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * pay_amount>0 and direction * pay_amount,
@@ -1294,12 +1295,12 @@ class account_invoice_tax(osv.osv):
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
         'tax_amount': fields.float('Tax Code Amount', digits=(16,int(config['price_accuracy']))),
     }
-    
+
     def base_change(self, cr, uid, ids, base,currency_id=False,company_id=False,date_invoice=False):
         cur_obj = self.pool.get('res.currency')
         company_obj = self.pool.get('res.company')
         company_currency=False
-        if company_id:            
+        if company_id:
             company_currency = company_obj.read(cr,uid,[company_id],['currency_id'])[0]['currency_id'][0]
         if currency_id and company_currency:
             base = cur_obj.compute(cr, uid, currency_id, company_currency, base, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
@@ -1314,7 +1315,7 @@ class account_invoice_tax(osv.osv):
         if currency_id and company_currency:
             amount = cur_obj.compute(cr, uid, currency_id, company_currency, amount, context={'date': date_invoice or time.strftime('%Y-%m-%d')}, round=False)
         return {'value': {'tax_amount':amount}}
-    
+
     _order = 'sequence'
     _defaults = {
         'manual': lambda *a: 1,
diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml
index dca17833a54..704f9f47025 100755
--- a/addons/account/process/statement_process.xml
+++ b/addons/account/process/statement_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    
+
     <!--
         Process
     -->
-    
+
         <record id="process_process_statementprocess0" model="process.process">
             <field eval="1" name="active"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
             <field eval="&quot;&quot;&quot;Statement&quot;&quot;&quot;" name="name"/>
         </record>
-        
+
     <!--
         Process Node
     -->
-    
+
         <record id="process_node_electronicfile0" model="process.node">
             <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
@@ -26,7 +26,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_manually0" model="process.node">
             <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
@@ -37,7 +37,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_importinvoice0" model="process.node">
             <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
@@ -48,7 +48,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_draftstatement0" model="process.node">
             <field name="menu_id" ref="account.menu_bank_statement_tree"/>
             <field name="model_id" ref="account.model_account_bank_statement"/>
@@ -63,7 +63,7 @@
     <!--
         Process Transition
     -->
-    
+
     	<record id="process_transition_filestatement0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -72,16 +72,17 @@
             <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_electronicfile0"/>
         </record>
-        
+
         <record id="process_transition_invoicemanually0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Manual entry&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Encode the statement manually in the system.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;A statement with manual entries becomes a draft statement.&quot;&quot;&quot;" name="note"/>
+
             <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_manually0"/>
         </record>
-    
+
         <record id="process_transition_invoiceimport0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -90,6 +91,6 @@
             <field model="process.node" name="target_node_id" ref="process_node_draftstatement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_importinvoice0"/>
         </record>
-    
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 7a963c73bf6..716f182c948 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -80,7 +80,7 @@
         </record>
         <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
         <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="account.menu_analytic_accounting"/>
-	
+
 		<record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
             <field name="type">ir.actions.act_window</field>
@@ -88,7 +88,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('date','&lt;',time.strftime('%Y-%m-%d %H:%M:%S'))]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_account_analytic_account_tree2" model="ir.actions.act_window">
@@ -105,10 +105,10 @@
             id="account_analytic_def_chart"
             parent="account_analytic_def_account"/>
 <!--        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
-	
+
 		<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
         <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
-        
+
         <record id="analytic_account_form" model="ir.actions.act_window">
             <field name="name">New Analytic Account</field>
             <field name="res_model">account.analytic.account</field>
@@ -182,7 +182,7 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_account_analytic_line_tree"/>
         </record>
-        <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Entries Encoding by Line"/>
+        <wizard id="action_account_analytic_line" menu="False" model="account.analytic.line" name="account.analytic.line" string="Making Entries by Line"/>
         <menuitem id="next_id_41" name="Analytic Entries" parent="account.menu_finance_entries"/>
         <menuitem type="wizard" icon="STOCK_JUSTIFY_FILL" action="action_account_analytic_line" id="account_entries_analytic_entries" parent="next_id_41"/>
 
diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index d8eee1453f6..07ce5285802 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 ##############################################################################
 #    
@@ -26,6 +27,25 @@ import copy
 from report import report_sxw
 import re
 
+def _get_country(record):
+    if record.partner_id \
+            and record.partner_id.address \
+            and record.partner_id.address[0].country_id:
+        return record.partner_id.address[0].country_id.code
+    else:
+        return ''
+
+def _record_to_report_line(record):
+    return {'date': record.date,
+            'ref': record.ref,
+            'acode': record.account_id.code,
+            'name': record.name,
+            'debit': record.debit,
+            'credit': record.credit,
+            'pname': record.partner_id and record.partner_id.name or '',
+            'country': _get_country(record)
+            }
+
 class account_tax_code_report(rml_parse.rml_parse):
     #_name = 'report.account.tax.code.entries'
     
@@ -36,30 +56,14 @@ class account_tax_code_report(rml_parse.rml_parse):
             'get_line':self.get_line,
         })
         
-    def get_line(self,obj):
-        res = {}
-        result = []
-        line_ids = self.pool.get('account.move.line').search(self.cr,self.uid,[('tax_code_id','=',obj.id)])
-        if line_ids:
-            move_line_objs = self.pool.get('account.move.line').browse(self.cr,self.uid,line_ids)
-            for line in move_line_objs:
-               res['date'] = line.date
-               res['ref'] = line.ref
-               res['acode'] = line.account_id.code
-               res['pname'] = ''
-               res['country'] = ''
+    def get_line(self, obj):
+        line_ids = self.pool.get('account.move.line').search(self.cr, self.uid, [('tax_code_id','=',obj.id)])
+        if not line_ids: return []
 
-               if line.partner_id:
-                   res['pname'] = line.partner_id.name
-                   if line.partner_id.address and line.partner_id.address[0].country_id:
-                           res['country'] = line.partner_id.address[0].country_id.code
-               res['name'] = line.name
-               res['debit'] = line.debit
-               res['credit'] = line.credit
-               result.append(res)
+        return map(_record_to_report_line,
+                   self.pool.get('account.move.line')\
+                       .browse(self.cr, self.uid, line_ids))
 
-        return result
-        
 report_sxw.report_sxw('report.account.tax.code.entries', 'account.tax.code',
     'addons/account/report/account_tax_code.rml', parser=account_tax_code_report, header=False)
 
diff --git a/addons/account/report/general_ledger_landscape.rml b/addons/account/report/general_ledger_landscape.rml
index b0b2181550c..9e937a72baf 100644
--- a/addons/account/report/general_ledger_landscape.rml
+++ b/addons/account/report/general_ledger_landscape.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-   <template pageSize="(1120.0,770.0)" title="Test" author="Martin Simon" allowSplitting="20" >
+   <template pageSize="(1120.5,767.8)" title="Test" author="Martin Simon" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
 			<pageGraphics>
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index a2eba871db4..396e195ac5a 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -38,7 +38,7 @@
 
     <record id="account_move_comp_rule_group" model="ir.rule.group">
         <field name="name">Account Entry</field>
-        <field ref="model_account_move"/>
+        <field ref="model_account_move" name="model_id"/>
         <field eval="True" name="global"/>
     </record>
 
@@ -51,7 +51,7 @@
 
     <record id="account_move_line_comp_rule_group" model="ir.rule.group">
         <field name="name">Entry lines</field>
-        <field model="ir.model" ref="model_account_move_line"/>
+        <field model="ir.model" name="model_id" ref="model_account_move_line"/>
         <field eval="True" name="global"/>
     </record>
 
diff --git a/addons/account/wizard/wizard_central_journal.py b/addons/account/wizard/wizard_central_journal.py
index d30a7040cea..04f02e5051c 100644
--- a/addons/account/wizard/wizard_central_journal.py
+++ b/addons/account/wizard/wizard_central_journal.py
@@ -21,6 +21,7 @@
 
 import wizard
 import pooler
+from tools.translate import _
 
 form = '''<?xml version="1.0"?>
 <form string="Print Central Journal">
diff --git a/addons/account/wizard/wizard_general_journal.py b/addons/account/wizard/wizard_general_journal.py
index eda5855093d..8f90474e0be 100644
--- a/addons/account/wizard/wizard_general_journal.py
+++ b/addons/account/wizard/wizard_general_journal.py
@@ -21,6 +21,7 @@
 
 import wizard
 import pooler
+from tools.translate import _
 
 form = '''<?xml version="1.0"?>
 <form string="Print General Journal">
diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py
index 037bbe03107..6c376f56ce1 100644
--- a/addons/account/wizard/wizard_print_journal.py
+++ b/addons/account/wizard/wizard_print_journal.py
@@ -21,6 +21,7 @@
 
 import wizard
 import pooler
+from tools.translate import _
 
 form = '''<?xml version="1.0"?>
 <form string="Print Journal">
diff --git a/addons/account/wizard/wizard_use_model.py b/addons/account/wizard/wizard_use_model.py
index 19594fe0b21..7d8b9cad12e 100644
--- a/addons/account/wizard/wizard_use_model.py
+++ b/addons/account/wizard/wizard_use_model.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -36,7 +36,7 @@ model_fields = {
 
 form = """<?xml version="1.0"?>
 <form string="Use Model">
-    <label string="Move Lines Created."/>
+    <label string="Entry Lines Created."/>
 </form>
 """
 fields = {
diff --git a/addons/account/wizard/wizard_validate_account_move.py b/addons/account/wizard/wizard_validate_account_move.py
index 6e9c9ccd742..3bce72005dc 100644
--- a/addons/account/wizard/wizard_validate_account_move.py
+++ b/addons/account/wizard/wizard_validate_account_move.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -72,7 +72,7 @@ def _validate_move_lines(self, cr, uid, data, context={}):
             move_ids.append(line.move_id.id)
     move_ids = list(set(move_ids))
     if not move_ids:
-        raise wizard.except_wizard(_('Warning'), _('Selected Move lines does not have any account move enties in draft state'))
+        raise wizard.except_wizard(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
     res = move_obj.button_validate(cr, uid, move_ids, context)
     return {}
 
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index 20ee81c7d9d..81f0e6ae6a0 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-18 15:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:14+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:08+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -22,16 +22,17 @@ msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
 msgstr ""
+"Número de horas que podem ser facturadas mais as que já foram facturadas."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours summary by user"
-msgstr "Sumario de horas por utilizador"
+msgstr "Resumo de horas por utilizador"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr "Ultima data de facturação"
+msgstr "Data da última factura"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -73,7 +74,7 @@ msgstr "Rendimento teórico"
 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo invalido na definição da acção"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
diff --git a/addons/account_analytic_default/i18n/pt.po b/addons/account_analytic_default/i18n/pt.po
index 04e55b00274..73b43541375 100644
--- a/addons/account_analytic_default/i18n/pt.po
+++ b/addons/account_analytic_default/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-29 11:59+0000\n"
-"Last-Translator: aderito.pina@prime.cv <yongzox@hotmail.com>\n"
+"PO-Revision-Date: 2009-11-28 23:49+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:11+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -84,7 +84,7 @@ msgstr "Utilizador"
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index e16f2346f15..94eb18275fc 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 09:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:17+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:09+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -26,7 +26,8 @@ msgstr "Identificação da conta4"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+"especial !"
 
 #. module: account_analytic_plans
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
@@ -37,12 +38,12 @@ msgstr "Analítica cruzada"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr "Identificação da conta5"
+msgstr "Id da conta5"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date2:0
 msgid "End Date"
-msgstr "Data de Finalização"
+msgstr "Data final"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
@@ -56,7 +57,7 @@ msgstr "Taxa (%)"
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
-msgstr "Plano analítico"
+msgstr "Plano Analítico"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
diff --git a/addons/account_balance/i18n/pt.po b/addons/account_balance/i18n/pt.po
index 667683823e9..b04214fca54 100644
--- a/addons/account_balance/i18n/pt.po
+++ b/addons/account_balance/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-05 12:45+0000\n"
-"Last-Translator: aderito.pina@prime.cv <yongzox@hotmail.com>\n"
+"PO-Revision-Date: 2009-11-28 23:52+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
@@ -58,7 +58,7 @@ msgstr "Nome da conta"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Debit"
-msgstr ""
+msgstr "Débito"
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,init,checkyear:0
@@ -141,13 +141,13 @@ msgstr "Com balanço não igual a 0"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Total:"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Balancete da contabilidade"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
@@ -194,7 +194,7 @@ msgstr "Mostrar contas"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Credit"
-msgstr ""
+msgstr "Crédito"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -210,7 +210,7 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Ano :"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -222,7 +222,7 @@ msgstr ""
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Saldo"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index e033e62dd7b..f50123e42f9 100644
--- a/addons/account_budget/i18n/pt.po
+++ b/addons/account_budget/i18n/pt.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 09:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:19+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:18+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "Utilizador responsável"
+msgstr "Utilizador Responsável"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -35,13 +35,13 @@ msgstr "Posições orçamentais"
 #. module: account_budget
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo invalido na definição da acção"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Printed at:"
-msgstr "Imprimido em:"
+msgstr "Impresso em:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
index 69fc92eb16a..3dc66ec4a06 100644
--- a/addons/account_budget/security/account_budget_security.xml
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
     <record id="budget_post_comp_rule_group" model="ir.rule.group">
         <field name="name">Budget post multi-company</field>
-        <field name="model_id" model="model_account_budget_post"/>
+        <field name="model_id" ref="model_account_budget_post"/>
         <field eval="True" name="global"/>
     </record>
     <record id="budget_post_comp_rule" model="ir.rule">
diff --git a/addons/account_budget/wizard/wizard_budget_report.py b/addons/account_budget/wizard/wizard_budget_report.py
index 1260a949c91..f641b64e5b0 100644
--- a/addons/account_budget/wizard/wizard_budget_report.py
+++ b/addons/account_budget/wizard/wizard_budget_report.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -41,7 +41,7 @@ class wizard_report(wizard.interface):
         pool_obj = pooler.get_pool(cr.dbname)
         data_model = pool_obj.get(data['model']).browse(cr,uid,data['id'])
         if not data_model.dotation_ids:
-            raise wizard.except_wizard(_('Insufficient Data!'),_('No Dotations or Master Budget Expenses Found on Budget %s!') % data_model.name)
+            raise wizard.except_wizard(_('Insufficient Data!'),_('No Depreciation or Master Budget Expenses Found on Budget %s!') % data_model.name)
         return data['form']
 
     states = {
diff --git a/addons/account_chart/i18n/pt.po b/addons/account_chart/i18n/pt.po
index 207b20a2ff9..ff837af4135 100644
--- a/addons/account_chart/i18n/pt.po
+++ b/addons/account_chart/i18n/pt.po
@@ -7,16 +7,16 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:45+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2009-11-29 00:16+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:19+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr ""
+msgstr "Remover o plano de contas minimal"
diff --git a/addons/account_date_check/account_date_check.py b/addons/account_date_check/account_date_check.py
index e843c1e76e7..2c4d96dd040 100644
--- a/addons/account_date_check/account_date_check.py
+++ b/addons/account_date_check/account_date_check.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -64,7 +64,7 @@ class account_move_line(osv.osv):
             if not journal.allow_date:
                 period=self.pool.get('account.period').browse(cr,uid,[period_id])[0]
                 if not time.strptime(vals['date'],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') and time.strptime(vals['date'],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'):
-                    raise osv.except_osv(_('Error'),_('The date of your account move is not in the defined period !'))
+                    raise osv.except_osv(_('Error'),_('The date of your Ledger Posting is not in the defined period !'))
         else:
             return True
 
diff --git a/addons/account_date_check/i18n/pt.po b/addons/account_date_check/i18n/pt.po
index 0b0939684e9..230ce03ea74 100644
--- a/addons/account_date_check/i18n/pt.po
+++ b/addons/account_date_check/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:13+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2009-11-29 00:16+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:10+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
@@ -24,9 +24,9 @@ msgstr "XML inválido para a arquitectura de vista"
 #. module: account_date_check
 #: field:account.journal,allow_date:0
 msgid "Allows date not in the period"
-msgstr ""
+msgstr "Permitir data fora do período"
 
 #. module: account_date_check
 #: model:ir.module.module,shortdesc:account_date_check.module_meta_information
 msgid "Account Date check"
-msgstr ""
+msgstr "Verificar data da conta"
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index 6ae91a99eb2..c026bb55350 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -7,55 +7,55 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 14:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:22+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 04:57+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Date :"
-msgstr ""
+msgstr "Data :"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,partner_ids:0
 msgid "Partners"
-msgstr "Terceiros"
+msgstr "Parceiros"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr ""
+msgstr "Ref. do Cliente:"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 #: model:ir.ui.menu,name:account_followup.menu_account_move_open_unreconcile_payable
 msgid "All payable entries"
-msgstr "Todas as entradas pagáveis"
+msgstr "Todas os movimentos a pagar"
 
 #. module: account_followup
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo invalido na definição da acção"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr "Mensagem imprimida"
+msgstr "Mensagem impressa"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Amount In Currency"
-msgstr ""
+msgstr "Montante em Divisa"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Due"
-msgstr "Dívida"
+msgstr "Devido"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -66,7 +66,7 @@ msgstr "Debito total"
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(user_signature)s: User name"
-msgstr "%(assinatura de utilizador)res: Nome de utilizador:"
+msgstr "%(user_signature)s: Nome de utilizador"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
diff --git a/addons/account_followup/wizard/wizard_followup_print.py b/addons/account_followup/wizard/wizard_followup_print.py
index 5f2ee816506..a2330171682 100644
--- a/addons/account_followup/wizard/wizard_followup_print.py
+++ b/addons/account_followup/wizard/wizard_followup_print.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -72,7 +72,7 @@ _followup_wizard_all_form = """<?xml version="1.0"?>
             <label string="%(company_name)s: User's Company name" colspan="2"/>
             <label string="%(company_currency)s: User's Company Currency" colspan="2"/>
             <label string="%(heading)s: Move line header" colspan="2"/>
-            <label string="%(line)s: Account Move lines" colspan="2"/>
+            <label string="%(line)s: Ledger Posting lines" colspan="2"/>
         </page>
     </notebook>
 </form>"""
@@ -168,7 +168,7 @@ class followup_all_print(wizard.interface):
                     cxt = context.copy()
                     cxt['lang'] = partner.lang
                     body = pool.get('res.users').browse(cr, uid, uid, context=cxt).company_id.follow_up_msg
-                    
+
                 total_amt = followup_data.debit - followup_data.credit
                 move_line = ''
                 subtotal_due = 0.0
@@ -268,9 +268,9 @@ class followup_all_print(wizard.interface):
                 if partner_id not in partner_list:
                     partner_list.append(partner_id)
                 to_update[str(id)] = fups[followup_line_id][1]
-        
+
         message = pool.get('res.users').browse(cr, uid, uid, context=context).company_id.follow_up_msg
-        
+
         return {'partner_ids': partner_list, 'to_update': to_update, 'email_body':message}
 
     def _get_screen1_values(self, cr, uid, data, context):
diff --git a/addons/account_invoice_layout/i18n/pt.po b/addons/account_invoice_layout/i18n/pt.po
index a4aa735f5de..57f1824241d 100644
--- a/addons/account_invoice_layout/i18n/pt.po
+++ b/addons/account_invoice_layout/i18n/pt.po
@@ -7,36 +7,37 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 14:54+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:25+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:09+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Sub Total"
-msgstr "Sub-total"
+msgstr "Sub Total"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Invoice Date:"
-msgstr "Data da factura:"
+msgstr "Data da Factura"
 
 #. module: account_invoice_layout
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+"especial !"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Factura cancelada"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -47,7 +48,7 @@ msgstr "Título"
 #. module: account_invoice_layout
 #: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message
 msgid "Invoices with Layout and Message"
-msgstr "Facturas com disposição e mensagem"
+msgstr "Facturas com layout e mensagem"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -57,7 +58,7 @@ msgstr "Desc.(%)"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "(Incl. taxes):"
-msgstr ""
+msgstr "(IVA Incl.):"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
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 74d33a8e5ec..e8f1cee42f3 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -1,263 +1,525 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-<pageTemplate id="first">
-<frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
-</pageTemplate>
-</template>
-<stylesheet>
-<blockTableStyle id="Standard_Outline">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau2">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau6">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,0"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau7">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>
-  
-  <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="-1,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau8">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau3">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau4">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-
-<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"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau5">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="2,0"/>
-<lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="2,2"/>
-</blockTableStyle>
-<initialize>
-<paraStyle name="all" alignment="justify"/>
-</initialize>
-<paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P2" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P4a" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P5" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P7" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P7a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-<paraStyle name="P8" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" />
-<paraStyle name="P8b" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
-<paraStyle name="P8a" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" />
-<paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
-<paraStyle name="P10" fontName="Helvetica-Bold" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P11" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P11a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P12" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P13" fontName="Helvetica-Bold" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="13" alignment="LEFT"/>
-<paraStyle name="P15" fontName="Helvetica" fontSize="12.0" leading="13" alignment="CENTER"/>
-<paraStyle name="P16" fontName="Helvetica" fontSize="14.0" leading="15" alignment="LEFT"/>
-<paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11"/>
-<paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
-<paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-<paraStyle name="P20" fontName="Helvetica" fontSize="6.0" leading="4" spaceBefore="0.0" spaceAfter="0.0"/>
-<paraStyle name="P21" fontName="Helvetica-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P22" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P23" fontName="Helvetica" fontSize="14.0" leading="15" alignment="LEFT"/>
-<paraStyle name="Standard" fontName="Helvetica"/>
-<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="Table Contents" fontName="Helvetica" alignment="CENTER" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
-<paraStyle name="Table Contents1" fontName="Helvetica" alignment="RIGHT" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
-<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="Caption" fontName="Helvetica" fontSize="9.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
-<paraStyle name="Index" fontName="Helvetica"/>
-<paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-</stylesheet>
-<images/>
-<story>
-<para style="P1">[[ repeatIn(objects,'o') ]]</para>
-<para style="P1">[[ setLang(o.partner_id.lang) ]]</para>
-<blockTable colWidths="295.0,232.0" style="Tableau2">
-	<tr>
-		<td><para style="P8b"><font color="white"> </font></para></td>
-		<td>
-		<para style="Standard">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.street ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.street2 or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
-		<para style="P8b"><font color="white"> </font></para>
-		<para style="Standard">Tel.&#xA0;: [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-		<para style="Standard">Fax&#xA0;: [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-		<para style="Standard">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
-		</td>
-	</tr>
-</blockTable>
-<para style="P8b">
-<font color="white"></font>
-</para>
-<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P16"><font>Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font><font>[[ o.number ]]</font></para>
-<para style="P8b">
-<font color="white"></font>
-</para>
-<para style="P17"><font>Document:</font><font>[[ o.name ]]</font></para>
-<para style="P8b"><font color="white"></font></para>
-<para style="P17"><font>Invoice Date: </font><font>[[ formatLang(o.date_invoice,date=True) ]]</font></para>
-<para style="P18"><font>Customer Ref:</font>[[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
-<para style="P8b">
-<font color="white"></font>
-</para>
-<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
-<tr>
-<td><para style="P3">Description / Taxes</para></td>
-<td><para style="P3">Quantity</para></td>
-<td><para style="P4">Unit Price</para></td>
-<td><para style="P4">Disc. (%)</para></td>
-<td><para style="P3">Price</para></td>
-</tr>
-</blockTable>
-<section>
-	<para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
-	<blockTable colWidths="0.0,240.0,77.5,41.0,39.0,50.0,79.0" style="Tableau7">
-		<tr>
-			<td><para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para></td>
-			<td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] / ( [[ a['tax_types'] ]] )</para></td>
-			<td><para style="P7a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td>
-			<td><para style="P5">[[ a['uos'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]<font>[[ a['price_subtotal'] ]]</font><font> [[ a['currency'] ]]</font></para></td>
-		</tr>
-		<tr>
-			<td><para style="P8"><font color="white"></font></para></td>
-			<td><para style="terp_default_Note">Note : [[ format(a['note']) or removeParentNode('tr') ]]</para></td>
-			<td><para style="Table Contents"><font color="white"></font></para></td>
-			<td><para><font color="white"></font></para></td>
-			<td><para style="P7"><font color="white"></font></para></td>
-			<td><para style="Table Contents1"><font color="white"></font></para></td>
-			<td><para style="Table Contents"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-	<blockTable colWidths="453.0,74.0" style="Tableau8">
-		<tr>
-			<td><para style="Table Contents">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para></td>
-			<td><para style="P8">[[ a['type']=='text' and '' ]]</para></td>
-		</tr>
-	</blockTable>
-	<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
-	<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
-		<tr>
-			<td><para style="P3">Description/Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td>
-			<td><para style="P4">Quantity</para></td>
-			<td><para style="P4">Unit Price</para></td>
-			<td><para style="P4">Disc. (%)</para></td>
-			<td><para style="P3">Price</para></td>
-		</tr>
-	</blockTable>
-</section>
-<blockTable colWidths="321.0,210.0" style="Tableau3">
-<tr>
-<td>
-	<blockTable colWidths="100.0,73.0,100.0" style="Tableau8">
-		<tr>
-		<td><para style="P10"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		</tr>
-		<tr>
-		<td><para style="P11a"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-</td>
-<td>
-	<blockTable colWidths="110.0,90.0" style="Tableau5">
-		<tr>
-		<td><para style="P13">Total (Excl. taxes):</para></td>
-		<td><para style="P12"><u>[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</u></para></td>
-		</tr>
-		<tr>
-		<td><para style="P13">Taxes:</para></td>
-		<td><para style="P11a">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td>
-		</tr>
-		<tr>
-		<td><para style="P13">Total <font>(Incl. taxes):</font></para></td>
-		<td><para style="P12"><u>[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</u></para></td>
-		</tr>
-	</blockTable>
-</td>
-</tr>
-</blockTable>
-<blockTable colWidths="251.0,290.0" style="Tableau3">
-<tr>
-<td>
-<blockTable colWidths="81.0,73.0,65.0" style="Tableau4">
-	<tr>
-	<td><para style="P10">Tax</para></td>
-	<td><para style="P8">Base</para></td>
-	<td><para style="P8">Amount</para></td>
-	</tr>
-	<tr>
-	<td><para style="P10"><font>[[ repeatIn(o.tax_line,'t') ]]</font><font>[[ t.name ]]</font></para></td>
-	<td><para style="P11">[[ '%.2f' % t.base ]]</para></td>
-	<td><para style="P11">[[ '%.2f' % t.amount]]</para></td>
-	</tr>
-</blockTable>
-</td>
-<td>
-	<blockTable colWidths="81.0,73.0,65.0" style="Tableau8">
-		<tr>
-		<td><para style="P10"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		</tr>
-		<tr>
-		<td><para style="P11a"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-</td>
-</tr>
-</blockTable>
-<para style="P8b">
-<font color="white"></font>
-</para>
-<para style="P19">[[ format(o.comment) or removeParentNode('para') ]]</para>
-<para style="P19">[[ format(o.payment_term and o.payment_term.note) or removeParentNode('para') ]]</para>
-</story>
-</document>
\ No newline at end of file
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Invoice_General_Header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_General_Detail_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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="Table_Invoice_Line_Content">
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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"/>
+    </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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Coment_Payment_Term">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Payment_Terms">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" 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_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" 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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <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_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Detail_another" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" 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"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <blockTable colWidths="302.0,237.0" style="Tableau2">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="P2">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Document</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Invoice Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description / Taxes</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
+      <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,51.0,19.0" style="Table_Invoice_Line_Content">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] + ')' ) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['uos'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]] [[ a['price_subtotal'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['currency'] ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">Note: [[ format(a['note']) or removeParentNode('tr') ]]</para>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="4.0,278.0,257.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+      <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Unit Price</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Price</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1"/>
+    </section>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Tableau3">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Net Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Taxes:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="57.0,61.0,60.0,360.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Base</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
+      <blockTable colWidths="54.0,61.0,67.0,357.0" style="Table8">
+        <tr>
+          <td>
+            <para style="terp_default_Centre_8">[[ t.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</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) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Coment_Payment_Term">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Payment_Terms">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py
index bf98116b8d4..cf57eb812d8 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.py
+++ b/addons/account_invoice_layout/report/special_message_invoice.py
@@ -131,14 +131,14 @@ class account_invoice_with_message(report_sxw.rml_parse):
                     res['price_subtotal']=''
                     res['currency']=''
                 elif entry.state=='line':
-                    res['quantity']='___________________'
-                    res['price_unit']='______________________'
-                    res['discount']='____________________________________'
-                    res['tax_types']='_____________________'
+                    res['quantity']='_______________'
+                    res['price_unit']='______________'
+                    res['discount']='____________'
+                    res['tax_types']='____________________'
                     res['uos']='_____'
-                    res['name']='______________________________________'
-                    res['price_subtotal']='___________'
-                    res['currency']='_'
+                    res['name']='_______________________________________________'
+                    res['price_subtotal']='____________'
+                    res['currency']='____'
                 elif entry.state=='break':
                     res['type']=entry.state
                     res['name']=entry.name
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index b227ee0c3d0..133fffe5c0f 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -1,272 +1,540 @@
 <?xml version="1.0"?>
 <document filename="test.pdf">
-<template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-<pageTemplate id="first">
-<frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
-</pageTemplate>
-</template>
-<stylesheet>
-<blockTableStyle id="Standard_Outline">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau2">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau6">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="3,0" stop="3,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="4,0" stop="4,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#000000" start="5,0" stop="5,-1"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau7">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,0"/>
-  
-  <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,1" stop="-1,1"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,1"/>
-  <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,2" stop="-1,-1"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau8">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau3">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau4">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="0,0"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="1,0" stop="1,0"/>
-<lineStyle kind="LINEBELOW" colorName="#000000" start="2,0" stop="2,0"/>
-
-<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"/>
-</blockTableStyle>
-<blockTableStyle id="Tableau5">
-<blockAlignment value="LEFT"/>
-<blockValign value="TOP"/>
-<lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="2,0"/>
-<lineStyle kind="LINEABOVE" colorName="#000000" start="0,2" stop="2,2"/>
-</blockTableStyle>
-<initialize>
-<paraStyle name="all" alignment="justify"/>
-</initialize>
-<paraStyle name="P1" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P2" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P4" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P4a" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P5" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P6" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P7" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P7a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-<paraStyle name="P8" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0" />
-<paraStyle name="P8b" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
-<paraStyle name="P8a" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" />
-<paraStyle name="P9" fontName="Times-Italic" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="3.0"/>
-<paraStyle name="P10" fontName="Helvetica-Bold" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P11" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P11a" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P12" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P13" fontName="Helvetica-Bold" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P14" fontName="Helvetica" fontSize="12.0" leading="13" alignment="LEFT"/>
-<paraStyle name="P15" fontName="Helvetica" fontSize="12.0" leading="13" alignment="CENTER"/>
-<paraStyle name="P16" fontName="Helvetica" fontSize="14.0" leading="15" alignment="LEFT"/>
-<paraStyle name="P17" fontName="Helvetica" fontSize="9.0" leading="11"/>
-<paraStyle name="P18" fontName="Helvetica" fontSize="9.0" leading="11"/>
-<paraStyle name="P19" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT"/>
-<paraStyle name="P20" fontName="Helvetica" fontSize="6.0" leading="4" spaceBefore="0.0" spaceAfter="0.0"/>
-<paraStyle name="P21" fontName="Helvetica-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P22" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="P23" fontName="Helvetica" fontSize="14.0" leading="15" alignment="LEFT"/>
-<paraStyle name="Standard" fontName="Helvetica"/>
-<paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="Table Contents" fontName="Helvetica" alignment="CENTER" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
-<paraStyle name="Table Contents1" fontName="Helvetica" alignment="RIGHT" spaceBefore="2.0" spaceAfter="3.0" leading="10"/>
-<paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-<paraStyle name="Caption" fontName="Helvetica" fontSize="9.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
-<paraStyle name="Index" fontName="Helvetica"/>
-<paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-</stylesheet>
-<images/>
-<story>
-<para style="P1">[[ repeatIn(objects,'o') ]]</para>
-<para style="P1">[[ setLang(o.partner_id.lang) ]]</para>
-<blockTable colWidths="295.0,232.0" style="Tableau2">
-	<tr>
-		<td><para style="P2"><font color="white"> </font></para></td>
-		<td>
-		<para style="Standard">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.street ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.street2 or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
-		<para style="Standard">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
-		<para style="Standard">
-		<font color="white"> </font>
-		</para>
-		<para style="Standard">Tel.&#xA0;: [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
-		<para style="Standard">Fax&#xA0;: [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
-		<para style="Standard">VAT&#xA0;: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
-		</td>
-	</tr>
-</blockTable>
-<para style="P8b">
-<font color="white"> </font>
-</para>
-<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-<para style="P23">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-<para style="P16"><font>Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font><font>[[ o.number ]]</font></para>
-<para style="P8b">
-<font color="white"> </font>
-</para>
-<para style="P17"><font>Document:</font><font>[[o.name]]</font></para>
-<para style="P8b"><font color="white"> </font></para>
-<para style="P17"><font>Invoice Date: </font><font>[[ formatLang(o.date_invoice,date=True) ]]</font></para>
-<para style="P18"><font>Customer Ref:</font> [[ o.address_invoice_id.partner_id.ref or '/' ]]</para>
-<para style="P8b"><font color="white"> </font></para>
-<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
-<tr>
-<td><para style="P3">Description / Taxes</para></td>
-<td><para style="P3">Quantity</para></td>
-<td><para style="P4">Unit Price</para></td>
-<td><para style="P4">Disc. (%)</para></td>
-<td><para style="P3">Price</para></td>
-</tr>
-</blockTable>
-<section>
-	<para style="P20">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
-	<blockTable colWidths="0.0,240.0,77.5,41.0,39.0,50.0,79.0" style="Tableau7">
-		<tr>
-			<td><para style="P8">[[ a['type']=='text' and removeParentNode('blockTable')]]</para></td>
-			<td><para style="P8a">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] / ( [[ a['tax_types'] ]] )</para></td>
-			<td><para style="P7a">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para></td>
-			<td><para style="P5">[[ a['uos'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para></td>
-			<td><para style="P7">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]]<font>[[ a['price_subtotal'] ]]</font><font> [[ a['currency'] ]]</font></para></td>
-		</tr>
-		<tr>
-			<td><para style="P8"><font color="white"></font></para></td>
-			<td><para style="terp_default_Note">Note : [[ format(a['note']) or removeParentNode('tr') ]]</para></td>
-			<td><para style="Table Contents"><font color="white"></font></para></td>
-			<td><para><font color="white"></font></para></td>
-			<td><para style="P7"><font color="white"></font></para></td>
-			<td><para style="Table Contents1"><font color="white"></font></para></td>
-			<td><para style="Table Contents"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-	<blockTable colWidths="453.0,74.0" style="Tableau8">
-		<tr>
-			<td><para style="Table Contents">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para></td>
-			<td><para style="P8">[[ a['type']=='text' and '' ]]</para></td>
-		</tr>
-	</blockTable>
-	<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
-	<blockTable colWidths="274.0,62.0,70.0,67.0,68.0" style="Tableau6">
-		<tr>
-			<td><para style="P3">Description/Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para></td>
-			<td><para style="P4">Quantity</para></td>
-			<td><para style="P4">Unit Price</para></td>
-			<td><para style="P4">Disc. (%)</para></td>
-			<td><para style="P3">Price</para></td>
-		</tr>
-	</blockTable>
-</section>
-<blockTable colWidths="321.0,210.0" style="Tableau3">
-<tr>
-<td>
-	<blockTable colWidths="100.0,73.0,100.0" style="Tableau8">
-		<tr>
-		<td><para style="P10"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		</tr>
-		<tr>
-		<td><para style="P11a"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-</td>
-<td>
-	<blockTable colWidths="110.0,90.0" style="Tableau5">
-		<tr>
-		<td><para style="P13">Total (Excl. taxes):</para></td>
-		<td><para style="P12"><u>[[ '%.2f' % o.amount_untaxed ]] [[o.currency_id.code ]]</u></para></td>
-		</tr>
-		<tr>
-		<td><para style="P13">Taxes:</para></td>
-		<td><para style="P11a">[[ '%.2f' % o.amount_tax ]] [[o.currency_id.code ]]</para></td>
-		</tr>
-		<tr>
-		<td><para style="P13">Total <font>(Incl. taxes):</font></para></td>
-		<td><para style="P12"><u>[[ '%.2f' % o.amount_total ]] [[o.currency_id.code ]]</u></para></td>
-		</tr>
-	</blockTable>
-</td>
-</tr>
-</blockTable>
-<blockTable colWidths="251.0,290.0" style="Tableau3">
-<tr>
-<td>
-<blockTable colWidths="81.0,73.0,65.0" style="Tableau4">
-	<tr>
-	<td><para style="P10">Tax</para></td>
-	<td><para style="P8">Base</para></td>
-	<td><para style="P8">Amount</para></td>
-	</tr>
-	<tr>
-	<td><para style="P10"><font>[[ repeatIn(o.tax_line,'t') ]]</font><font>[[ t.name ]]</font></para></td>
-	<td><para style="P11">[[ '%.2f' % t.base ]]</para></td>
-	<td><para style="P11">[[ '%.2f' % t.amount]]</para></td>
-	</tr>
-</blockTable>
-</td>
-<td>
-	<blockTable colWidths="81.0,73.0,65.0" style="Tableau8">
-		<tr>
-		<td><para style="P10"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		<td><para style="P8"><font color="white"></font></para></td>
-		</tr>
-		<tr>
-		<td><para style="P11a"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		<td><para style="P11"><font color="white"></font></para></td>
-		</tr>
-	</blockTable>
-</td>
-</tr>
-</blockTable>
-<para style="P8b">
-<font color="white"> </font>
-</para>
-<para style="P19">[[ format(o.comment) or removeParentNode('para') ]]</para>
-<para style="P19">[[ format(o.payment_term and o.payment_term.note) or removeParentNode('para') ]]</para>
-<para style="P8b">
-<font color="white"> </font>
-</para>
-<section>
-<para style="P19">[[ repeatIn((spcl_msg(data['form']) and spcl_msg(data['form']).splitlines()) or [], 'note') ]]</para>
-<para style="P19">[[ format(note) or removeParentNode('para') ]]</para>
-</section>
-</story>
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Invoice_General_Header">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_General_Detail_Content">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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="Table_Invoice_Line_Content">
+      <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"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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"/>
+    </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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Coment_Payment_Term">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table_Payment_Terms">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" 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_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" 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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <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_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Times-Roman"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Times-Roman" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Times-Roman"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Times-Roman"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="3.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Detail_another" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" 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"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <blockTable colWidths="302.0,237.0" style="Tableau2">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.street ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.street2 or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
+          <para style="terp_default_9">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="P3">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <para style="P2">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="180.0,179.0,180.0" style="Table_Invoice_General_Header">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Document</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Invoice Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="179.0,179.0,180.0" style="Table_General_Detail_Content">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description / Taxes</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Price</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
+      <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,51.0,19.0" style="Table_Invoice_Line_Content">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ (a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] +')' ) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['quantity'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['uos'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['price_unit'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]][[ a['discount'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'})) ]] [[ a['price_subtotal'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['currency'] ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">Note: [[ format(a['note']) or removeParentNode('tr') ]]</para>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <blockTable colWidths="4.0,278.0,257.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['type']=='text' and '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+      <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Unit Price</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Disc. (%)</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Price</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1"/>
+    </section>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Tableau3">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Net Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table4">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Taxes:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="405.0,59.0,54.0,20.0" style="Table6">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">Total:</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="57.0,61.0,60.0,360.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Base</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
+      <blockTable colWidths="54.0,61.0,67.0,357.0" style="Table8">
+        <tr>
+          <td>
+            <para style="terp_default_Centre_8">[[ t.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</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) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_8">
+              <font color="white"> </font>
+            </para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Coment_Payment_Term">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table_Payment_Terms">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ repeatIn((spcl_msg(data['form']) and spcl_msg(data['form']).splitlines()) or [], 'note') ]]</para>
+          <para style="terp_default_9">[[ note or removeParentNode('para') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+  </story>
 </document>
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index febaf80d8da..eb612148d99 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -77,7 +77,7 @@ class account_move_line(osv.osv):
 
     def line2bank(self, cr, uid, ids, payment_type=None, context=None):
         """
-        Try to return for each account move line a corresponding bank
+        Try to return for each Ledger Posting line a corresponding bank
         account according to the payment type.  This work using one of
         the bank of the partner defined on the invoice eventually
         associated to the line.
diff --git a/addons/account_payment/i18n/pt.po b/addons/account_payment/i18n/pt.po
index f599aee3756..aa26adc1901 100644
--- a/addons/account_payment/i18n/pt.po
+++ b/addons/account_payment/i18n/pt.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 09:49+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:26+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:09+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
 #: field:payment.order,date_planned:0
 msgid "Scheduled date if fixed"
-msgstr "Data marcada se afixado"
+msgstr "Data agendada se fixa"
 
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr "Moeda do terceiro"
+msgstr "Divisa do Parceiro"
 
 #. module: account_payment
 #: view:payment.order:0
diff --git a/addons/account_payment/wizard/wizard_payment_order.py b/addons/account_payment/wizard/wizard_payment_order.py
index a973c40378b..3fedbb652ef 100644
--- a/addons/account_payment/wizard/wizard_payment_order.py
+++ b/addons/account_payment/wizard/wizard_payment_order.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -108,7 +108,7 @@ class wizard_payment_order(wizard.interface):
     - Small number of non-reconcilied move line , payment mode and bank account type,
     - Big number of partner and bank account.
 
-    If a type is given, unsuitable account move lines are ignored.
+    If a type is given, unsuitable account Entry lines are ignored.
     """
     states = {
 
diff --git a/addons/account_report/i18n/el.po b/addons/account_report/i18n/el.po
index 4f45798b6a6..f934faacaa3 100644
--- a/addons/account_report/i18n/el.po
+++ b/addons/account_report/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:16+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2009-11-28 19:16+0000\n"
+"Last-Translator: Andreas Porevopoulos <Unknown>\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: 2009-11-17 04:52+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
@@ -32,7 +32,7 @@ msgstr "Επιλέξτε ένα Αρχείο PDF"
 #. module: account_report
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
 
 #. module: account_report
 #: view:account.report.report:0
diff --git a/addons/account_report/i18n/pt.po b/addons/account_report/i18n/pt.po
index fa04c400029..3574dce3fa1 100644
--- a/addons/account_report/i18n/pt.po
+++ b/addons/account_report/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:42+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2009-11-28 23:56+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 04:52+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
@@ -31,7 +31,7 @@ msgstr "Seleccione um ficheiro PDF"
 #. module: account_report
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -46,7 +46,7 @@ msgstr "Pai"
 #. module: account_report
 #: field:account.report.report,disp_graph:0
 msgid "Display As Graph"
-msgstr ""
+msgstr "Mostrar como Gráfico"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -148,7 +148,7 @@ msgstr "Seguinte"
 #. module: account_report
 #: model:ir.module.module,shortdesc:account_report.module_meta_information
 msgid "Reporting for accounting"
-msgstr ""
+msgstr "Relatórios da Contabilidade"
 
 #. module: account_report
 #: wizard_button:print.indicators,next,print:0
@@ -344,7 +344,7 @@ msgstr "Cancelar"
 #. module: account_report
 #: field:account.report.report,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Contas-filho"
 
 #. module: account_report
 #: constraint:ir.model:0
@@ -402,7 +402,7 @@ msgstr "Limite indicador de bondade"
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
 msgid "Other reports"
-msgstr ""
+msgstr "Outros relatórios"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -480,7 +480,7 @@ msgstr "Relatório do cliente"
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Page"
-msgstr ""
+msgstr "Página"
 
 #. module: account_report
 #: selection:account.report.report,type:0
@@ -490,7 +490,7 @@ msgstr "Ver"
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Indicators -"
-msgstr ""
+msgstr "Indicadores -"
 
 #. module: account_report
 #: help:account.report.report,disp_graph:0
@@ -527,8 +527,12 @@ msgid ""
 "    Indicators\n"
 "    "
 msgstr ""
+"Relatórios da contabilidade financeira\n"
+"    Declarações fiscais\n"
+"    Indicadores\n"
+"    "
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "Fiscal Statement"
-msgstr ""
+msgstr "Declaração fiscal"
diff --git a/addons/account_report/i18n/ro.po b/addons/account_report/i18n/ro.po
index 144f5eb0f7e..68c014e7b2d 100644
--- a/addons/account_report/i18n/ro.po
+++ b/addons/account_report/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:57+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 16:30+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:52+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
@@ -21,223 +21,223 @@ msgstr ""
 #: selection:account.report.report,type:0
 #: model:ir.model,name:account_report.model_account_report_history
 msgid "Indicator"
-msgstr ""
+msgstr "Indicator"
 
 #. module: account_report
 #: wizard_field:print.indicators.pdf,init,file:0
 msgid "Select a PDF File"
-msgstr ""
+msgstr "Selectaţi un fişier PDF"
 
 #. module: account_report
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Operators:"
-msgstr ""
+msgstr "Operatori:"
 
 #. module: account_report
 #: field:account.report.report,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Părinte"
 
 #. module: account_report
 #: field:account.report.report,disp_graph:0
 msgid "Display As Graph"
-msgstr ""
+msgstr "Afiseaza grafic"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Debit:"
-msgstr ""
+msgstr "Debit cont"
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "Others"
-msgstr ""
+msgstr "Altele"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "balance(['ACCOUNT_CODE',],fiscalyear)"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Tabular Summary"
-msgstr ""
+msgstr "Sumar tabular"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Notes"
-msgstr ""
+msgstr "Note"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "= Goodness Indicator Limit:"
-msgstr ""
+msgstr "=Limita de indicare BUN:"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Very bad"
-msgstr ""
+msgstr "Foarte rău"
 
 #. module: account_report
 #: field:account.report.history,val:0
 #: field:account.report.report,amount:0
 msgid "Value"
-msgstr ""
+msgstr "Valoare"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "= Badness Indicator Limit:"
-msgstr ""
+msgstr "=Limita de indicare RAU:"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Bad"
-msgstr ""
+msgstr "Rău"
 
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Select the PDF file on which Indicators will be printed."
-msgstr ""
+msgstr "Selectare PDF în care se vor tipări indicatorii"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "> Goodness Indicator Limit:"
-msgstr ""
+msgstr ">Limita de indicare BUN"
 
 #. module: account_report
 #: field:account.report.report,badness_limit:0
 msgid "Badness Indicator Limit"
-msgstr ""
+msgstr "Limita de indicare RAU"
 
 #. module: account_report
 #: selection:account.report.report,status:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Foarte rău"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
 msgid "Indicator history"
-msgstr ""
+msgstr "Istoric indicator"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "credit(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "credit(['ACCOUNT_CODE',],fiscalyear)"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Report Amount:"
-msgstr ""
+msgstr "Sumă raport"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.fiscal_statements
 msgid "Fiscal Statements"
-msgstr ""
+msgstr "Declaraţie fiscală"
 
 #. module: account_report
 #: wizard_button:print.indicators,init,next:0
 msgid "Next"
-msgstr ""
+msgstr "Urmare"
 
 #. module: account_report
 #: model:ir.module.module,shortdesc:account_report.module_meta_information
 msgid "Reporting for accounting"
-msgstr ""
+msgstr "Raportare pentru contabilitate"
 
 #. module: account_report
 #: wizard_button:print.indicators,next,print:0
 #: wizard_button:print.indicators.pdf,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "Tipărire"
 
 #. module: account_report
 #: field:account.report.report,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tip"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
 msgid "Print Indicators in PDF"
-msgstr ""
+msgstr "Tipărire indicator în PDF"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Tax Code:"
-msgstr ""
+msgstr "Cod taxă cont"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Good"
-msgstr ""
+msgstr "Bun"
 
 #. module: account_report
 #: view:account.report.history:0
 msgid "Account Report History"
-msgstr ""
+msgstr "Istoric raportare cont"
 
 #. module: account_report
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: account_report
 #: help:account.report.report,badness_limit:0
 msgid "This Value sets the limit of badness."
-msgstr ""
+msgstr "Această valoare stabileşte limita de indicare RAU"
 
 #. module: account_report
 #: wizard_field:print.indicators,init,select_base:0
 msgid "Choose Criteria"
-msgstr ""
+msgstr "Alegere criterii"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "debit(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "debit(['ACCOUNT_CODE',],fiscalyear)"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Credit:"
-msgstr ""
+msgstr "Credit cont"
 
 #. module: account_report
 #: wizard_view:print.indicators,init:0
 msgid "Select the criteria based on which Indicators will be printed."
-msgstr ""
+msgstr "Alegere criterii după care se face tipărirea indicatorilor"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "< Badness Indicator Limit:"
-msgstr ""
+msgstr "<Limita de indicare RAU"
 
 #. module: account_report
 #: view:account.report.report:0
 #: selection:account.report.report,status:0
 msgid "Very Good"
-msgstr ""
+msgstr "Foarte bun"
 
 #. module: account_report
 #: field:account.report.report,note:0
 msgid "Note"
-msgstr ""
+msgstr "Notă"
 
 #. module: account_report
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Currency:"
-msgstr ""
+msgstr "Valută"
 
 #. module: account_report
 #: field:account.report.report,status:0
 msgid "Status"
-msgstr ""
+msgstr "Stare"
 
 #. module: account_report
 #: help:account.report.report,disp_tree:0
@@ -245,116 +245,121 @@ msgid ""
 "When the indicators are printed, if one indicator is set with this field to "
 "True, then it will display one more graphs with all its children in tree"
 msgstr ""
+"Când se tipăresc indicatori, dacă un indicator are acest câmp setat pe True, "
+"acesta va afişa un grafic suplimentar, cu toate obiectele subordonate, în "
+"mod arbore."
 
 #. module: account_report
 #: selection:account.report.report,status:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
-msgstr ""
+msgstr "Exemplu: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
 
 #. module: account_report
 #: field:account.report.report,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activ"
 
 #. module: account_report
 #: field:account.report.report,disp_tree:0
 msgid "Display Tree"
-msgstr ""
+msgstr "Afişare arbore"
 
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based On Fiscal Years"
-msgstr ""
+msgstr "După anii fiscali"
 
 #. module: account_report
 #: model:ir.model,name:account_report.model_account_report_report
 msgid "Account reporting"
-msgstr ""
+msgstr "Raportări contabile"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Account Balance:"
-msgstr ""
+msgstr "Sold cont"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Expression :"
-msgstr ""
+msgstr "Expresie:"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "report('REPORT_CODE')"
-msgstr ""
+msgstr "report('REPORT_CODE')"
 
 #. module: account_report
 #: field:account.report.report,expression:0
 msgid "Expression"
-msgstr ""
+msgstr "Expresie"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Accounting reporting"
-msgstr ""
+msgstr "Raportări contabile"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_form
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_form
 msgid "New Reporting Item Formula"
-msgstr ""
+msgstr "Formulă nouă de raportare elemente"
 
 #. module: account_report
 #: field:account.report.report,code:0
 #: rml:accounting.report:0
 msgid "Code"
-msgstr ""
+msgstr "Cod"
 
 #. module: account_report
 #: field:account.report.history,tmp:0
 msgid "temp"
-msgstr ""
+msgstr "temp"
 
 #. module: account_report
 #: field:account.report.history,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Perioadă"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Legend of operators"
-msgstr ""
+msgstr "Legendă operatori"
 
 #. module: account_report
 #: wizard_button:print.indicators,init,end:0
 #: wizard_button:print.indicators,next,end:0
 #: wizard_button:print.indicators.pdf,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
 
 #. module: account_report
 #: field:account.report.report,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Subordonate"
 
 #. module: account_report
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: account_report
 #: help:account.report.report,goodness_limit:0
 msgid "This Value sets the limit of goodness."
-msgstr ""
+msgstr "Acesată valoare stabileşte limita de indicare BUN"
 
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_print_indicators
@@ -362,45 +367,45 @@ msgstr ""
 #: wizard_view:print.indicators,init:0
 #: wizard_view:print.indicators,next:0
 msgid "Print Indicators"
-msgstr ""
+msgstr "Tipărire indicatori"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "+ - * / ( )"
-msgstr ""
+msgstr "+ - * / ( )"
 
 #. module: account_report
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Printing date:"
-msgstr ""
+msgstr "Data tipăririi:"
 
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
 msgid "Indicators in PDF"
-msgstr ""
+msgstr "Indicatori în PDF"
 
 #. module: account_report
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "at"
-msgstr ""
+msgstr "la"
 
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Accounting Report"
-msgstr ""
+msgstr "Raport contabil"
 
 #. module: account_report
 #: field:account.report.report,goodness_limit:0
 msgid "Goodness Indicator Limit"
-msgstr ""
+msgstr "Indicator de nivel BUN"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
 msgid "Other reports"
-msgstr ""
+msgstr "Alte rapoarte"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -408,61 +413,63 @@ msgid ""
 "Note: The second arguement 'fiscalyear' and 'period' are optional "
 "arguements.If the value is -1,previous fiscalyear or period is considered."
 msgstr ""
+"Notă: Al doilea argument 'fiscalyear' şi 'period' sunt opţionale. Dacă "
+"valoarea este -1, se consideră anum fiscal precedent."
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
 msgid "Fiscal Statements reporting"
-msgstr ""
+msgstr "Raportare declaraţii fiscale"
 
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based on Fiscal Periods"
-msgstr ""
+msgstr "După perioade fiscale"
 
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_print_indicators
 #: rml:print.indicators:0
 msgid "Indicators"
-msgstr ""
+msgstr "Indicatori"
 
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Print Indicators with PDF"
-msgstr ""
+msgstr "Tipărire indicatori în PDF"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
 msgid "Indicators reporting"
-msgstr ""
+msgstr "Raportare indicatori"
 
 #. module: account_report
 #: field:account.report.report,name:0
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Name"
-msgstr ""
+msgstr "Nume"
 
 #. module: account_report
 #: wizard_field:print.indicators,next,base_selection:0
 msgid "Select Criteria"
-msgstr ""
+msgstr "Selectare criterii"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "tax_code(['ACCOUNT_TAX_CODE',],period)"
-msgstr ""
+msgstr "tax_code(['ACCOUNT_TAX_CODE',],period)"
 
 #. module: account_report
 #: field:account.report.history,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "An fiscal"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree
@@ -470,22 +477,22 @@ msgstr ""
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
 #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
 msgid "Custom reporting"
-msgstr ""
+msgstr "Raportare particularizată"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Page"
-msgstr ""
+msgstr "Pagină"
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "View"
-msgstr ""
+msgstr "Afişare"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Indicators -"
-msgstr ""
+msgstr "Indicatori -"
 
 #. module: account_report
 #: help:account.report.report,disp_graph:0
@@ -493,26 +500,28 @@ msgid ""
 "If the field is set to True, information will be printed as a Graph, "
 "otherwise as an array."
 msgstr ""
+"Dacă este setat pe True, informaţia se fa tipări ca grafic, altfel se va "
+"tipări ca matrice"
 
 #. module: account_report
 #: view:account.report.report:0
 msgid "Return value for status"
-msgstr ""
+msgstr "Returnează valoare pentru stare"
 
 #. module: account_report
 #: field:account.report.report,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secvenţă"
 
 #. module: account_report
 #: rml:accounting.report:0
 msgid "Amount"
-msgstr ""
+msgstr "Sumă"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"
 
 #. module: account_report
 #: model:ir.module.module,description:account_report.module_meta_information
@@ -522,8 +531,12 @@ msgid ""
 "    Indicators\n"
 "    "
 msgstr ""
+"Raportare financiar contabilă\n"
+"    Declaraţii fiscale\n"
+"    Indicatori\n"
+"    "
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "Fiscal Statement"
-msgstr ""
+msgstr "Declaraţie fiscală"
diff --git a/addons/account_reporting/i18n/pt.po b/addons/account_reporting/i18n/pt.po
index 2978225907c..53e13cc9216 100644
--- a/addons/account_reporting/i18n/pt.po
+++ b/addons/account_reporting/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:11+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2009-11-28 23:58+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:13+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
@@ -57,7 +57,7 @@ msgstr "Relatório do balancete"
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -95,6 +95,8 @@ msgid ""
 "Financial and accounting reporting\n"
 "    Balance Sheet Report"
 msgstr ""
+"Relatórios da contabilidade financeira\n"
+"    Balancete"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
@@ -206,7 +208,7 @@ msgstr "Contas"
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "Períodos"
 
 #. module: account_reporting
 #: field:account.report.bs,color_back:0
@@ -216,7 +218,7 @@ msgstr "Cor de fundo"
 #. module: account_reporting
 #: field:account.report.bs,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "Contas-filho"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,end:0
diff --git a/addons/account_reporting/i18n/ro.po b/addons/account_reporting/i18n/ro.po
index 067e1bb8c19..7d0fde3328a 100644
--- a/addons/account_reporting/i18n/ro.po
+++ b/addons/account_reporting/i18n/ro.po
@@ -7,86 +7,88 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:32+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 16:37+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 05:13+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
 #: field:color.rml,code:0
 msgid "code"
-msgstr ""
+msgstr "cod"
 
 #. module: account_reporting
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica-Bold"
-msgstr ""
+msgstr "Helvetica-Bold"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica"
-msgstr ""
+msgstr "Helvetica"
 
 #. module: account_reporting
 #: field:account.report.bs,note:0
 msgid "Note"
-msgstr ""
+msgstr "Notă"
 
 #. module: account_reporting
 #: field:account.report.bs,report_type:0
 msgid "Report Type"
-msgstr ""
+msgstr "Tip raport"
 
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
 #: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
 msgid "Balance Sheet Report"
-msgstr ""
+msgstr "Balanţă contabilă"
 
 #. module: account_reporting
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier"
-msgstr ""
+msgstr "Courier"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-BoldOblique"
-msgstr ""
+msgstr "Courier-BoldOblique"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,report:0
 msgid "Print BalanceSheet"
-msgstr ""
+msgstr "Tipareşte balanţa contabilă"
 
 #. module: account_reporting
 #: help:account.account.balancesheet.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Toate perioadele, dacă rămâne necompletat"
 
 #. module: account_reporting
 #: field:account.report.bs,color_font:0
 msgid "Font Color"
-msgstr ""
+msgstr "Culoare font"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects With Accounts and child of Accounts"
-msgstr ""
+msgstr "Obiecte raport cu conturi şi conturi subordonate"
 
 #. module: account_reporting
 #: model:ir.module.module,description:account_reporting.module_meta_information
@@ -94,150 +96,152 @@ msgid ""
 "Financial and accounting reporting\n"
 "    Balance Sheet Report"
 msgstr ""
+"Raportare financiar-contabilă\n"
+"    Balanţă contabilă"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects With Accounts"
-msgstr ""
+msgstr "Obiecte raport cu conturi"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-Oblique"
-msgstr ""
+msgstr "Courier-Oblique"
 
 #. module: account_reporting
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: account_reporting
 #: field:account.report.bs,name:0
 #: field:color.rml,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nume"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "Account reporting"
-msgstr ""
+msgstr "Raportări contabile"
 
 #. module: account_reporting
 #: model:ir.ui.menu,name:account_reporting.bs_report_action_form
 msgid "Balance Sheet Report Form"
-msgstr ""
+msgstr "Formular balanţă contabilă"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "Notes"
-msgstr ""
+msgstr "Note"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-BoldItalic"
-msgstr ""
+msgstr "Times-BoldItalic"
 
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_account_report_bs
 msgid "Account reporting for Balance Sheet"
-msgstr ""
+msgstr "Raportare conturi pentru balanţă contabilă"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Courier-Bold"
-msgstr ""
+msgstr "Courier-Bold"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Italic"
-msgstr ""
+msgstr "Times-Italic"
 
 #. module: account_reporting
 #: selection:account.report.bs,report_type:0
 msgid "Report Objects Only"
-msgstr ""
+msgstr "Doar obiecte raport"
 
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_color_rml
 msgid "Rml Colors"
-msgstr ""
+msgstr "Culori rml"
 
 #. module: account_reporting
 #: model:ir.module.module,shortdesc:account_reporting.module_meta_information
 msgid "Reporting of Balancesheet for accounting"
-msgstr ""
+msgstr "Raportare balanţe pentru contabilitate"
 
 #. module: account_reporting
 #: field:account.report.bs,code:0
 msgid "Code"
-msgstr ""
+msgstr "Cod"
 
 #. module: account_reporting
 #: field:account.report.bs,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Părinte"
 
 #. module: account_reporting
 #: field:account.report.bs,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secvenţă"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Bold"
-msgstr ""
+msgstr "Times-Bold"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "An fiscal"
 
 #. module: account_reporting
 #: view:account.report.bs:0
 #: field:account.report.bs,account_id:0
 msgid "Accounts"
-msgstr ""
+msgstr "Conturi"
 
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "Perioade"
 
 #. module: account_reporting
 #: field:account.report.bs,color_back:0
 msgid "Back Color"
-msgstr ""
+msgstr "Culoare fundal"
 
 #. module: account_reporting
 #: field:account.report.bs,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "Subordonate"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Times-Roman"
-msgstr ""
+msgstr "Times-Roman"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
 msgid "Helvetica-Oblique"
-msgstr ""
+msgstr "Helvetica-Oblique"
 
 #. module: account_reporting
 #: field:account.report.bs,font_style:0
 msgid "Font"
-msgstr ""
+msgstr "Font"
 
 #. module: account_reporting
 #: wizard_view:account.account.balancesheet.report,init:0
 msgid "Customize Report"
-msgstr ""
+msgstr "Raport particularizat"
diff --git a/addons/account_tax_include/i18n/pt.po b/addons/account_tax_include/i18n/pt.po
index d35c9b1313e..f6a20674d76 100644
--- a/addons/account_tax_include/i18n/pt.po
+++ b/addons/account_tax_include/i18n/pt.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 14:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:29+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 04:58+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+msgstr "XML inválido para a arquitectura da vista"
 
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
@@ -29,24 +29,24 @@ msgstr "Método do preço"
 #. module: account_tax_include
 #: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
 msgid "Invoices and prices with taxes included"
-msgstr ""
+msgstr "Facturas e preços com imposto incluído"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax included"
-msgstr "Taxa incluído"
+msgstr "Imposto incluído"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax excluded"
-msgstr "Taxa incluído"
+msgstr "Imposto excluído"
 
 #. module: account_tax_include
 #: view:account.tax:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Código de cálculo para preços com imposto incluído"
 
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/ro.po b/addons/account_tax_include/i18n/ro.po
index 0d4fd509a03..05dfe13674f 100644
--- a/addons/account_tax_include/i18n/ro.po
+++ b/addons/account_tax_include/i18n/ro.po
@@ -7,46 +7,46 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:26+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 16:40+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:58+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Metoda de pret"
 
 #. module: account_tax_include
 #: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
 msgid "Invoices and prices with taxes included"
-msgstr ""
+msgstr "Facturi şi preţuri cu taxele incluse"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax included"
-msgstr ""
+msgstr "Taxe incluse"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "Fără taxe"
 
 #. module: account_tax_include
 #: view:account.tax:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Calcul cod pentru preţuri cu taxe incluse"
 
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotal"
diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py
index cf95b4c8e81..7265919bb1a 100755
--- a/addons/account_voucher/__terp__.py
+++ b/addons/account_voucher/__terp__.py
@@ -40,10 +40,10 @@
     
     "update_xml" : [
         "voucher_sequence.xml",
-        "account_view.xml",
         "account_report.xml",
         "voucher_wizard.xml",
         "voucher_view.xml",
+        "account_view.xml",
     ],
     'certificate': '0037580727101',
     "active": False,
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
index d9d39718dea..e5cd6a051c2 100644
--- a/addons/account_voucher/account.py
+++ b/addons/account_voucher/account.py
@@ -219,17 +219,7 @@ class AccountMove(osv.osv):
     _inherit = "account.move"
     _columns = {
         'name':fields.char('Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'voucher_type': fields.selection([
-            ('pay_voucher','Cash Payment Voucher'),
-            ('bank_pay_voucher','Bank Payment Voucher'),
-            ('rec_voucher','Cash Receipt Voucher'),
-            ('bank_rec_voucher','Bank Receipt Voucher'),
-            ('cont_voucher','Contra Voucher'),
-            ('journal_sale_vou','Journal Sale Voucher'),
-            ('journal_pur_voucher','Journal Purchase Voucher'),
-            ('journal_voucher','Journal Voucher'),
-            ],'Voucher Type', readonly=True, select=True, states={'draft':[('readonly',False)]}),
-        'narration':fields.text('Narration'),
+        'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
     }
 
 AccountMove()
diff --git a/addons/account_voucher/account_view.xml b/addons/account_voucher/account_view.xml
index 5201e41e468..b415f1af0b9 100755
--- a/addons/account_voucher/account_view.xml
+++ b/addons/account_voucher/account_view.xml
@@ -1,26 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 	<data>
-		<record model="ir.ui.view" id="account_move_inherit">
-			<field name="name">account.move.type.form.inherit1</field>
-			<field name="inherit_id" ref="account.view_move_form"/>
-			<field name="model">account.move</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<field name="journal_id" position="after">
-                    <field name="voucher_type" groups="base.group_extended" select="2"/>
-				</field>
-			</field>
-		</record>
-		
 		<record model="ir.ui.view" id="account_move_inherit_new">
 			<field name="name">account.move.type.form.inherit2</field>
-			<field name="inherit_id" ref="account_move_inherit"/>
+			<field name="inherit_id" ref="account.view_move_form"/>
 			<field name="model">account.move</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<field name="line_id" position="replace">
-				    <field colspan="4" default_get="{'lines':line_id ,'journal':journal_id }" name="line_id" nolabel="1" widget="one2many_list" height="275">
+				    <field colspan="4" default_get="{'lines':line_id ,'journal':journal_id }" name="line_id" nolabel="1" widget="one2many_list" height="250">
                         <form string="Account Entry Line">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
@@ -120,7 +108,7 @@
 			</field>
 		</record>
 	
-<!--	sub_currency	-->
+        <!--	sub_currency	-->
 		<record model="ir.ui.view" id="sub_currency_form">
 			<field name="name">sub.currency.form</field>
 			<field name="inherit_id" ref="base.view_currency_form" />
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index 5f5d3d949da..8adb2eb14da 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -7,47 +7,47 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:39+0000\n"
-"Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
+"PO-Revision-Date: 2009-11-29 00:19+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:17+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
 msgid "Opening Balance Entry"
-msgstr ""
+msgstr "Movimento de abertura do exercício"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
 msgid "Bank Receipts"
-msgstr ""
+msgstr "Recibos do Banco"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Particulars"
-msgstr ""
+msgstr "Particulares"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "State :"
-msgstr ""
+msgstr "Estado :"
 
 #. module: account_voucher
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: account_voucher
 #: rml:voucher.cash_amount:0
 #: rml:voucher.cash_receipt.drcr:0
 msgid "Ref. :"
-msgstr ""
+msgstr "Ref. :"
 
 #. module: account_voucher
 #: selection:account.move,voucher_type:0
@@ -56,7 +56,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_view_cont_voucher_form
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_cont_voucher_form
 msgid "Contra Voucher"
-msgstr ""
+msgstr "Contra Voucher"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
diff --git a/addons/addons/account_budget_crossover/i18n/pt.po b/addons/addons/account_budget_crossover/i18n/pt.po
index 8fdcf4dddcb..5679dff68c3 100644
--- a/addons/addons/account_budget_crossover/i18n/pt.po
+++ b/addons/addons/account_budget_crossover/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: 2008-09-05 16:26+0000\n"
-"PO-Revision-Date: 2008-10-29 10:47+0000\n"
-"Last-Translator: aderito.pina@prime.cv <yongzox@hotmail.com>\n"
+"PO-Revision-Date: 2009-11-29 00:15+0000\n"
+"Last-Translator: Paulino <Unknown>\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: 2009-11-17 05:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget_crossover
@@ -32,13 +32,14 @@ msgstr "Confirmado"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um caracter especial!"
+"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+"especial !"
 
 #. module: account_budget_crossover
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Printed at:"
-msgstr "Imprimido em:"
+msgstr "Impresso em:"
 
 #. module: account_budget_crossover
 #: view:crossovered.budget:0
@@ -53,13 +54,13 @@ msgstr "Validar utilizador"
 #. module: account_budget_crossover
 #: field:crossovered.budget.lines,analytic_account_id:0
 msgid "Analytic Account Ref"
-msgstr "Referençia da conta de contabilidade analítica"
+msgstr "Referençia da conta analítica"
 
 #. module: account_budget_crossover
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Currency:"
-msgstr "Moeda:"
+msgstr "Divisa"
 
 #. module: account_budget_crossover
 #: selection:crossovered.budget,state:0
@@ -110,7 +111,7 @@ msgstr "Nome"
 #. module: account_budget_crossover
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr "Estados"
+msgstr "Estado"
 
 #. module: account_budget_crossover
 #: rml:account.analytic.account.budget:0
@@ -127,7 +128,7 @@ msgstr "Descrição"
 #. module: account_budget_crossover
 #: rml:account.analytic.account.budget:0
 msgid "Analytic Account :"
-msgstr "Conta da contabilidade analítica"
+msgstr "Conta analítica"
 
 #. module: account_budget_crossover
 #: field:crossovered.budget.lines,crossovered_budget_id:0
@@ -145,12 +146,12 @@ msgstr "para"
 #: rml:crossovered.budget.report:0
 #: field:crossovered.budget.lines,planned_amount:0
 msgid "Planned Amount"
-msgstr "Quantidade planeado"
+msgstr "Quantidade planeada"
 
 #. module: account_budget_crossover
 #: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget_entries
 msgid "Entries"
-msgstr "Entradas"
+msgstr "Movimentos"
 
 #. module: account_budget_crossover
 #: view:crossovered.budget:0
@@ -161,7 +162,7 @@ msgstr "Validar"
 #: wizard_view:wizard.crossovered.budget,init:0
 #: wizard_view:wizard.crossovered.budget.summary,init:0
 msgid "Select Options"
-msgstr "Oplões de selecção"
+msgstr "Seleccione as opções"
 
 #. module: account_budget_crossover
 #: rml:account.analytic.account.budget:0
@@ -174,17 +175,17 @@ msgstr "Quantidade prática"
 #: field:crossovered.budget,date_to:0
 #: field:crossovered.budget.lines,date_to:0
 msgid "End Date"
-msgstr "Data de Finalização"
+msgstr "Data final"
 
 #. module: account_budget_crossover
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
+msgstr "XML inválido para a arquitectura da vista"
 
 #. module: account_budget_crossover
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
-msgstr "Montante teórico"
+msgstr "Valor teórico"
 
 #. module: account_budget_crossover
 #: rml:account.analytic.account.budget:0
@@ -217,12 +218,12 @@ msgstr "Orçamento"
 #. module: account_budget_crossover
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"
-msgstr "Períodos de datas seleccionados"
+msgstr "Seleccione o período de datas"
 
 #. module: account_budget_crossover
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr "Data pago"
+msgstr "Data do pagamento"
 
 #. module: account_budget_crossover
 #: model:ir.ui.menu,name:account_budget_crossover.menu_financial_reporting_budget_budget
@@ -251,7 +252,7 @@ msgstr "Início do período"
 #. module: account_budget_crossover
 #: model:ir.actions.wizard,name:account_budget_crossover.wizard_crossovered_budget_menu_1
 msgid "Print Summary of Budgets"
-msgstr "Imprimir sumário de orçamento"
+msgstr "Imprimir resumo do orçamento"
 
 #. module: account_budget_crossover
 #: field:crossovered.budget,code:0
@@ -262,7 +263,7 @@ msgstr "Código"
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Theoretical Amount"
-msgstr "Montante teórico"
+msgstr "Valor teórico"
 
 #. module: account_budget_crossover
 #: rml:crossovered.budget.report:0
@@ -285,7 +286,7 @@ msgstr "Concluído"
 #: view:account.analytic.account:0
 #: view:crossovered.budget.lines:0
 msgid "Budget Lines"
-msgstr "Linhas de orçamento"
+msgstr "Linhas do orçamento"
 
 #. module: account_budget_crossover
 #: wizard_button:wizard.analytic.account.budget.report,init,end:0
diff --git a/addons/addons/association_vertical/i18n/pt.po b/addons/addons/association_vertical/i18n/pt.po
index 8e58c4c2acb..63bc8c139db 100644
--- a/addons/addons/association_vertical/i18n/pt.po
+++ b/addons/addons/association_vertical/i18n/pt.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2008-09-05 16:30+0000\n"
-"PO-Revision-Date: 2008-10-16 10:26+0000\n"
-"Last-Translator: aderito.pina@prime.cv <yongzox@hotmail.com>\n"
+"PO-Revision-Date: 2009-11-29 00:21+0000\n"
+"Last-Translator: Paulino <Unknown>\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: 2009-11-17 05:12+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association_vertical
 #: model:ir.ui.menu,name:association_vertical.menu_crm_case_categ0_act_fund
 msgid "New Fund Opportunity"
-msgstr "Nova oporunidade de fundo"
+msgstr "Nova Oportunidade de financiamento"
 
 #. module: association_vertical
 #: model:ir.actions.act_window,name:association_vertical.crm_case_category_act_fund_my1
diff --git a/addons/addons/base_module_doc_rst/i18n/pt.po b/addons/addons/base_module_doc_rst/i18n/pt.po
index ae6723b39f4..63c1c575bee 100644
--- a/addons/addons/base_module_doc_rst/i18n/pt.po
+++ b/addons/addons/base_module_doc_rst/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2009-06-30 12:52+0000\n"
-"Last-Translator: aderito.pina@prime.cv <yongzox@hotmail.com>\n"
+"PO-Revision-Date: 2009-11-29 00:50+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:19+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_doc_rst
@@ -34,7 +34,7 @@ msgstr "Criar um manual técnico"
 #. 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 "Por favor escolha o local onde o Manual técnico será guardado."
+msgstr "Por favor escolha um ficheiro onde guardar o Manual técnico"
 
 #. module: base_module_doc_rst
 #: wizard_field:tech.guide.rst,init,rst_file:0
diff --git a/addons/analytic_journal_billing_rate/i18n/pt.po b/addons/analytic_journal_billing_rate/i18n/pt.po
index a3a07bdb9b2..82b2d810113 100644
--- a/addons/analytic_journal_billing_rate/i18n/pt.po
+++ b/addons/analytic_journal_billing_rate/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:18+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 00:19+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:17+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
@@ -41,7 +41,7 @@ msgstr "Taxa de facturação por diário para esta conta analítica"
 #. module: analytic_journal_billing_rate
 #: field:analytic_journal_rate_grid,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta Analítica"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index 0ec6660ca0a..d58d556b42b 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 14:02+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 00:20+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:17+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -34,7 +34,7 @@ msgstr "Produto"
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta Analítica"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
diff --git a/addons/auction/i18n/pt.po b/addons/auction/i18n/pt.po
index f426a4e9633..c8f9efb6c61 100644
--- a/addons/auction/i18n/pt.po
+++ b/addons/auction/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 13:48+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:31+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:11+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -44,7 +44,7 @@ msgstr "Vendedor"
 #. module: auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo invalido na definição da acção"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -71,7 +71,7 @@ msgstr "Histórico de lote"
 #. module: auction
 #: field:report.seller.auction,avg_estimation:0
 msgid "Avg estimation"
-msgstr ""
+msgstr "Média estimativa"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
diff --git a/addons/auction/i18n/ro.po b/addons/auction/i18n/ro.po
index c159d026154..428f868a48d 100644
--- a/addons/auction/i18n/ro.po
+++ b/addons/auction/i18n/ro.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2009-11-28 19:18+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 05:11+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
 #: field:report.deposit.border,total_marge:0
 msgid "Total margin"
-msgstr ""
+msgstr "Marja totală"
 
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "SMS - Gateway: clickatell"
-msgstr ""
+msgstr "Gateway SMS: clickatell"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Setează în ciornă"
 
 #. module: auction
 #: field:auction.deposit,partner_id:0
@@ -39,55 +39,55 @@ msgstr ""
 #: field:report.seller.auction,seller:0
 #: field:report.seller.auction2,seller:0
 msgid "Seller"
-msgstr ""
+msgstr "Vânzător"
 
 #. module: auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Provisoire"
-msgstr ""
+msgstr "Provizoriu"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,numerotation:0
 #: selection:auction.lots.send.aie,init,numerotation:0
 msgid "Definitive (ordre catalogue)"
-msgstr ""
+msgstr "Devinitiv (catalog de comenzi)"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_object_date_tree1_my
 msgid "My Encoded Objects Per Day"
-msgstr ""
+msgstr "Obiectele mele înregistrate pe zile"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_lot_history
 msgid "Lot history"
-msgstr ""
+msgstr "Istoric lot"
 
 #. module: auction
 #: field:report.seller.auction,avg_estimation:0
 msgid "Avg estimation"
-msgstr ""
+msgstr "Medie estimată"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
 #: field:report.auction.view2,obj_number:0
 msgid "# of Objects"
-msgstr ""
+msgstr "Nr. de obiecte"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_action_bids_form
 msgid "Bids line"
-msgstr ""
+msgstr "Rând licitaţie"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "Deposit Form"
-msgstr ""
+msgstr "Formular de depozit"
 
 #. module: auction
 #: rml:auction.bids:0
@@ -102,174 +102,175 @@ msgstr ""
 #: field:report.buyer.auction,buyer:0
 #: field:report.buyer.auction2,buyer:0
 msgid "Buyer"
-msgstr ""
+msgstr "Cumpărător"
 
 #. module: auction
 #: field:report.auction.view,nobjects:0
 #: field:report.buyer.auction,object:0
 msgid "No of objects"
-msgstr ""
+msgstr "Nr. de obiecte"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_auction_adjudication_tree
 msgid "Adjudication by Auction"
-msgstr ""
+msgstr "Adjudecare pe licitaţii"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "# of paid items (based on invoices):"
-msgstr ""
+msgstr "Nr. de elemente plătite (pe facturi)"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_numerotate_lot
 msgid "Numerotation (per lot)"
-msgstr ""
+msgstr "Numerotaţie (pe loturi)"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Books, manuscripts, eso."
-msgstr ""
+msgstr "Antichităţi/Cărţi, manuscrise, etc."
 
 #. module: auction
 #: view:auction.deposit:0
 #: model:ir.model,name:auction.model_auction_deposit
 msgid "Deposit Border"
-msgstr ""
+msgstr "Limită depozit"
 
 #. module: auction
 #: wizard_field:auction.lots.make_invoice,init,amount:0
 #: wizard_field:auction.lots.make_invoice_buyer,init,amount:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "Suma facturată"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Tin / Copper wares"
-msgstr ""
+msgstr "Antichităţi/obiecte din cositor/cupru"
 
 #. module: auction
 #: field:auction.lots,paid_ach:0
 msgid "Buyer invoice reconciled"
-msgstr ""
+msgstr "Factură cumpărător reconciliată"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.auction_wizard_able_taken
 msgid "Mark as taken away"
-msgstr ""
+msgstr "Marcare ca ridicat"
 
 #. module: auction
 #: xsl:report.auction.seller.list:0
 msgid "Inv."
-msgstr ""
+msgstr "Inv."
 
 #. module: auction
 #: field:auction.deposit.cost,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Sumă"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_deposit_border
 #: model:ir.ui.menu,name:auction.menu_auction_deposit_border
 msgid "Deposit border"
-msgstr ""
+msgstr "Limită depozit"
 
 #. module: auction
 #: xsl:report.auction.deposit:0
 msgid "VAT"
-msgstr ""
+msgstr "TVA"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Statements"
-msgstr ""
+msgstr "Declaraţii"
 
 #. module: auction
 #: xsl:flagey.huissier:0
 msgid "Adjudication"
-msgstr ""
+msgstr "Adjudecare"
 
 #. module: auction
 #: field:auction.dates,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Cont analitic"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Unclassifieds"
-msgstr ""
+msgstr "Neclasificate"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_auction_dates_next_by_auction
 msgid "Objects by Auction"
-msgstr ""
+msgstr "Obiecte pe licitaţii"
 
 #. module: auction
 #: field:auction.lots,lot_num:0
 #: field:report.unclassified.objects,lot_num:0
 msgid "List Number"
-msgstr ""
+msgstr "Număr pe listă"
 
 #. module: auction
 #: field:auction.deposit.cost,name:0
 msgid "Cost Name"
-msgstr ""
+msgstr "Denumire cost"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antiques"
-msgstr ""
+msgstr "Antichități"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "State"
-msgstr ""
+msgstr "Stare"
 
 #. module: auction
 #: field:report.auction.estimation.adj.category,lot_type:0
 msgid "Object Type"
-msgstr ""
+msgstr "Tip obiect"
 
 #. module: auction
 #: wizard_field:auction.lots.sms_send,init,text:0
 msgid "SMS Message"
-msgstr ""
+msgstr "Mesaj SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Contemporary Art"
-msgstr ""
+msgstr "Artă contemporană"
 
 #. module: auction
 #: view:auction.lots:0
 #: view:report.unclassified.objects:0
 msgid "Ref"
-msgstr ""
+msgstr "Ref"
 
 #. module: auction
 #: field:report.auction.view,nseller:0
 msgid "No of sellers"
-msgstr ""
+msgstr "Număr de vânzători"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
 msgid "ned"
-msgstr ""
+msgstr "ned"
 
 #. module: auction
 #: constraint:hr.attendance:0
 msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
 msgstr ""
+"Eroare: Intrare (resp. Ieşire) trebuie să urmeze după Ieşire (resp. Intrare)"
 
 #. module: auction
 #: view:auction.lots:0
 #: field:report.buyer.auction,total_price:0
 msgid "Total Adj."
-msgstr ""
+msgstr "Total adj."
 
 #. module: auction
 #: field:report.auction.view2,obj_margin_procent:0
 msgid "Net margin (%)"
-msgstr ""
+msgstr "Marjă netă (%)"
 
 #. module: auction
 #: selection:auction.lots,state:0
@@ -277,28 +278,28 @@ msgstr ""
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Unsold"
-msgstr ""
+msgstr "Nevândute"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Dates"
-msgstr ""
+msgstr "Date"
 
 #. module: auction
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Eroare: UV  trebuie să fie întro altă categorie decât UM"
 
 #. module: auction
 #: rml:auction.total.rml:0
 msgid "Items"
-msgstr ""
+msgstr "Elemente"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax5
 #: field:auction.dates,seller_costs:0
 msgid "Seller Costs"
-msgstr ""
+msgstr "Costuri vânzător"
 
 #. module: auction
 #: view:auction.bid:0
@@ -308,75 +309,75 @@ msgstr ""
 #: model:ir.actions.report.xml,name:auction.bid_auction
 #: model:ir.ui.menu,name:auction.menu_action_bid_open
 msgid "Bids"
-msgstr ""
+msgstr "Licitări"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_all_objects_menu
 msgid "All objects"
-msgstr ""
+msgstr "Toate obiectele"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_auction_buyer_reporting_all2
 msgid "Buyer's auction for all months"
-msgstr ""
+msgstr "Acţiunile cumpărătorului pe toate lunile"
 
 #. module: auction
 #: field:auction.bid,contact_tel:0
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
 
 #. module: auction
 #: field:report.auction.view,obj_ret:0
 #: field:report.object.encoded,obj_ret:0
 #: field:report.object.encoded.manager,obj_ret:0
 msgid "# obj ret"
-msgstr ""
+msgstr "Nr ob. ret."
 
 #. module: auction
 #: wizard_button:auction.lots.sms_send,init,send:0
 msgid "Send SMS"
-msgstr ""
+msgstr "Trimite SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Cont. Art/Painting"
-msgstr ""
+msgstr "Artă cont./Pictură"
 
 #. module: auction
 #: field:auction.lots,sel_inv_id:0
 msgid "Seller Invoice"
-msgstr ""
+msgstr "Factură vânzător"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Commissions"
-msgstr ""
+msgstr "Comisioane"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,search,init:0
 msgid "Back"
-msgstr ""
+msgstr "Înapoi"
 
 #. module: auction
 #: model:ir.actions.act_window,name:auction.action_all_objects_unsold
 msgid "Unsold objects"
-msgstr ""
+msgstr "Obiecte nevândute"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_all_objects_sold1
 msgid "Sold Objects"
-msgstr ""
+msgstr "Obiecte vândute"
 
 #. module: auction
 #: view:report.buyer.auction2:0
 #: view:report.seller.auction2:0
 msgid "Sum net margin"
-msgstr ""
+msgstr "Marjă sumă netă"
 
 #. module: auction
 #: view:auction.deposit:0
 msgid "Deposit Border Form"
-msgstr ""
+msgstr "Formular limită depozit"
 
 #. module: auction
 #: field:auction.bid,bid_lines:0
@@ -384,12 +385,12 @@ msgstr ""
 #: rml:bids.lots:0
 #: model:ir.model,name:auction.model_auction_bid_line
 msgid "Bid"
-msgstr ""
+msgstr "Licitare"
 
 #. module: auction
 #: wizard_field:auction.lots.send.aie,date_ask,lang:0
 msgid "Langage"
-msgstr ""
+msgstr "Limbaj"
 
 #. module: auction
 #: field:auction.bid_line,lot_id:0
@@ -397,17 +398,17 @@ msgstr ""
 #: view:auction.lots:0
 #: model:ir.model,name:auction.model_auction_lots
 msgid "Object"
-msgstr ""
+msgstr "Obiect"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_map_user
 msgid "Map buyer username to Partners"
-msgstr ""
+msgstr "Asociere username cu partener"
 
 #. module: auction
 #: wizard_field:auction.lots.numerotate,search,lot_num:0
 msgid "Inventory Number"
-msgstr ""
+msgstr "Număr de inventar"
 
 #. module: auction
 #: wizard_button:auction.lots.buyer_map,check,end:0
@@ -415,17 +416,17 @@ msgstr ""
 #: wizard_button:auction.lots.numerotate,search,end:0
 #: wizard_button:auction.lots.numerotate_cont,init,end:0
 msgid "Exit"
-msgstr ""
+msgstr "Ieșire"
 
 #. module: auction
 #: field:report.buyer.auction2,net_revenue:0
 msgid "Net Revenue"
-msgstr ""
+msgstr "Venit net"
 
 #. module: auction
 #: view:report.buyer.auction:0
 msgid "Auction buyer reporting form view"
-msgstr ""
+msgstr "Raportare cumpărător licitaţie din afişare"
 
 #. module: auction
 #: field:auction.dates,state:0
@@ -435,17 +436,17 @@ msgstr ""
 #: field:report.seller.auction,state:0
 #: field:report.unclassified.objects,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stare"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_sms
 msgid "SMS Send"
-msgstr ""
+msgstr "Trimite SMS"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Cartoons"
-msgstr ""
+msgstr "Antichităţi/Desene"
 
 #. module: auction
 #: view:auction.lots:0
@@ -453,42 +454,42 @@ msgstr ""
 #: selection:report.seller.auction,state:0
 #: selection:report.unclassified.objects,state:0
 msgid "Sold"
-msgstr ""
+msgstr "Vândut"
 
 #. module: auction
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Eroare ! Nu puteţi crea ierarhii recursive de angajaţi"
 
 #. module: auction
 #: field:auction.bid_line,name:0
 msgid "Bid date"
-msgstr ""
+msgstr "Data licitării"
 
 #. module: auction
 #: field:auction.dates,acc_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Cont de cheltuieli"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_wizard_emporte
 msgid "Deliveries Management"
-msgstr ""
+msgstr "Management livrări"
 
 #. module: auction
 #: field:auction.lots,obj_desc:0
 msgid "Object Description"
-msgstr ""
+msgstr "Descriere obiect"
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Contact the Seller"
-msgstr ""
+msgstr "Contactare vânzător"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Auction Objects"
-msgstr ""
+msgstr "Obiecte licitate"
 
 #. module: auction
 #: field:auction.lots,gross_revenue:0
@@ -496,60 +497,60 @@ msgstr ""
 #: field:report.object.encoded.manager,gross_revenue:0
 #: field:report.seller.auction2,gross_revenue:0
 msgid "Gross revenue"
-msgstr ""
+msgstr "Venit brut"
 
 #. module: auction
 #: view:report.seller.auction2:0
 msgid "Auction reporting2 form view"
-msgstr ""
+msgstr "Raportare2 licitaţie în afişare formular"
 
 #. module: auction
 #: model:ir.actions.wizard,name:auction.wizard_pay
 msgid "Pay objects of the buyer"
-msgstr ""
+msgstr "Plată obiecte cumpărător"
 
 #. module: auction
 #: view:report.deposit.border:0
 msgid "Depositer's statistics"
-msgstr ""
+msgstr "Statistici depozitar"
 
 #. module: auction
 #: view:auction.lots:0
 msgid "Buyer information"
-msgstr ""
+msgstr "Informaţii cumpărător"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_seller_auction
 msgid "Auction Reporting on seller view"
-msgstr ""
+msgstr "Raportare licitaţie în afişare vânzător"
 
 #. module: auction
 #: field:auction.lots,name2:0
 msgid "Short Description (2)"
-msgstr ""
+msgstr "Scurtă descriere (2)"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_dates
 msgid "auction.dates"
-msgstr ""
+msgstr "auction.dates"
 
 #. module: auction
 #: rml:auction.total.rml:0
 #: model:ir.ui.menu,name:auction.auction_buyers_menu
 msgid "Buyers"
-msgstr ""
+msgstr "Cumpărători"
 
 #. module: auction
 #: wizard_field:auction.pay.buy,init,amount:0
 #: wizard_field:auction.pay.buy,init,amount2:0
 #: wizard_field:auction.pay.buy,init,amount3:0
 msgid "Amount paid"
-msgstr ""
+msgstr "Suma plătită"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_report_latest_doposit_tree
 msgid "My Latest Deposits"
-msgstr ""
+msgstr "Ultimele mele depozite"
 
 #. module: auction
 #: field:auction.lots,lot_est1:0
@@ -558,79 +559,79 @@ msgstr ""
 #: field:report.auction.view,min_est:0
 #: field:report.unclassified.objects,lot_est1:0
 msgid "Minimum Estimation"
-msgstr ""
+msgstr "Estimare de minim"
 
 #. module: auction
 #: view:auction.dates:0
 msgid "Accounting"
-msgstr ""
+msgstr "Contabilitate"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.menu_buyer_allmonth_view2
 msgid "Buyer's Revenues"
-msgstr ""
+msgstr "Venituri cumpărător"
 
 #. module: auction
 #: model:ir.model,name:auction.model_report_auction_adjudication
 msgid "report_auction_adjudication"
-msgstr ""
+msgstr "report_auction_adjudication"
 
 #. module: auction
 #: field:auction.bid_line,price:0
 msgid "Maximum Price"
-msgstr ""
+msgstr "Preţ maxim"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
 msgid "eng"
-msgstr ""
+msgstr "eng"
 
 #. module: auction
 #: view:report.buyer.auction2:0
 msgid "Auction buyer reporting tree view2"
-msgstr ""
+msgstr "Raportare cumpărători în afişare arbore2"
 
 #. module: auction
 #: wizard_view:auction.lots.sms_send,init:0
 msgid "Bulk SMS send"
-msgstr ""
+msgstr "Trimitere pachet SMS-uri"
 
 #. module: auction
 #: wizard_view:auction.taken,init:0
 msgid "Select lots which are Sold"
-msgstr ""
+msgstr "Selectare loturi vândute"
 
 #. module: auction
 #: field:auction.lots,statement_id:0
 msgid "Payment"
-msgstr ""
+msgstr "Plată"
 
 #. module: auction
 #: selection:auction.lots.send.aie,date_ask,lang:0
 msgid "fr"
-msgstr ""
+msgstr "ro"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Old weapons and militaria"
-msgstr ""
+msgstr "Antichităţi/Arme vechi şi efecte militare"
 
 #. module: auction
 #: selection:auction.lot.category,aie_categ:0
 msgid "Antique/Oriental Arts/Chineese furnitures"
-msgstr ""
+msgstr "Antichităţi/Arte orientale/Mobilă chinezească"
 
 #. module: auction
 #: selection:auction.deposit,method:0
 msgid "Keep until sold"
-msgstr ""
+msgstr "Păstrare până la vânzare"
 
 #. module: auction
 #: wizard_button:auction.lots.numerotate,init,choice:0
 #: wizard_button:auction.lots.send.aie,init,date_ask:0
 #: wizard_button:auction.lots.send.aie.results,init,date_ask:0
 msgid "Continue"
-msgstr ""
+msgstr "Continuare"
 
 #. module: auction
 #: field:report.object.encoded,obj_num:0
diff --git a/addons/audittrail/i18n/pt.po b/addons/audittrail/i18n/pt.po
index 8be20c0d6ce..c09e6576380 100644
--- a/addons/audittrail/i18n/pt.po
+++ b/addons/audittrail/i18n/pt.po
@@ -7,26 +7,27 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 13:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:36+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:16+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "Auditar Rastreio"
 
 #. module: audittrail
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+"especial !"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
@@ -36,7 +37,7 @@ msgstr "Registo"
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr "Registado"
+msgstr "Subscrito"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -51,7 +52,7 @@ msgstr "Criar"
 #. module: audittrail
 #: wizard_view:audittrail.view.log,init:0
 msgid "Audit Logs"
-msgstr ""
+msgstr "Registos de Auditoria"
 
 #. module: audittrail
 #: field:audittrail.rule,state:0
@@ -71,7 +72,7 @@ msgstr "Valor antigo"
 #. module: audittrail
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: audittrail
 #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
@@ -91,7 +92,7 @@ msgstr "Método"
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,from:0
 msgid "Log From"
-msgstr "Registo de"
+msgstr "Registar desde"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
diff --git a/addons/audittrail/i18n/ro.po b/addons/audittrail/i18n/ro.po
index 6d91f90bd66..7c45b623756 100644
--- a/addons/audittrail/i18n/ro.po
+++ b/addons/audittrail/i18n/ro.po
@@ -7,146 +7,148 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:22+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 18:55+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 05:16+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
 msgid "Audit Trail"
-msgstr ""
+msgstr "Traseu de audit"
 
 #. module: audittrail
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "Jurnal"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "Subscris"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "Valoare veche: "
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Create"
-msgstr ""
+msgstr "Creare"
 
 #. module: audittrail
 #: wizard_view:audittrail.view.log,init:0
 msgid "Audit Logs"
-msgstr ""
+msgstr "Jurnale de audit"
 
 #. module: audittrail
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "Stare"
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Ciornă"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "Valoare veche"
 
 #. module: audittrail
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: audittrail
 #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
 msgid "View log"
-msgstr ""
+msgstr "Vizualizare jurnal"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "audittrail.log.line"
-msgstr ""
+msgstr "audittrail.log.line"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "Metodă"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,from:0
 msgid "Log From"
-msgstr ""
+msgstr "Formular jurnal"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "Id jurnal"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "Id resursă"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Write"
-msgstr ""
+msgstr "Scriere"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail
 msgid "Audittrails"
-msgstr ""
+msgstr "Trasee audit"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "Rânduri jurnal"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribe"
-msgstr ""
+msgstr "Subscrie"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Read"
-msgstr ""
+msgstr "Citire"
 
 #. module: audittrail
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Obiect"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "Regulă traseu de audit"
 
 #. module: audittrail
 #: wizard_field:audittrail.view.log,init,to:0
 msgid "Log To"
-msgstr ""
+msgstr "Jurnalizează în"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "Noua valoare text: "
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
@@ -156,153 +158,157 @@ msgid ""
 "    Subscribe Rules for read, write, create and delete on objects and check "
 "logs"
 msgstr ""
+"Permite administratorului să urmărească toate operaţiile utilizatorilor "
+"asupra obiectelor din sistem\n"
+"    Reguli de subscriere pentru citire, scriere, creare şi ştergere a "
+"obiectelor şi jurnalelor de verificări"
 
 #. module: audittrail
 #: field:audittrail.log,timestamp:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: audittrail
 #: field:audittrail.log,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utilizator"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "Valoare veche text: "
 
 #. module: audittrail
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nume"
 
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "Rânduri jurnal"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
 msgid "Subscribed Rules"
-msgstr ""
+msgstr "Reguli subscrise"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
 msgid "Fields"
-msgstr ""
+msgstr "Câmpuri"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "Reguli traseu audit"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "audittrail.rule"
-msgstr ""
+msgstr "audittrail.rule"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "UnSubscribe"
-msgstr ""
+msgstr "Revocare subscriere"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log writes"
-msgstr ""
+msgstr "Scrieri în jurnal"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "audittrail.log"
-msgstr ""
+msgstr "audittrail.log"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "Descriere câmp"
 
 #. module: audittrail
 #: selection:audittrail.log,method:0
 msgid "Delete"
-msgstr ""
+msgstr "Ştergere"
 
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,open:0
 msgid "Open Logs"
-msgstr ""
+msgstr "Deschidere jurnal"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value_text:0
 msgid "New value Text"
-msgstr ""
+msgstr "Valoare text nouă"
 
 #. module: audittrail
 #: field:audittrail.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Nume regulă"
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log reads"
-msgstr ""
+msgstr "Citiri jurnal"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
 msgid "Logs"
-msgstr ""
+msgstr "Jurnale"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "Valoare nouă"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
 msgid "View Logs"
-msgstr ""
+msgstr "Jurnal afişare"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log creates"
-msgstr ""
+msgstr "Jurnal creări"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "Jurnal trasee de audit"
 
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
 msgid "Rules"
-msgstr ""
+msgstr "Reguli"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "Valoare nouă: "
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "Utilizatori"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "Valoare text veche"
 
 #. module: audittrail
 #: wizard_button:audittrail.view.log,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
 
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log deletes"
-msgstr ""
+msgstr "Jurnal ştergeri"
diff --git a/addons/base_contact/i18n/es_AR.po b/addons/base_contact/i18n/es_AR.po
index a598def4e71..4c4bb579b05 100644
--- a/addons/base_contact/i18n/es_AR.po
+++ b/addons/base_contact/i18n/es_AR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 08:30+0000\n"
-"Last-Translator: Julieta Catalano <jcatalano@thymbra.com>\n"
+"PO-Revision-Date: 2009-11-28 14:17+0000\n"
+"Last-Translator: Carlos Macri - Daycrom <cmacri@daycrom.com.ar>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -82,7 +82,7 @@ msgstr "Contacto a cargo"
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nombre de modelo inválido en la definición de la acción."
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
@@ -198,7 +198,7 @@ msgstr "Categorías"
 #. module: base_contact
 #: field:res.partner.contact,function_id:0
 msgid "Main Function"
-msgstr ""
+msgstr "Función principal"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
diff --git a/addons/base_contact/i18n/pt.po b/addons/base_contact/i18n/pt.po
index 523ee743076..d1cf58022bb 100644
--- a/addons/base_contact/i18n/pt.po
+++ b/addons/base_contact/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 08:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 23:39+0000\n"
+"Last-Translator: Paulino <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: 2009-11-18 04:36+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -31,8 +31,8 @@ msgstr "res.partner.contact"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter nenhum caráctere "
-"especial!"
+"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+"especial !"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
diff --git a/addons/base_contact/i18n/ro.po b/addons/base_contact/i18n/ro.po
index bfd5c82cad7..41093ea1dea 100644
--- a/addons/base_contact/i18n/ro.po
+++ b/addons/base_contact/i18n/ro.po
@@ -7,35 +7,37 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:41+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 16:54+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
 msgid "Contact Seq."
-msgstr ""
+msgstr "Secvență contacte"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 msgid "res.partner.contact"
-msgstr ""
+msgstr "res.partner.contact"
 
 #. module: base_contact
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
 msgid "Partner Function"
-msgstr ""
+msgstr "Funcție la partener"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -45,27 +47,27 @@ msgstr ""
 #: view:res.partner.address:0
 #: field:res.partner.address,job_ids:0
 msgid "Contacts"
-msgstr "Adresa"
+msgstr "Contacte"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_partner:0
 msgid "Partner Seq."
-msgstr ""
+msgstr "Secvență parteneri"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: base_contact
 #: field:res.partner.contact,first_name:0
 msgid "First Name"
-msgstr ""
+msgstr "Prenume"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_job
 msgid "Contact Partner Function"
-msgstr ""
+msgstr "Funcția contactului la partener"
 
 #. module: base_contact
 #: field:res.partner.job,other:0
@@ -75,22 +77,22 @@ msgstr "Alte"
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
-msgstr ""
+msgstr "Contact în funcţie"
 
 #. module: base_contact
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Partener la adresă"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "# of Contacts"
-msgstr ""
+msgstr "# de contacte"
 
 #. module: base_contact
 #: help:res.partner.job,other:0
@@ -100,7 +102,7 @@ msgstr "Cămp adițional pentru telefon"
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
-msgstr ""
+msgstr "Funcție"
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
@@ -110,32 +112,32 @@ msgstr "Fax"
 #. module: base_contact
 #: field:res.partner.contact,lang_id:0
 msgid "Language"
-msgstr ""
+msgstr "Limbă"
 
 #. module: base_contact
 #: field:res.partner.job,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_contacttofunction0
 msgid "Defines contacts and functions."
-msgstr ""
+msgstr "Definește contactele și funcțiile"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
 msgid "Title"
-msgstr ""
+msgstr "Titlu"
 
 #. module: base_contact
 #: view:res.partner.job:0
 msgid "Contact Functions"
-msgstr ""
+msgstr "Funcțiile contactului"
 
 #. module: base_contact
 #: model:ir.module.module,shortdesc:base_contact.module_meta_information
 msgid "Base Contact"
-msgstr ""
+msgstr "Contact de bază"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_partner:0
@@ -143,34 +145,35 @@ msgid ""
 "Order of importance of this job title in the list of job title of the linked "
 "partner"
 msgstr ""
+"Ordinea importanței poziţiei in lista de poziţii la partenerul asociat"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
 #: field:res.partner.job,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-Mail"
 
 #. module: base_contact
 #: field:res.partner.job,date_stop:0
 msgid "Date Stop"
-msgstr ""
+msgstr "Data de sfârșit"
 
 #. module: base_contact
 #: view:res.partner:0
 #: field:res.partner.job,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adresă"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_res_partner_job
 #: model:ir.ui.menu,name:base_contact.menu_action_res_partner_job
 msgid "Contact's Jobs"
-msgstr ""
+msgstr "Funcţia contactului"
 
 #. module: base_contact
 #: field:res.partner.contact,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Naţionalitate"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
@@ -178,12 +181,13 @@ msgid ""
 "Order of importance of this address in the list of addresses of the linked "
 "contact"
 msgstr ""
+"Ordinea importanței acestei adrese în lista de adrese a contactului asociat"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
-msgstr ""
+msgstr "Sarcina principală"
 
 #. module: base_contact
 #: view:res.partner:0
@@ -193,27 +197,27 @@ msgstr "Categorii"
 #. module: base_contact
 #: field:res.partner.contact,function_id:0
 msgid "Main Function"
-msgstr ""
+msgstr "Funcţia principală"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_partnertoaddress0
 msgid "Define partners and their addresses."
-msgstr ""
+msgstr "Definire parteneri și adresele lor"
 
 #. module: base_contact
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: base_contact
 #: model:process.process,name:base_contact.process_process_basecontactprocess0
 msgid "Base Contact Process"
-msgstr ""
+msgstr "Proces contact de bază"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Seq."
-msgstr ""
+msgstr "Secvență"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -223,132 +227,132 @@ msgstr "Extensie"
 #. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobil"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
 msgid "Internal/External extension phone number"
-msgstr "Prefix numar de telefon"
+msgstr "Număr telefon extensie internă/externă"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
-msgstr ""
+msgstr "Pesoane cu care lucraţi."
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Extra Information"
-msgstr ""
+msgstr "Informaţii suplimentare"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: field:res.partner.contact,job_ids:0
 msgid "Functions and Addresses"
-msgstr ""
+msgstr "Funcții și adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activ"
 
 #. module: base_contact
 #: field:res.partner.job,contact_id:0
 msgid "Contact"
-msgstr ""
+msgstr "Contact"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_partners0
 msgid "Companies you work with."
-msgstr ""
+msgstr "Companii cu care lucrați"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
 msgid "Main Employer"
-msgstr ""
+msgstr "Angajator principal"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_functiontoaddress0
 msgid "Function to address"
-msgstr ""
+msgstr "Funcţie la adresă"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Partner Contacts"
-msgstr ""
+msgstr "Contacte partener"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contact partener"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
 msgid "Partners"
-msgstr ""
+msgstr "Parteneri"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
 #: view:res.partner:0
 msgid "Addresses"
-msgstr ""
+msgstr "Adrese"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_addresses0
 msgid "Working and private addresses."
-msgstr ""
+msgstr "Adrese la locul de muncă şi private"
 
 #. module: base_contact
 #: field:res.partner.contact,name:0
 msgid "Last Name"
-msgstr ""
+msgstr "Nume"
 
 #. module: base_contact
 #: field:res.partner.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stare"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 #: view:res.partner.job:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: base_contact
 #: selection:res.partner.job,state:0
 msgid "Past"
-msgstr ""
+msgstr "Anterior"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "General Information"
-msgstr ""
+msgstr "Informaţii generale"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
 msgid "Jobs at a same partner address."
-msgstr ""
+msgstr "Locuri de muncă la aceeași adresă partener"
 
 #. module: base_contact
 #: field:res.partner.job,name:0
 msgid "Partner"
-msgstr ""
+msgstr "Partener"
 
 #. module: base_contact
 #: field:res.partner.job,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Data de început"
 
 #. module: base_contact
 #: model:process.transition,note:base_contact.process_transition_functiontoaddress0
 msgid "Define functions and address."
-msgstr ""
+msgstr "Definire funcții și adrese"
 
 #. module: base_contact
 #: field:res.partner.contact,website:0
 msgid "Website"
-msgstr ""
+msgstr "Website"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
 msgid "Birth Date"
-msgstr ""
+msgstr "Data nașterii"
diff --git a/addons/base_contact/i18n/sk.po b/addons/base_contact/i18n/sk.po
index 6fccca98f86..b74025d71b5 100644
--- a/addons/base_contact/i18n/sk.po
+++ b/addons/base_contact/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-23 21:00+0000\n"
+"PO-Revision-Date: 2009-11-27 12:47+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-24 04:38+0000\n"
+"X-Launchpad-Export-Date: 2009-11-28 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -25,13 +25,14 @@ msgstr ""
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
 msgid "res.partner.contact"
-msgstr ""
+msgstr "res.partner.contact"
 
 #. module: base_contact
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
@@ -86,7 +87,7 @@ msgstr "Neplatný názov modelu v akcii definície."
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_partnertoaddress0
 msgid "Partner to address"
-msgstr ""
+msgstr "Adresy partnera"
 
 #. module: base_contact
 #: view:res.partner.address:0
@@ -96,7 +97,7 @@ msgstr "# z Kontaktov"
 #. module: base_contact
 #: help:res.partner.job,other:0
 msgid "Additional phone field"
-msgstr ""
+msgstr "Doplnenie telefónneho poľa"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
diff --git a/addons/base_iban/i18n/pt.po b/addons/base_iban/i18n/pt.po
index 46eba175f55..25645c5a118 100644
--- a/addons/base_iban/i18n/pt.po
+++ b/addons/base_iban/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-09 09:52+0000\n"
-"Last-Translator: aderito.pina@prime.cv <yongzox@hotmail.com>\n"
+"PO-Revision-Date: 2009-11-29 00:46+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 04:51+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -50,7 +50,7 @@ msgstr "iban"
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
diff --git a/addons/base_iban/i18n/ro.po b/addons/base_iban/i18n/ro.po
index b2abd558a1f..75e8747144e 100644
--- a/addons/base_iban/i18n/ro.po
+++ b/addons/base_iban/i18n/ro.po
@@ -7,57 +7,57 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:47+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 16:57+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:51+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
-msgstr ""
+msgstr "Cod poştal"
 
 #. module: base_iban
 #: help:res.partner.bank,iban:0
 msgid "International Bank Account Number"
-msgstr ""
+msgstr "Numar international de cont bancar"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr ""
+msgstr "country_id"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bic"
-msgstr ""
+msgstr "BIC"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
 msgid "iban"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
-msgstr ""
+msgstr "IBAN cont"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
-msgstr ""
+msgstr "Număr cont"
diff --git a/addons/base_module_merge/i18n/pt.po b/addons/base_module_merge/i18n/pt.po
index 7afac878044..99b82ed8cc7 100644
--- a/addons/base_module_merge/i18n/pt.po
+++ b/addons/base_module_merge/i18n/pt.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-08 15:23+0000\n"
-"Last-Translator: aderito.pina@prime.cv <yongzox@hotmail.com>\n"
+"PO-Revision-Date: 2009-11-29 00:47+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:19+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
@@ -34,7 +34,7 @@ msgstr "Junção de módulos"
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,directory_name:0
@@ -91,7 +91,7 @@ msgstr "Ficheiro módulo .zip"
 #. module: base_module_merge
 #: model:ir.module.module,shortdesc:base_module_merge.module_meta_information
 msgid "Module Merger"
-msgstr ""
+msgstr "Fundir modulos"
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
diff --git a/addons/base_module_publish/i18n/pt.po b/addons/base_module_publish/i18n/pt.po
index ab19a5b7fef..ce0b981794e 100644
--- a/addons/base_module_publish/i18n/pt.po
+++ b/addons/base_module_publish/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-08 17:12+0000\n"
-"Last-Translator: aderito.pina@prime.cv <yongzox@hotmail.com>\n"
+"PO-Revision-Date: 2009-11-29 00:47+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 04:50+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
@@ -62,7 +62,7 @@ msgstr "Nome do ficheiro"
 #. module: base_module_publish
 #: model:ir.module.module,shortdesc:base_module_publish.module_meta_information
 msgid "Module publisher"
-msgstr ""
+msgstr "Publicar modulos"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,demourl:0
@@ -82,7 +82,7 @@ msgstr "Outro prorietario"
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_export,init,include_src:0
 msgid "Include sources"
-msgstr ""
+msgstr "Incluir fontes"
 
 #. module: base_module_publish
 #: selection:base_module_publish.module_publish,step1,operation:0
diff --git a/addons/base_module_quality/i18n/pt.po b/addons/base_module_quality/i18n/pt.po
index 340dd8706e2..cf54b56015c 100644
--- a/addons/base_module_quality/i18n/pt.po
+++ b/addons/base_module_quality/i18n/pt.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 00:04+0000\n"
+"Last-Translator: Paulino <Unknown>\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: 2009-11-17 05:19+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
-msgstr ""
+msgstr "Resultado final (%)"
 
 #. module: base_module_quality
 #: constraint:ir.model:0
@@ -42,27 +42,27 @@ msgstr ""
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Detail"
-msgstr ""
+msgstr "Detalhe"
 
 #. module: base_module_quality
 #: field:module.quality.detail,note:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
-msgstr ""
+msgstr "Detalhes"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "Ponderação"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -70,17 +70,19 @@ msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
 msgstr ""
+"Alguns testes são mais críticos que outros, por isso têm um maior peso no "
+"resultado final."
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: field:module.quality.check,check_detail_ids:0
 msgid "Tests"
-msgstr ""
+msgstr "Testes"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "Ignorado"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
@@ -102,33 +104,33 @@ msgstr ""
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
 msgid "Name"
-msgstr ""
+msgstr "Name"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
-msgstr ""
+msgstr "Guardar o relatório"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nome do ficheiro"
 
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "Resultado (%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
 msgid "Save report as .html format"
-msgstr ""
+msgstr "Guarde o relatório no formato html"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 #: field:module.quality.detail,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumo"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
@@ -138,12 +140,12 @@ msgstr ""
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "Entradas padrão"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "Gravar Relatório"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
@@ -158,25 +160,25 @@ msgstr ""
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Done"
-msgstr ""
+msgstr "Pronto"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: view:module.quality.detail:0
 msgid "Result"
-msgstr ""
+msgstr "Resultado"
 
 #. module: base_module_quality
 #: wizard_button:quality_detail_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: base_module_quality
 #: field:module.quality.detail,message:0
 msgid "Message"
-msgstr ""
+msgstr "Mensagem"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
 msgid "Quality"
-msgstr ""
+msgstr "Qualidade"
diff --git a/addons/base_module_quality/i18n/ro.po b/addons/base_module_quality/i18n/ro.po
index 43c20b09702..b482e3a762b 100644
--- a/addons/base_module_quality/i18n/ro.po
+++ b/addons/base_module_quality/i18n/ro.po
@@ -8,60 +8,62 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-18 12:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 17:03+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 05:19+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
-msgstr ""
+msgstr "Scor final (%)"
 
 #. module: base_module_quality
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: base_module_quality
 #: model:ir.module.module,shortdesc:base_module_quality.module_meta_information
 msgid "Base module quality"
-msgstr ""
+msgstr "Calitate module elementare"
 
 #. module: base_module_quality
 #: field:module.quality.check,name:0
 msgid "Rated Module"
-msgstr ""
+msgstr "Modul cotat"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Detail"
-msgstr ""
+msgstr "Detalii"
 
 #. module: base_module_quality
 #: field:module.quality.detail,note:0
 msgid "Note"
-msgstr ""
+msgstr "Notă"
 
 #. module: base_module_quality
 #: field:module.quality.detail,state:0
 msgid "State"
-msgstr ""
+msgstr "Stare"
 
 #. module: base_module_quality
 #: field:module.quality.detail,detail:0
 msgid "Details"
-msgstr ""
+msgstr "Detalii"
 
 #. module: base_module_quality
 #: field:module.quality.detail,ponderation:0
 msgid "Ponderation"
-msgstr ""
+msgstr "Ponderare"
 
 #. module: base_module_quality
 #: help:module.quality.detail,ponderation:0
@@ -69,17 +71,19 @@ msgid ""
 "Some tests are more critical than others, so they have a bigger weight in "
 "the computation of final rating"
 msgstr ""
+"Un ele teste sunt mai critice decât altele, deci au o pondere mai mare în "
+"calcului scorului final"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: field:module.quality.check,check_detail_ids:0
 msgid "Tests"
-msgstr ""
+msgstr "Teste"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Skipped"
-msgstr ""
+msgstr "Omis"
 
 #. module: base_module_quality
 #: help:module.quality.detail,state:0
@@ -87,95 +91,97 @@ msgid ""
 "The test will be completed only if the module is installed or if the test "
 "may be processed on uninstalled module."
 msgstr ""
+"Testul va fi efectuat numai dacă modulul este instalat sau dacă testul poate "
+"fi efectuat asupra modulului dezinstalat."
 
 #. module: base_module_quality
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_check
 msgid "module.quality.check"
-msgstr ""
+msgstr "module.quality.check"
 
 #. module: base_module_quality
 #: field:module.quality.detail,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nume"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,module_file:0
 msgid "Save report"
-msgstr ""
+msgstr "Salvare raport"
 
 #. module: base_module_quality
 #: wizard_field:quality_detail_save,init,name:0
 msgid "File name"
-msgstr ""
+msgstr "Nume fișier"
 
 #. module: base_module_quality
 #: field:module.quality.detail,score:0
 msgid "Score (%)"
-msgstr ""
+msgstr "Scor (%)"
 
 #. module: base_module_quality
 #: help:quality_detail_save,init,name:0
 msgid "Save report as .html format"
-msgstr ""
+msgstr "Salvare raport în format .html"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 #: field:module.quality.detail,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Rezumat"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.quality_detail_save
 msgid "Report Save"
-msgstr ""
+msgstr "Salvare raport"
 
 #. module: base_module_quality
 #: wizard_view:quality_detail_save,init:0
 msgid "Standard entries"
-msgstr ""
+msgstr "Înregistrări standard"
 
 #. module: base_module_quality
 #: view:module.quality.detail:0
 msgid "Save Report"
-msgstr ""
+msgstr "Salvare raport"
 
 #. module: base_module_quality
 #: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
 msgid "Quality Check"
-msgstr ""
+msgstr "Test calitate"
 
 #. module: base_module_quality
 #: model:ir.model,name:base_module_quality.model_module_quality_detail
 msgid "module.quality.detail"
-msgstr ""
+msgstr "module.quality.detail"
 
 #. module: base_module_quality
 #: selection:module.quality.detail,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gata"
 
 #. module: base_module_quality
 #: view:module.quality.check:0
 #: view:module.quality.detail:0
 msgid "Result"
-msgstr ""
+msgstr "Rezultat"
 
 #. module: base_module_quality
 #: wizard_button:quality_detail_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
 
 #. module: base_module_quality
 #: field:module.quality.detail,message:0
 msgid "Message"
-msgstr ""
+msgstr "Mesaj"
 
 #. module: base_module_quality
 #: field:module.quality.detail,quality_check_id:0
 msgid "Quality"
-msgstr ""
+msgstr "Calitate"
diff --git a/addons/base_module_record/i18n/pt.po b/addons/base_module_record/i18n/pt.po
index 007a6080d22..5950f43fdf8 100644
--- a/addons/base_module_record/i18n/pt.po
+++ b/addons/base_module_record/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-10 09:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 00:06+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
@@ -39,12 +39,13 @@ msgstr "ir.module.record"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+"O nome do Objecto deve começar com x_ e não pode conter nenhum caractere "
+"especial !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Choose objects to record"
-msgstr "Escolha objectos para gravar"
+msgstr "Escolha os objectos a gravar"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,author:0
@@ -61,7 +62,7 @@ msgstr "Nome da directoria"
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Records only"
-msgstr "Somente gravações"
+msgstr "Apenas registos"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
diff --git a/addons/base_module_record/i18n/ro.po b/addons/base_module_record/i18n/ro.po
index 798528621bd..cf09587bb54 100644
--- a/addons/base_module_record/i18n/ro.po
+++ b/addons/base_module_record/i18n/ro.po
@@ -7,99 +7,101 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:34+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 17:26+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,category:0
 #: wizard_field:base_module_record.module_save,info,category:0
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_field:base_module_record.module_save,init,info_text:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Information"
-msgstr ""
+msgstr "Informaţii"
 
 #. module: base_module_record
 #: model:ir.model,name:base_module_record.model_ir_module_record
 msgid "ir.module.record"
-msgstr ""
+msgstr "ir.module.record"
 
 #. module: base_module_record
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Choose objects to record"
-msgstr ""
+msgstr "Alege obiectele de înregistrat"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,author:0
 #: wizard_field:base_module_record.module_save,info,author:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,directory_name:0
 #: wizard_field:base_module_record.module_save,info,directory_name:0
 msgid "Directory Name"
-msgstr ""
+msgstr "Denumire director"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Records only"
-msgstr ""
+msgstr "Doar înregistrări"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Demo Data"
-msgstr ""
+msgstr "Date demo"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_filename:0
 #: wizard_field:base_module_record.module_save,save,module_filename:0
 msgid "Filename"
-msgstr ""
+msgstr "Nume fişier"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,version:0
 #: wizard_field:base_module_record.module_save,info,version:0
 msgid "Version"
-msgstr ""
+msgstr "Versiune"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
 msgid "Objects Recording"
-msgstr ""
+msgstr "Înregistrare obiecte"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,check_date:0
 msgid "Record from Date"
-msgstr ""
+msgstr "Înregistrare de la data"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 #: wizard_view:base_module_record.module_save,init:0
 msgid "Recording Information"
-msgstr ""
+msgstr "Înregistrare informatii"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_save,init,info_status:0
 msgid "Status"
-msgstr ""
+msgstr "Stare"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -111,111 +113,111 @@ msgstr ""
 #: wizard_view:base_module_record.module_save,init:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module Recording"
-msgstr ""
+msgstr "Înregistrare modul"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
 msgid "Export Customizations As a Module"
-msgstr ""
+msgstr "Personalizări exportate ca modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Thanks in advance for your contribution."
-msgstr ""
+msgstr "Mulţumim anticipat pentru contribuţia dumneavoastră."
 
 #. module: base_module_record
 #: help:base_module_record.module_record_objects,init,objects:0
 msgid "List of objects to be recorded"
-msgstr ""
+msgstr "Lista obiectelor de înregistrat"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,start_confirm:0
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record
 msgid "Start Recording"
-msgstr ""
+msgstr "Start înregistrare"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Not Recording"
-msgstr ""
+msgstr "Fără înregistrare"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,description:0
 #: wizard_field:base_module_record.module_save,info,description:0
 msgid "Full Description"
-msgstr ""
+msgstr "Descriere completă"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,name:0
 #: wizard_field:base_module_record.module_save,info,name:0
 msgid "Module Name"
-msgstr ""
+msgstr "Nume modul"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,init,objects:0
 msgid "Objects"
-msgstr ""
+msgstr "Obiecte"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,save,module_file:0
 #: wizard_field:base_module_record.module_save,save,module_file:0
 msgid "Module .zip File"
-msgstr ""
+msgstr "Fişier .zip al modulului"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording information"
-msgstr ""
+msgstr "Informaţii înregistrare"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
 msgid "Module successfully created !"
-msgstr ""
+msgstr "Modul creat cu succes !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
 msgid "Recording Stopped"
-msgstr ""
+msgstr "Înregistrare oprită"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created"
-msgstr ""
+msgstr "Creată"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,end:0
 #: wizard_view:base_module_record.module_save,end:0
 msgid "Thanks For using Module Recorder"
-msgstr ""
+msgstr "Multumim pentru ca folosiţi înregistratorul de module"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record,start,continue:0
 msgid "Continue Previous Session"
-msgstr ""
+msgstr "Continuă sesiunea precedentă"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,website:0
 #: wizard_field:base_module_record.module_save,info,website:0
 msgid "Documentation URL"
-msgstr ""
+msgstr "URL documentaţie"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Modified"
-msgstr ""
+msgstr "Modificată"
 
 #. module: base_module_record
 #: selection:base_module_record.module_save,init,info_status:0
 msgid "Recording"
-msgstr ""
+msgstr "Înregistrare"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,init,record:0
 msgid "Record"
-msgstr ""
+msgstr "Înregistrare"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,stop,end:0
@@ -223,25 +225,25 @@ msgstr ""
 #: wizard_button:base_module_record.module_save,info,save:0
 #: wizard_button:base_module_record.module_save,init,check:0
 msgid "Continue"
-msgstr ""
+msgstr "Continuare"
 
 #. module: base_module_record
 #: model:ir.module.module,shortdesc:base_module_record.module_meta_information
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec_rec
 msgid "Module Recorder"
-msgstr ""
+msgstr "Modul înregistrator"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,intro,data_kind:0
 #: selection:base_module_record.module_save,info,data_kind:0
 msgid "Normal Data"
-msgstr ""
+msgstr "Date normale"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,end,end:0
 #: wizard_button:base_module_record.module_save,end,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
@@ -251,6 +253,10 @@ msgid ""
 "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
 "the website or using features of the 'base_module_publish' module."
 msgstr ""
+"Dacă consideraţi că modulul dumneavoastră ar interesa şi pe altcineva, vă "
+"rugăm să-l publicaţi pe OpenERP.com, în secţiunea 'Modules'. O puteţi face "
+"prin intermediul website-ului sau utilizând caracteristicile modulului "
+"'base_module_publish'."
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
@@ -259,16 +265,20 @@ msgid ""
 "ERP client and save them as a module. You will be able to install this "
 "module on any database to reuse and/or publish it."
 msgstr ""
+"Acest modul înregistrator vă permite să înregistraţi fiecare operaţiune "
+"făcută în clientul OpenERP şi să o salvaţi ca modul. Veţi putea să instalaţi "
+"acest modul în orice bază de date şi să îl reutilizaţi şi/sau să îl "
+"republicaţi."
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
 msgid "Record module"
-msgstr ""
+msgstr "Modul înregistrator"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
 msgid "Module Creation"
-msgstr ""
+msgstr "Creare modul"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
@@ -276,30 +286,33 @@ msgid ""
 "You can continue the recording session by relauching the 'start recording' "
 "wizard."
 msgstr ""
+"Puteţi continua sesiunea de înregistrare relansând utilitarul 'Start "
+"înregistrare'"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
 #: wizard_field:base_module_record.module_save,info,data_kind:0
 msgid "Type of Data"
-msgstr ""
+msgstr "Tip de date"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,intro:0
 #: wizard_view:base_module_record.module_save,info:0
 msgid "Module Information"
-msgstr ""
+msgstr "Informaţii modul"
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_save
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_save
 msgid "Save Recorded Module"
-msgstr ""
+msgstr "Salvare modul înregistrat"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
 msgid ""
 "Open ERP recording is stopped. Don't forget to save the recorded module."
 msgstr ""
+"Înregistrarea OpenERP este oprită. Nu uitaţi să salvaţi modulul înregistrat."
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,end:0
@@ -308,20 +321,20 @@ msgstr ""
 #: wizard_button:base_module_record.module_save,info,end:0
 #: wizard_button:base_module_record.module_save,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record_objects,save,end:0
 #: wizard_button:base_module_record.module_save,save,end:0
 msgid "Close"
-msgstr ""
+msgstr "Închidere"
 
 #. module: base_module_record
 #: selection:base_module_record.module_record_objects,init,filter_cond:0
 msgid "Created & Modified"
-msgstr ""
+msgstr "Creat & modificat"
 
 #. module: base_module_record
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
 msgid "Stop Recording"
-msgstr ""
+msgstr "Oprire înregistrare"
diff --git a/addons/base_report_creator/i18n/ro.po b/addons/base_report_creator/i18n/ro.po
index 1a218fa2bfc..539c1fc9868 100644
--- a/addons/base_report_creator/i18n/ro.po
+++ b/addons/base_report_creator/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:51+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 17:42+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 05:13+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -23,378 +23,383 @@ msgid ""
 "records.\n"
 " e.g. res_partner.id=3"
 msgstr ""
+"Daţi o expresie pentru câmpul pe baza căruia vreţi să filtraţi "
+"înregistrările\n"
+" de ex: res_partner.id=3"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_type:0
 msgid "Graph Type"
-msgstr ""
+msgstr "Tip grafic"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Used View"
-msgstr ""
+msgstr "Afişare utilizată"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
 msgid "Filter Values"
-msgstr ""
+msgstr "Filtrare valori"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,graph_mode:0
 msgid "Graph Mode"
-msgstr ""
+msgstr "Mod grafic"
 
 #. module: base_report_creator
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Graph View"
-msgstr ""
+msgstr "Vedere grafic"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,expression:0
 msgid "Value"
-msgstr ""
+msgstr "Valoare"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_set_filter_fields
 msgid "Set Filter Fields"
-msgstr ""
+msgstr "Setare câmpuri de filtrare"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Data de sfârşit"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_filter
 msgid "Report Filters"
-msgstr ""
+msgstr "Filtre raport"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,sql_query:0
 msgid "SQL Query"
-msgstr ""
+msgstr "Interogare SQL"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: wizard_button:base_report_creator.report.menu.create,init,create_menu:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Creare meniu"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Minimum"
-msgstr ""
+msgstr "Minim"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Operator"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
 #: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "OR"
-msgstr ""
+msgstr "OR"
 
 #. module: base_report_creator
 #: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action
 #: model:ir.ui.menu,name:base_report_creator.menu_base_report_creator_action_config
 msgid "Custom Reports"
-msgstr ""
+msgstr "Rapoarte personalizate"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report.menu.create,init:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Informaţii meniu"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Sum"
-msgstr ""
+msgstr "Sumă"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
 msgid "Reported Objects"
-msgstr ""
+msgstr "Obiecte raportate"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Field List"
-msgstr ""
+msgstr "Listă câmpuri"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,type:0
 msgid "Report Type"
-msgstr ""
+msgstr "Tip raport"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "State"
-msgstr ""
+msgstr "Stare"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,state:0
 msgid "Valid"
-msgstr ""
+msgstr "Valid"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Add filter"
-msgstr ""
+msgstr "Adăugare filtru"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_menu_create
 msgid "Create Menu for Report"
-msgstr ""
+msgstr "Creare meniu pentru raport"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Form"
-msgstr ""
+msgstr "Formular"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type3:0
 #: selection:base_report_creator.report.fields,calendar_mode:0
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,report_id:0
 #: field:base_report_creator.report.filter,report_id:0
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report
 msgid "Report"
-msgstr ""
+msgstr "Raport"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Data de început"
 
 #. module: base_report_creator
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Tree"
-msgstr ""
+msgstr "Arbore"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,group_ids:0
 msgid "Authorized Groups"
-msgstr ""
+msgstr "Grupuri autorizate"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_graph_orientation:0
 msgid "Graph Orientation"
-msgstr ""
+msgstr "Orientare grafic"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Authorized Groups (empty for all)"
-msgstr ""
+msgstr "Grupuri autorizate (necompletat pentru toate)"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Security"
-msgstr ""
+msgstr "Securitate"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Denumire meniu"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.filter,condition:0
 #: selection:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "AND"
-msgstr ""
+msgstr "AND"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,calendar_mode:0
 msgid "Calendar Mode"
-msgstr ""
+msgstr "Mod calendar"
 
 #. module: base_report_creator
 #: model:ir.model,name:base_report_creator.model_base_report_creator_report_fields
 msgid "Display Fields"
-msgstr ""
+msgstr "Câmpuri afişate"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "Y Axis"
-msgstr ""
+msgstr "Axa Y"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Calendar"
-msgstr ""
+msgstr "Calendar"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_type1:0
 #: selection:base_report_creator.report,view_type2:0
 #: selection:base_report_creator.report,view_type3:0
 msgid "Graph"
-msgstr ""
+msgstr "Grafic"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,field_id:0
 msgid "Field Name"
-msgstr ""
+msgstr "Denumire câmp"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Ciornă"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,set_value_select_field:0
 msgid "Set Filter Values"
-msgstr ""
+msgstr "Configurare filtru de valori"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Stare"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Vertical"
-msgstr ""
+msgstr "Vertical"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,type:0
 msgid "Rows And Columns Report"
-msgstr ""
+msgstr "Rânduri şi coloane raport"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "General Configuration"
-msgstr ""
+msgstr "Configurare generală"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report_filter.fields,init:0
 msgid "Select Field to filter"
-msgstr ""
+msgstr "Selectare câmp de filtrare"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,active:0
 msgid "Active"
-msgstr ""
+msgstr "Activ"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_orientation:0
 msgid "Horizontal"
-msgstr ""
+msgstr "Orizontal"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,group_method:0
 msgid "Grouping Method"
-msgstr ""
+msgstr "Metoda de grupare"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,condition:0
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Conditie"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Count"
-msgstr ""
+msgstr "Număr"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,graph_mode:0
 msgid "X Axis"
-msgstr ""
+msgstr "Axa X"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report.menu.create,init,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Meniu părinte"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,set_value:0
 msgid "Confirm Filter"
-msgstr ""
+msgstr "Confirmare filtru"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.filter,name:0
 msgid "Filter Name"
-msgstr ""
+msgstr "Nume filtru"
 
 #. module: base_report_creator
 #: model:ir.actions.wizard,name:base_report_creator.wizard_report_open
 msgid "Open Report"
-msgstr ""
+msgstr "Deschidere raport"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Grouped"
-msgstr ""
+msgstr "Grupat"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: model:ir.module.module,shortdesc:base_report_creator.module_meta_information
 msgid "Report Creator"
-msgstr ""
+msgstr "Creator raport"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report.menu.create,init,end:0
 #: wizard_button:base_report_creator.report_filter.fields,init,end:0
 #: wizard_button:base_report_creator.report_filter.fields,set_value_select_field,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
 
 #. module: base_report_creator
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
 msgid "First View"
-msgstr ""
+msgstr "Prima afişare"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Delay"
-msgstr ""
+msgstr "Întârziere"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,field_id:0
 msgid "Field"
-msgstr ""
+msgstr "Câmp"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Filters on Fields"
-msgstr ""
+msgstr "Filtre pe câmpuri"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Pie Chart"
-msgstr ""
+msgstr "Grafic tip pie"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type3:0
 msgid "Third View"
-msgstr ""
+msgstr "A treia afişare"
 
 #. module: base_report_creator
 #: model:ir.module.module,description:base_report_creator.module_meta_information
@@ -406,85 +411,92 @@ msgid ""
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
 msgstr ""
+"Acest modul vă permite să creaţi orice rapoart statistic\n"
+"Pe mai multe obiecte. Este un constructor şi analizor de interogări SQL\n"
+"pentru utilizatori.\n"
+"\n"
+"După instalare, modulul adaugă un meniu pentru definirea de rapoarte "
+"personalizate\n"
+"în meniul \"Panou\".\n"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,calendar_mode:0
 msgid "Uniq Colors"
-msgstr ""
+msgstr "Culori unice"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Nume raport"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Fields"
-msgstr ""
+msgstr "Câmpuri"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Average"
-msgstr ""
+msgstr "Medie"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "Reports"
-msgstr ""
+msgstr "Rapoarte"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report.fields,group_method:0
 msgid "Maximum"
-msgstr ""
+msgstr "Maxim"
 
 #. module: base_report_creator
 #: wizard_button:base_report_creator.report_filter.fields,init,set_value_select_field:0
 msgid "Continue"
-msgstr ""
+msgstr "Continuare"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,set_value_select_field,value:0
 msgid "Values"
-msgstr ""
+msgstr "Valori"
 
 #. module: base_report_creator
 #: selection:base_report_creator.report,view_graph_type:0
 msgid "Bar Chart"
-msgstr ""
+msgstr "Grafic bare"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type2:0
 msgid "Second View"
-msgstr ""
+msgstr "A doua afişare"
 
 #. module: base_report_creator
 #: wizard_view:base_report_creator.report.menu.create,init:0
 msgid "Create Menu For This Report"
-msgstr ""
+msgstr "Creare meniu pentru acest raport"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 msgid "View parameters"
-msgstr ""
+msgstr "Parametrii afişării"
 
 #. module: base_report_creator
 #: field:base_report_creator.report.fields,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secvenţă"
 
 #. module: base_report_creator
 #: wizard_field:base_report_creator.report_filter.fields,init,field_id:0
 msgid "Filter Field"
-msgstr ""
+msgstr "Câmp filtrare"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,field_ids:0
 msgid "Fields to Display"
-msgstr ""
+msgstr "Câmpuri de afişat"
 
 #. module: base_report_creator
 #: view:base_report_creator.report:0
 #: field:base_report_creator.report,filter_ids:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtre"
diff --git a/addons/base_report_designer/i18n/ro.po b/addons/base_report_designer/i18n/ro.po
index ec0e5e563a7..b13ae61afc6 100644
--- a/addons/base_report_designer/i18n/ro.po
+++ b/addons/base_report_designer/i18n/ro.po
@@ -7,89 +7,89 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:11+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 17:48+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 05:10+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,text:0
 msgid "Introduction"
-msgstr ""
+msgstr "Introducere"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Upload your modified report"
-msgstr ""
+msgstr "Încărcare raport modificat"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,send_form:0
 msgid "Upload the modified report"
-msgstr ""
+msgstr "Încărcare raport modificat"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
 msgid "The .SXW report"
-msgstr ""
+msgstr "Raport .SXW"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Report modified"
-msgstr ""
+msgstr "Raport modificat"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,init,get_form:0
 msgid "Modify a report"
-msgstr ""
+msgstr "Modificare raport"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,send_form_result:0
 msgid "Your report has been modified."
-msgstr ""
+msgstr "Raportul dumneavoastră a fost modificat."
 
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
-msgstr ""
+msgstr "Modul interfaţă designer de rapoarte"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form,report_id:0
 #: wizard_field:base_report_designer.modify,get_form_result,report_id:0
 #: wizard_field:base_report_designer.modify,send_form,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Raport"
 
 #. module: base_report_designer
 #: model:ir.ui.menu,name:base_report_designer.menu_wizard_report_designer_modify
 msgid "Report Designer"
-msgstr ""
+msgstr "Designer rapoarte"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 #: wizard_view:base_report_designer.modify,get_form_result:0
 #: wizard_view:base_report_designer.modify,send_form:0
 msgid "Get a report"
-msgstr ""
+msgstr "Obţine un raport"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,get_form_result:0
 msgid "Continue"
-msgstr ""
+msgstr "Continuare"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,get_form_result,file_sxw:0
 #: wizard_field:base_report_designer.modify,send_form,file_sxw:0
 msgid "Your .SXW file"
-msgstr ""
+msgstr "Fişier .SWX"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer"
-msgstr ""
+msgstr "Designer raport"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form_result:0
@@ -99,47 +99,51 @@ msgid ""
 "to modify it. Once it is modified, re-upload it in Open ERP using this "
 "wizard."
 msgstr ""
+"Acesta este şablonul raportului solicitat. Salvaţi-l într-un fişier .SXW şi "
+"deschideţi-l cu OpenOffice. Nu uitaţi să instalaţi pachetul Tiny OpenOffice "
+"pentru a-l modifica. Odată modificat, reîncărcaţi-l în OpenERP folosind "
+"acest utilitar."
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,send_form,send_form_result:0
 msgid "Update the report"
-msgstr ""
+msgstr "Actualizare raport"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 msgid "Create a new report"
-msgstr ""
+msgstr "Creare raport nou"
 
 #. module: base_report_designer
 #: selection:base_report_designer.modify,init,operation:0
 #: model:ir.actions.wizard,name:base_report_designer.wizard_report_designer_modify
 msgid "Modify an existing report"
-msgstr ""
+msgstr "Modificare raport existent"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form,end:0
 #: wizard_button:base_report_designer.modify,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
 
 #. module: base_report_designer
 #: wizard_button:base_report_designer.modify,get_form_result,end:0
 #: wizard_button:base_report_designer.modify,send_form,end:0
 #: wizard_button:base_report_designer.modify,send_form_result,end:0
 msgid "Close"
-msgstr ""
+msgstr "Închidere"
 
 #. module: base_report_designer
 #: wizard_field:base_report_designer.modify,init,operation:0
 msgid "Operation"
-msgstr ""
+msgstr "Operație"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,init:0
 msgid "Report designer introduction"
-msgstr ""
+msgstr "Introducere designer raport"
 
 #. module: base_report_designer
 #: wizard_view:base_report_designer.modify,get_form:0
 msgid "Select your report"
-msgstr ""
+msgstr "Selectare raport"
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index f58534db081..5e778693e8b 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 14:39+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 18:07+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:58+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
@@ -21,7 +21,7 @@ msgstr ""
 #: wizard_field:base_setup.base_setup,init,city:0
 #: wizard_field:base_setup.base_setup,update,city:0
 msgid "City"
-msgstr ""
+msgstr "Oraş"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
@@ -29,34 +29,38 @@ msgid ""
 "You can start configuring the system or connect directly to the database "
 "using the default setup."
 msgstr ""
+"Puteţi începe configurarea sistemului sau vă puteţi conecta direct la baza "
+"de date folosind setarea implicită"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,zip:0
 #: wizard_field:base_setup.base_setup,init,zip:0
 #: wizard_field:base_setup.base_setup,update,zip:0
 msgid "Zip code"
-msgstr ""
+msgstr "Cod poștal"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid "Select a Profile"
-msgstr ""
+msgstr "Selectaţi un profil"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report header"
-msgstr ""
+msgstr "Antet raport"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,config:0
 msgid "Start Configuration"
-msgstr ""
+msgstr "Start configurare"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
 msgid ""
 "You'll be able to install more modules later through the Administration menu."
 msgstr ""
+"Veţi putea instala mai multe module mai târziu prin intermediul meniului "
+"Administrare"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,init:0
@@ -65,88 +69,92 @@ msgid ""
 "have been setup to help you discover the different aspects of OpenERP. This "
 "is just an overview, we have 300+ available modules."
 msgstr ""
+"Un profil stabileşte o preselecţie de module potrivite pentru un anumit tip "
+"de activitate. Aceste profile au fost stabilite pentru a va ajuta să "
+"descoperiţi diferitele aspecte ale OpenERP. Aceasta este doar o privire de "
+"ansamblu, existând peste 300 de module disponibile."
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,update:0
 #: wizard_button:base_setup.base_setup,init,company:0
 msgid "Next"
-msgstr ""
+msgstr "Urmare"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,email:0
 #: wizard_field:base_setup.base_setup,init,email:0
 #: wizard_field:base_setup.base_setup,update,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,state_id:0
 #: wizard_field:base_setup.base_setup,init,state_id:0
 #: wizard_field:base_setup.base_setup,update,state_id:0
 msgid "State"
-msgstr ""
+msgstr "Stat"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Your new database is now fully installed."
-msgstr ""
+msgstr "Noua bază de date este complet instalată"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,profile:0
 #: wizard_field:base_setup.base_setup,init,profile:0
 #: wizard_field:base_setup.base_setup,update,profile:0
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer1:0
 #: wizard_field:base_setup.base_setup,init,rml_footer1:0
 #: wizard_field:base_setup.base_setup,update,rml_footer1:0
 msgid "Report Footer 1"
-msgstr ""
+msgstr "Subsol raport 1"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_footer2:0
 #: wizard_field:base_setup.base_setup,init,rml_footer2:0
 #: wizard_field:base_setup.base_setup,update,rml_footer2:0
 msgid "Report Footer 2"
-msgstr ""
+msgstr "Subsol raport 2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "General Information"
-msgstr ""
+msgstr "Informatii generale"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street2:0
 #: wizard_field:base_setup.base_setup,init,street2:0
 #: wizard_field:base_setup.base_setup,update,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Strada2"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Report Information"
-msgstr ""
+msgstr "Informaţii raport"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,phone:0
 #: wizard_field:base_setup.base_setup,init,phone:0
 #: wizard_field:base_setup.base_setup,update,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefon"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Define Main Company"
-msgstr ""
+msgstr "Definire companie mamă"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,name:0
 #: wizard_field:base_setup.base_setup,init,name:0
 #: wizard_field:base_setup.base_setup,update,name:0
 msgid "Company Name"
-msgstr ""
+msgstr "Nume companie"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer2:0
@@ -157,13 +165,16 @@ msgid ""
 "We suggest you to put bank information here:\n"
 "IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701"
 msgstr ""
+"Aceasta fraza va apărea în partea de jos a rapoartelor.\n"
+"Vă sugerăm să treceţi aici informaţiile bancare:\n"
+"IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - TVA: BE0477.472.701"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,country_id:0
 #: wizard_field:base_setup.base_setup,init,country_id:0
 #: wizard_field:base_setup.base_setup,update,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Ţara"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
@@ -173,7 +184,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:base_setup.action_wizard_setup
 #: model:ir.actions.wizard,name:base_setup.wizard_base_setup
 msgid "Setup"
-msgstr ""
+msgstr "Instalare"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_footer1:0
@@ -184,21 +195,24 @@ msgid ""
 "We suggest you to write legal sentences here:\n"
 "Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 msgstr ""
+"Aceasta fraza va apărea în partea de jos a rapoartelor.\n"
+"Vă sugerăm să treceţi aici informaţiile juridice despre compania dvs.:\n"
+"Web: http://openerp.com - Fax: +32.81.73.35.01 - Fortis Bank: 126-2013269-07"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,update:0
 msgid "Summary"
-msgstr ""
+msgstr "Rezumat"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,update,finish:0
 msgid "Install"
-msgstr ""
+msgstr "Instalare"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,finish:0
 msgid "Installation Done"
-msgstr ""
+msgstr "Instalare completă"
 
 #. module: base_setup
 #: help:base_setup.base_setup,company,rml_header1:0
@@ -209,57 +223,60 @@ msgid ""
 "We suggest you to put a slogan here:\n"
 "\"Open Source Business Solutions\"."
 msgstr ""
+"Aceasta frază va apărea în colţul dreapta sus în rapoarte.\n"
+"Vă sugerăm să puneţi aici un slogan:\n"
+"\"Soluţii de business Open source\""
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,rml_header1:0
 #: wizard_field:base_setup.base_setup,init,rml_header1:0
 #: wizard_field:base_setup.base_setup,update,rml_header1:0
 msgid "Report Header"
-msgstr ""
+msgstr "Antet raport"
 
 #. module: base_setup
 #: wizard_view:base_setup.base_setup,company:0
 msgid "Your Logo - Use a size of about 450x150 pixels."
-msgstr ""
+msgstr "Logo-ul vostru - utilizaţi o dimensiune de aprox. 450x150 pixeli."
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,currency:0
 #: wizard_field:base_setup.base_setup,init,currency:0
 #: wizard_field:base_setup.base_setup,update,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valută"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,street:0
 #: wizard_field:base_setup.base_setup,init,street:0
 #: wizard_field:base_setup.base_setup,update,street:0
 msgid "Street"
-msgstr ""
+msgstr "Strada"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,finish,menu:0
 msgid "Use Directly"
-msgstr ""
+msgstr "Folosire directă"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,init,menu:0
 msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
 
 #. module: base_setup
 #: wizard_field:base_setup.base_setup,company,logo:0
 #: wizard_field:base_setup.base_setup,init,logo:0
 #: wizard_field:base_setup.base_setup,update,logo:0
 msgid "Logo"
-msgstr ""
+msgstr "Logo"
 
 #. module: base_setup
 #: model:ir.module.module,shortdesc:base_setup.module_meta_information
 msgid "Base Setup"
-msgstr ""
+msgstr "Setare de bază"
 
 #. module: base_setup
 #: wizard_button:base_setup.base_setup,company,init:0
 #: wizard_button:base_setup.base_setup,update,company:0
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
diff --git a/addons/base_vat/i18n/ro.po b/addons/base_vat/i18n/ro.po
index 5779f2460a3..b2847e4b5e4 100644
--- a/addons/base_vat/i18n/ro.po
+++ b/addons/base_vat/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:17+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 18:09+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
@@ -21,18 +21,20 @@ msgstr ""
 msgid ""
 "Enable the VAT Number for the partner. Check the validity of that VAT Number."
 msgstr ""
+"Activare cod fiscal pentru TVA partener. Verificare validitate cod fiscal "
+"partener."
 
 #. module: base_vat
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr ""
+msgstr "Declaraţie de TVA"
 
 #. module: base_vat
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "VAT"
-msgstr ""
+msgstr "TVA"
diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py
index 4b4ea65770e..bb822cddbe4 100644
--- a/addons/base_vat/partner.py
+++ b/addons/base_vat/partner.py
@@ -915,7 +915,8 @@ class res_partner(osv.osv):
         except:
             return False
 
-        if len(vat) == 10:
+        if len(vat) >= 2 and len(vat) <= 10:
+            vat = (10 - len(vat)) * '0' + vat
             sum = 7 * int(vat[0]) + 5 * int(vat[1]) + 3 * int(vat[2]) + \
                     2 * int(vat[3]) + 1 * int(vat[4]) + 7 * int(vat[5]) + \
                     5 * int(vat[6]) + 3 * int(vat[7]) + 2 * int(vat[8])
diff --git a/addons/board/i18n/ro.po b/addons/board/i18n/ro.po
index 78603d7b347..8b75185d8d6 100644
--- a/addons/board/i18n/ro.po
+++ b/addons/board/i18n/ro.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:31+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 18:14+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 05:13+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -21,199 +21,201 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+"special !"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "board.board"
-msgstr ""
+msgstr "board.board"
 
 #. module: board
 #: field:board.note,user_id:0
 msgid "Author"
-msgstr ""
+msgstr "Autor"
 
 #. module: board
 #: model:ir.module.module,shortdesc:board.module_meta_information
 msgid "Dashboard main module"
-msgstr ""
+msgstr "Modul principal Panou"
 
 #. module: board
 #: view:board.note:0
 #: field:board.note,note:0
 msgid "Note"
-msgstr ""
+msgstr "Notă"
 
 #. module: board
 #: field:board.board.line,width:0
 msgid "Width"
-msgstr ""
+msgstr "Lăţime"
 
 #. module: board
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: board
 #: field:board.board.line,name:0
 msgid "Title"
-msgstr ""
+msgstr "Titlu"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
 #: model:ir.ui.menu,name:board.menu_view_board_form
 msgid "Dashboard Definition"
-msgstr ""
+msgstr "Definiţie Panou"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_note_form
 #: model:ir.ui.menu,name:board.menu_view_board_note_form
 msgid "Publish a note"
-msgstr ""
+msgstr "Publicare notă"
 
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
 msgid "Menu Information"
-msgstr ""
+msgstr "Informaţii meniu"
 
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr ""
+msgstr "Afişări cu acţiuni"
 
 #. module: board
 #: model:ir.model,name:board.model_board_note
 msgid "board.note"
-msgstr ""
+msgstr "board.note"
 
 #. module: board
 #: field:board.note,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: board
 #: model:ir.ui.menu,name:board.next_id_50
 msgid "Configuration"
-msgstr ""
+msgstr "Configurare"
 
 #. module: board
 #: field:board.note.type,name:0
 msgid "Note Type"
-msgstr ""
+msgstr "Tip notă"
 
 #. module: board
 #: wizard_view:board.board.menu.create,init:0
 msgid "Create Menu For Dashboard"
-msgstr ""
+msgstr "Creare meniu pentru panou"
 
 #. module: board
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Meniu părinte"
 
 #. module: board
 #: view:board.note:0
 msgid "Notes"
-msgstr ""
+msgstr "Note"
 
 #. module: board
 #: model:ir.model,name:board.model_board_note_type
 msgid "board.note.type"
-msgstr ""
+msgstr "board.note.type"
 
 #. module: board
 #: view:board.board:0
 #: field:board.board,name:0
 #: field:board.board.line,board_id:0
 msgid "Dashboard"
-msgstr ""
+msgstr "Panou"
 
 #. module: board
 #: model:ir.module.module,description:board.module_meta_information
 msgid "Base module for all dashboards."
-msgstr ""
+msgstr "Modulul de bază pentru toate panourile"
 
 #. module: board
 #: field:board.board.line,position:0
 msgid "Position"
-msgstr ""
+msgstr "Poziţie"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.dashboard_open
 msgid "Open Dashboard"
-msgstr ""
+msgstr "Deschidere panou"
 
 #. module: board
 #: wizard_field:board.board.menu.create,init,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "Denumire meniu"
 
 #. module: board
 #: field:board.note,type:0
 msgid "Note type"
-msgstr ""
+msgstr "Tip notă"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Left"
-msgstr ""
+msgstr "Stânga"
 
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr ""
+msgstr "Afişare panou"
 
 #. module: board
 #: selection:board.board.line,position:0
 msgid "Right"
-msgstr ""
+msgstr "Dreapta"
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secvenţă"
 
 #. module: board
 #: view:board.board:0
 #: wizard_button:board.board.menu.create,init,create_menu:0
 msgid "Create Menu"
-msgstr ""
+msgstr "Creare meniu"
 
 #. module: board
 #: model:ir.ui.menu,name:board.dashboard_menu
 msgid "Dashboards"
-msgstr ""
+msgstr "Panouri"
 
 #. module: board
 #: field:board.board.line,height:0
 msgid "Height"
-msgstr ""
+msgstr "Înălţime"
 
 #. module: board
 #: model:ir.actions.wizard,name:board.wizard_board_create_menu
 msgid "Create Board Menu"
-msgstr ""
+msgstr "Creare meniu panou"
 
 #. module: board
 #: wizard_button:board.board.menu.create,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Revocare"
 
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr ""
+msgstr "Afişare panou"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "board.board.line"
-msgstr ""
+msgstr "board.board.line"
 
 #. module: board
 #: field:board.note,name:0
 msgid "Subject"
-msgstr ""
+msgstr "Subiect"
diff --git a/addons/board/i18n/sk.po b/addons/board/i18n/sk.po
new file mode 100644
index 00000000000..c518866eb4d
--- /dev/null
+++ b/addons/board/i18n/sk.po
@@ -0,0 +1,221 @@
+# Slovak translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-11-27 13:02+0000\n"
+"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-11-28 04:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "board.board"
+msgstr "board.board"
+
+#. module: board
+#: field:board.note,user_id:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: board
+#: model:ir.module.module,shortdesc:board.module_meta_information
+msgid "Dashboard main module"
+msgstr "Nástenka hlavných modulov"
+
+#. module: board
+#: view:board.note:0
+#: field:board.note,note:0
+msgid "Note"
+msgstr "Poznámka"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Šírka"
+
+#. module: board
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neplatný názov modelu v akcii definície."
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Titulok"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_list_form
+#: model:ir.ui.menu,name:board.menu_view_board_form
+msgid "Dashboard Definition"
+msgstr "Definícia nástenky"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_view_board_note_form
+#: model:ir.ui.menu,name:board.menu_view_board_note_form
+msgid "Publish a note"
+msgstr "Publikovať poznámku"
+
+#. module: board
+#: wizard_view:board.board.menu.create,init:0
+msgid "Menu Information"
+msgstr "Informácia ponuky"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "Zobrazenie akcií"
+
+#. module: board
+#: model:ir.model,name:board.model_board_note
+msgid "board.note"
+msgstr "board.note"
+
+#. module: board
+#: field:board.note,date:0
+msgid "Date"
+msgstr "Dátum"
+
+#. module: board
+#: model:ir.ui.menu,name:board.next_id_50
+msgid "Configuration"
+msgstr "Konfigurácia"
+
+#. module: board
+#: field:board.note.type,name:0
+msgid "Note Type"
+msgstr "Typ poznámky"
+
+#. module: board
+#: wizard_view:board.board.menu.create,init:0
+msgid "Create Menu For Dashboard"
+msgstr "Vytvorenie ponuky pre nástenku"
+
+#. module: board
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neplatný súbor XML pre zobrazenie architektúry!"
+
+#. module: board
+#: wizard_field:board.board.menu.create,init,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Rodičovská (základná) ponuka"
+
+#. module: board
+#: view:board.note:0
+msgid "Notes"
+msgstr "Poznámky"
+
+#. module: board
+#: model:ir.model,name:board.model_board_note_type
+msgid "board.note.type"
+msgstr "board.note.type"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+msgid "Dashboard"
+msgstr "Nástenka"
+
+#. module: board
+#: model:ir.module.module,description:board.module_meta_information
+msgid "Base module for all dashboards."
+msgstr "Základný modul pre všetky nástenky."
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Pozícia"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.dashboard_open
+msgid "Open Dashboard"
+msgstr "Otvoriť nástenku"
+
+#. module: board
+#: wizard_field:board.board.menu.create,init,menu_name:0
+msgid "Menu Name"
+msgstr "Názov ponuky"
+
+#. module: board
+#: field:board.note,type:0
+msgid "Note type"
+msgstr "Typ poznámky"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Vľavo"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr "Zobraziť panel"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Vpravo"
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr "Poradie"
+
+#. module: board
+#: view:board.board:0
+#: wizard_button:board.board.menu.create,init,create_menu:0
+msgid "Create Menu"
+msgstr "Vytvorenie ponuky"
+
+#. module: board
+#: model:ir.ui.menu,name:board.dashboard_menu
+msgid "Dashboards"
+msgstr "Nástenky"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Výška"
+
+#. module: board
+#: model:ir.actions.wizard,name:board.wizard_board_create_menu
+msgid "Create Board Menu"
+msgstr "Vytvorenie panela ponuky"
+
+#. module: board
+#: wizard_button:board.board.menu.create,init,end:0
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr "Zobrazenie nástenky"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "board.board.line"
+msgstr "board.board.line"
+
+#. module: board
+#: field:board.note,name:0
+msgid "Subject"
+msgstr "Predmet"
diff --git a/addons/board_account/i18n/ro.po b/addons/board_account/i18n/ro.po
index f4465e92448..63b4f2860f1 100644
--- a/addons/board_account/i18n/ro.po
+++ b/addons/board_account/i18n/ro.po
@@ -7,77 +7,77 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:47+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 18:27+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 05:14+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Analytic accounts to close"
-msgstr ""
+msgstr "Conturi analitice de închis"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Draft invoices"
-msgstr ""
+msgstr "Facturi în ciornă"
 
 #. module: board_account
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.open_board_account
 #: model:ir.ui.menu,name:board_account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr ""
+msgstr "Panou contabilitate"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_receivable
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Conturi clienţi"
 
 #. module: board_account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_account.act_my_account
 msgid "Accounts to invoice"
-msgstr ""
+msgstr "Conturi de facturat"
 
 #. module: board_account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_account.action_account_analytic_line_to_invoice
 msgid "Costs to invoice"
-msgstr ""
+msgstr "Costuri de facturat"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged receivables"
-msgstr ""
+msgstr "Creanţe încasare învechite"
 
 #. module: board_account
 #: model:ir.module.module,shortdesc:board_account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "Panou pentru contabil"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_income
 msgid "Income Accounts"
-msgstr ""
+msgstr "Conturi de venituri"
 
 #. module: board_account
 #: view:board.board:0
 msgid "My indicators"
-msgstr ""
+msgstr "Indicatorii mei"
 
 #. module: board_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: board_account
 #: model:ir.ui.menu,name:board_account.next_id_68
@@ -87,9 +87,9 @@ msgstr "Contabilitate"
 #. module: board_account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Panou cont"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged income"
-msgstr ""
+msgstr "Venit învechit"
diff --git a/addons/board_association/i18n/ro.po b/addons/board_association/i18n/ro.po
index 51a5287bc5d..a2941f4c189 100644
--- a/addons/board_association/i18n/ro.po
+++ b/addons/board_association/i18n/ro.po
@@ -7,62 +7,62 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2009-11-28 18:29+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:51+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
 #: model:ir.ui.menu,name:board_association.menu_board_associations_manager
 msgid "Associations"
-msgstr ""
+msgstr "Asociaţii"
 
 #. module: board_association
 #: model:ir.module.module,shortdesc:board_association.module_meta_information
 msgid "Dashboard for Associations"
-msgstr ""
+msgstr "Panou pentru asociaţii"
 
 #. module: board_association
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: board_association
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_association.open_board_associations_manager
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Panou Asociaţii"
 
 #. module: board_association
 #: view:board.board:0
 msgid "My tasks"
-msgstr ""
+msgstr "Sarcinile mele"
 
 #. module: board_association
 #: view:board.board:0
 msgid "New members"
-msgstr ""
+msgstr "Membri noi"
 
 #. module: board_association
 #: view:board.board:0
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Facturi neplătite"
 
 #. module: board_association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: board_association
 #: view:board.board:0
 msgid "Next Events"
-msgstr ""
+msgstr "Evenimente următoare"
 
 #. module: board_association
 #: view:board.board:0
 msgid "Registrations by Events"
-msgstr ""
+msgstr "Înregistrare după evenimente"
diff --git a/addons/board_auction/i18n/ro.po b/addons/board_auction/i18n/ro.po
index f470644d2c8..83431516f35 100644
--- a/addons/board_auction/i18n/ro.po
+++ b/addons/board_auction/i18n/ro.po
@@ -7,116 +7,116 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2009-11-28 18:33+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:51+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Objects by day"
-msgstr ""
+msgstr "Obiecte pe zile"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Objects statistics"
-msgstr ""
+msgstr "Statistici obiecte"
 
 #. module: board_auction
 #: model:ir.ui.menu,name:board_auction.menu_board_auction_manager
 msgid "Auction Manager"
-msgstr ""
+msgstr "Manager licitaţii"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Summary pointing by user"
-msgstr ""
+msgstr "Indicare rezumat pe utilizatori"
 
 #. module: board_auction
 #: model:ir.ui.menu,name:board_auction.menu_board_auction
 msgid "Auction Member"
-msgstr ""
+msgstr "Membru licitaţie"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My Latest Deposits"
-msgstr ""
+msgstr "Ultimele mele depozite"
 
 #. module: board_auction
 #: model:ir.actions.act_window,name:board_auction.open_board_auction
 msgid "Auction member board"
-msgstr ""
+msgstr "Panou membru licitaţie"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Auction manager "
-msgstr ""
+msgstr "Managet licitaţie "
 
 #. module: board_auction
 #: model:ir.module.module,shortdesc:board_auction.module_meta_information
 msgid "Board for Auction"
-msgstr ""
+msgstr "Panou pentru licitaţie"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Estimations/Adjudication"
-msgstr ""
+msgstr "Estimări/Adjudecări"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Total Adjudications"
-msgstr ""
+msgstr "Total adjudecări"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Latest objects"
-msgstr ""
+msgstr "Ultimele obiecte"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Latest deposits"
-msgstr ""
+msgstr "Ultimele depozite"
 
 #. module: board_auction
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Menu"
-msgstr ""
+msgstr "Meniu"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My objects By Day"
-msgstr ""
+msgstr "Obiectele mele pe zile"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My board"
-msgstr ""
+msgstr "Panoul meu"
 
 #. module: board_auction
 #: model:ir.actions.act_window,name:board_auction.open_board_auction_manager
 msgid "Auction manager board"
-msgstr ""
+msgstr "Panou manager licitaţie"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "Min/Adj/Max"
-msgstr ""
+msgstr "Min/Adj/Max"
 
 #. module: board_auction
 #: view:board.board:0
 msgid "My Latest Objects"
-msgstr ""
+msgstr "Ultimele mele obiecte"
diff --git a/addons/board_crm_configuration/i18n/ro.po b/addons/board_crm_configuration/i18n/ro.po
index bbc0fc208e7..cd508fa1eb8 100644
--- a/addons/board_crm_configuration/i18n/ro.po
+++ b/addons/board_crm_configuration/i18n/ro.po
@@ -7,113 +7,113 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:25+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2009-11-28 18:38+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:57+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
 #: model:ir.module.module,shortdesc:board_crm_configuration.module_meta_information
 msgid "Dashboard for CRM Configuration"
-msgstr ""
+msgstr "Panou configurare CRM"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.ui.menu,name:board_crm_configuration.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Statistici panou"
 
 #. module: board_crm_configuration
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "Oportunităţi pe categorii"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_my_cases
 msgid "My Cases"
-msgstr ""
+msgstr "Dosarele mele"
 
 #. module: board_crm_configuration
 #: model:ir.actions.act_window,name:board_crm_configuration.open_board_crm
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "Panou CRM"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm
 msgid "Connecting Dashboard"
-msgstr ""
+msgstr "Conectare panou"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_leads_month_user
 msgid "Leads Of The Month By User"
-msgstr ""
+msgstr "Pistele săptămânii pe utilizatori"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: view:report.crm.case.section.stage:0
 msgid "Leads By Stage"
-msgstr ""
+msgstr "Piste pe stadii"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Întâlnirile mele"
 
 #. module: board_crm_configuration
 #: model:ir.ui.menu,name:board_crm_configuration.menu_board_crm_config
 msgid "CRM Configuration"
-msgstr ""
+msgstr "Configurare CRM"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board_crm_configuration.act_jobs_categ
 msgid "Jobs Requests Of The Month by Applied Job"
-msgstr ""
+msgstr "Cereri de angajare pe luni"
 
 #. module: board_crm_configuration
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Sales Pipeline"
-msgstr ""
+msgstr "Direcţiile mele de vânzări"
 
 #. module: board_crm_configuration
 #: view:report.crm.case.user:0
 msgid "Cases by User and Section"
-msgstr ""
+msgstr "Dosare pe utilizatori şi secţiuni"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Leads By Stage"
-msgstr ""
+msgstr "Pistele mele pe stadii"
 
 #. module: board_crm_configuration
 #: view:report.crm.case.categ:0
 msgid "Cases by Sections and Categories"
-msgstr ""
+msgstr "Dosare pe secţiuni şi categorii"
 
 #. module: board_crm_configuration
 #: model:ir.actions.act_window,name:board_crm_configuration.open_board_statistical_dash
 msgid "CRM - Statistics Dashboard"
-msgstr ""
+msgstr "CRM - panou Statistici"
 
 #. module: board_crm_configuration
 #: view:board.board:0
 msgid "My Leads"
-msgstr ""
+msgstr "Pistele mele"
diff --git a/addons/board_document/i18n/ro.po b/addons/board_document/i18n/ro.po
index c54cc4f3551..ff48951ff8c 100644
--- a/addons/board_document/i18n/ro.po
+++ b/addons/board_document/i18n/ro.po
@@ -7,83 +7,83 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-28 18:40+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 05:18+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: board_document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "Fişiere noi"
 
 #. module: board_document
 #: model:ir.actions.act_window,name:board_document.open_board_document_manager
 #: model:ir.ui.menu,name:board_document.menu_board_document_manager
 msgid "Document Dashboard"
-msgstr ""
+msgstr "Panou documente"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "Panoul ruşinii"
 
 #. module: board_document
 #: view:board.board:0
 msgid "File Size by Month"
-msgstr ""
+msgstr "Mărime fişiere pe luni"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Month"
-msgstr ""
+msgstr "Fişiere pe luni"
 
 #. module: board_document
 #: model:ir.actions.act_window,name:board_document.open_board_document_manager1
 #: model:ir.ui.menu,name:board_document.menu_board_document_manager1
 msgid "Statistics by User"
-msgstr ""
+msgstr "Statistici pe utilizatori"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Resource Type"
-msgstr ""
+msgstr "Fişiere pe tipuri de resursă"
 
 #. module: board_document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: board_document
 #: model:ir.module.module,shortdesc:board_document.module_meta_information
 msgid "Dashboard for Document Management"
-msgstr ""
+msgstr "Panou management documente"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr ""
+msgstr "Fişiere pe parteneri"
 
 #. module: board_document
 #: model:ir.ui.menu,name:board_document.menu_board_document
 msgid "Document"
-msgstr ""
+msgstr "Document"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr ""
+msgstr "Fişiere pe utilizatori"
 
 #. module: board_document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "Panoul documente"
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/board_manufacturing/board_manufacturing_view.xml
index 731a79e09b0..5f9326625af 100644
--- a/addons/board_manufacturing/board_manufacturing_view.xml
+++ b/addons/board_manufacturing/board_manufacturing_view.xml
@@ -4,7 +4,7 @@
         <record id="note_sale_type" model="board.note.type">
             <field name="name">Production</field>
         </record>
-        
+
         <record id="board_mrp_manager_form" model="ir.ui.view">
             <field name="name">board.mrp.manager.form</field>
             <field name="model">board.board</field>
@@ -14,21 +14,21 @@
                     <hpaned position="100">
                         <child1>
                             <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next production orders" width="510"/>
-                            <action colspan="4" name="%(stock.action_picking_tree2)d" string="Deliveries (Out packing)"/>
-                            <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="Procurement in Exception"/>
+                            <action colspan="4" name="%(stock.action_picking_tree2)d" string="Deliveries (Out picking)"/>
+                            <action colspan="4" name="%(mrp.mrp_procurement_action4)d" string="	Requisition in Exception"/>
                         </child1>
-                        
-                        
+
+
                         <child2>
-                            <action colspan="4" name="%(report_mrp.action_report_workcenter_load_tree)d" string="Workcenter futur load"/>
-                            
+                            <action colspan="4" name="%(report_mrp.action_report_workcenter_load_tree)d" string="Workcenter future load"/>
+
                             <action colspan="4" name="%(report_mrp.action_report_in_out_picking_tree)d" string="Stock value variation"/>
                         </child2>
                     </hpaned>
                 </form>
             </field>
         </record>
-        
+
         <record id="open_board_manufacturing" model="ir.actions.act_window">
             <field name="name">Production Dashboard</field>
             <field name="res_model">board.board</field>
diff --git a/addons/board_manufacturing/i18n/ro.po b/addons/board_manufacturing/i18n/ro.po
index 76e34349c49..6813ba0f0b1 100644
--- a/addons/board_manufacturing/i18n/ro.po
+++ b/addons/board_manufacturing/i18n/ro.po
@@ -7,67 +7,67 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:13+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
+"PO-Revision-Date: 2009-11-28 18:43+0000\n"
+"Last-Translator: geopop65 <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:54+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Procurement in Exception"
-msgstr ""
+msgstr "Aprovizionare în excepţie"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Next production orders"
-msgstr ""
+msgstr "Următoarele comenzi de producţie"
 
 #. module: board_manufacturing
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML invalid pentru arhitectura machetei de afișare !"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Deliveries (Out packing)"
-msgstr ""
+msgstr "Livrări (ieşiri)"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "Panou fabricaţie"
 
 #. module: board_manufacturing
 #: model:ir.ui.menu,name:board_manufacturing.next_id_87
 msgid "Production"
-msgstr ""
+msgstr "Producţie"
 
 #. module: board_manufacturing
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nume invalid de model în definirea acţiunii"
 
 #. module: board_manufacturing
 #: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
 #: model:ir.ui.menu,name:board_manufacturing.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr ""
+msgstr "Panou Productie"
 
 #. module: board_manufacturing
 #: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
 msgid "Board for manufacturing"
-msgstr ""
+msgstr "Panou pentru fabricaţie"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Stock value variation"
-msgstr ""
+msgstr "Variaţie valoare stoc"
 
 #. module: board_manufacturing
 #: view:board.board:0
 msgid "Workcenter futur load"
-msgstr ""
+msgstr "Încărcare viitoare punct de operaţii"
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 92216e63187..2076b5a45d7 100755
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -348,6 +348,7 @@
             <field name="name">crm.case.form</field>
             <field name="model">crm.case</field>
             <field name="type">form</field>
+            <field name="priority" eval="1"/>
             <field name="arch" type="xml">
                 <form string="Cases">
                     <field colspan="4" name="name" select="1"/>
@@ -501,7 +502,7 @@
         </record>
 
         <record id="crm_case_section_open_act" model="ir.actions.act_window">
-            <field name="name">crm.case.section.open</field>
+            <field name="name">Cases</field>
             <field name="res_model">crm.case</field>
             <field name="domain">[('section_id','child_of',[active_id])]</field>
             <field name="view_type">form</field>
diff --git a/addons/crm/i18n/cs.po b/addons/crm/i18n/cs.po
index 62d5d569337..931224d9900 100644
--- a/addons/crm/i18n/cs.po
+++ b/addons/crm/i18n/cs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 10:10+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-27 13:29+0000\n"
+"Last-Translator: Kuvaly <kuvaly@seznam.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:55+0000\n"
+"X-Launchpad-Export-Date: 2009-11-28 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -25,7 +25,7 @@ msgstr ""
 #: wizard_field:crm.case.section.menu,design_menu,menu7:0
 #: wizard_field:crm.case.section.menu,design_menu,menu7_option:0
 msgid "My Draft "
-msgstr ""
+msgstr "Můj koncept "
 
 #. module: crm
 #: view:crm.case:0
@@ -68,7 +68,7 @@ msgstr ""
 #. module: crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Špatný název modelu v definici akce"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
@@ -79,7 +79,7 @@ msgstr ""
 #: wizard_field:crm.case.section.menu,design_menu,menu13:0
 #: wizard_field:crm.case.section.menu,design_menu,menu13_option:0
 msgid "All Open "
-msgstr ""
+msgstr "Vše otevřeno "
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -91,12 +91,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr ""
+msgstr "Spuštěn"
 
 #. module: crm
 #: field:crm.case.history,email:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -127,7 +127,7 @@ msgstr ""
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm
 msgid "CRM & SRM"
-msgstr ""
+msgstr "CRM & SRM"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -153,7 +153,7 @@ msgstr ""
 #: wizard_field:crm.case.section.menu,design_menu,menu1:0
 #: wizard_field:crm.case.section.menu,design_menu,menu1_option:0
 msgid "My "
-msgstr ""
+msgstr "Mé "
 
 #. module: crm
 #: view:crm.case:0
@@ -168,12 +168,12 @@ msgstr ""
 #: selection:crm.case.rule,trg_priority_from:0
 #: selection:crm.case.rule,trg_priority_to:0
 msgid "Highest"
-msgstr ""
+msgstr "Nejvyšší"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -194,12 +194,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.case.rule,trg_date_range_type:0
 msgid "Days"
-msgstr ""
+msgstr "Dny"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
 msgid "Value"
-msgstr ""
+msgstr "Hodnota"
 
 #. module: crm
 #: field:crm.case,planned_cost:0
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index b9c2cbfeeb7..941b2783c2d 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 17:02+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 05:22+0000\n"
+"Last-Translator: Jeroen Vet <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: 2009-11-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -47,7 +47,7 @@ msgstr ""
 #. module: crm
 #: wizard_view:crm.case.section.menu,init:0
 msgid "this wizard will create all sub-menus, within the selected menu."
-msgstr ""
+msgstr "该向导会创建属于选定菜单的所有子菜单"
 
 #. module: crm
 #: field:crm.case.rule,act_remind_partner:0
@@ -880,7 +880,7 @@ msgstr "待命"
 #: wizard_view:crm.case.section.menu,init:0
 msgid ""
 "You may want to create a new parent menu to put all the created menus in."
-msgstr ""
+msgstr "为了包含所创建的菜单，您可能要建立一份母菜单。"
 
 #. module: crm
 #: field:crm.case,state:0
@@ -1314,7 +1314,7 @@ msgstr "事务规则"
 #. module: crm
 #: help:crm.case,date_deadline:0
 msgid "Deadline Date is automatically computed from Start Date + Duration"
-msgstr ""
+msgstr "截止日期是根据开始日期+持续期间被自动计算"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
diff --git a/addons/crm_configuration/crm_config.py b/addons/crm_configuration/crm_config.py
index f4873bb1735..326e360c5e5 100644
--- a/addons/crm_configuration/crm_config.py
+++ b/addons/crm_configuration/crm_config.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -75,7 +75,7 @@ class crm_cases(osv.osv):
         'partner_name2': fields.char('Employee Email', size=64),
         'partner_phone': fields.char('Phone', size=32),
         'partner_mobile': fields.char('Mobile', size=32),
-        'child_ids': fields.one2many('crm.case', 'case_id', 'Events'),        
+        'child_ids': fields.one2many('crm.case', 'case_id', 'Events'),
     }
 
     def stage_next(self, cr, uid, ids, context={}):
@@ -125,11 +125,11 @@ class crm_menu_config_wizard(osv.osv_memory):
         'opportunity': fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
         'jobs': fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."),
         'document_ics': fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
-        'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"),
+        'bugs': fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"),
         'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
         'fund': fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
         'claims': fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
-        'phonecall': fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to planify a list of phone calls to process."),
+        'phonecall': fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to plan a list of phone calls to process."),
     }
     _defaults = {
         'meeting': lambda *args: True,
@@ -190,42 +190,42 @@ crm_menu_config_wizard()
 
 class crm_generic_wizard(osv.osv_memory):
     _name = 'crm.generic_wizard'
-    
-    _columns = {        
+
+    _columns = {
         'section_id': fields.many2one('crm.case.section', 'Section', required=True),
         'user_id': fields.many2one('res.users', 'Responsible'),
     }
-    
+
     def _get_default_section(self, cr, uid, context):
         case_id = context.get('active_id',False)
         if not case_id:
             return False
-        case_obj = self.pool.get('crm.case')    
+        case_obj = self.pool.get('crm.case')
         case = case_obj.read(cr, uid, case_id, ['state','section_id'])
         if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))              
+            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
         return case['section_id']
-        
-        
+
+
     _defaults = {
         'section_id': _get_default_section
-    }    
+    }
     def action_create(self, cr, uid, ids, context=None):
-        case_obj = self.pool.get('crm.case')        
+        case_obj = self.pool.get('crm.case')
         case_id = context.get('active_id',[])
         res = self.read(cr, uid, ids)[0]
         case = case_obj.read(cr, uid, case_id, ['state'])
         if case['state'] in ('done'):
-            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.')) 
+            raise osv.except_osv(_('Error !'), _('You can not assign Closed Case.'))
         new_case_id = case_obj.copy(cr, uid, case_id, default=
                                             {
                                                 'section_id':res.get('section_id',False),
                                                 'user_id':res.get('user_id',False)
                                             }, context=context)
-        case_obj.write(cr, uid, case_id, {'case_id':new_case_id}, context=context) 
-        case_obj.case_close(cr, uid, [case_id])       
-        return {} 
-        
+        case_obj.write(cr, uid, case_id, {'case_id':new_case_id}, context=context)
+        case_obj.case_close(cr, uid, [case_id])
+        return {}
+
 crm_generic_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_configuration/wizard/meeting_planify.py b/addons/crm_configuration/wizard/meeting_planify.py
index 50f897983b8..e6b93d11e8f 100644
--- a/addons/crm_configuration/wizard/meeting_planify.py
+++ b/addons/crm_configuration/wizard/meeting_planify.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -29,7 +29,7 @@ import pooler
 from tools.translate import _
 
 case_form = """<?xml version="1.0"?>
-<form string="Planify Meeting">
+<form string="Plan Meeting">
     <field name="date"/>
     <field name="duration" widget="float_time"/>
     <label string="Note that you can also use the calendar view to graphically schedule your next meeting." colspan="4"/>
diff --git a/addons/crm_profiling/i18n/sl.po b/addons/crm_profiling/i18n/sl.po
index dc68011d361..6b08e9c7a2c 100644
--- a/addons/crm_profiling/i18n/sl.po
+++ b/addons/crm_profiling/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-26 13:48+0000\n"
+"Last-Translator: Simon Vidmar <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: 2009-11-18 04:43+0000\n"
+"X-Launchpad-Export-Date: 2009-11-27 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
@@ -48,7 +48,7 @@ msgstr ""
 #. module: crm_profiling
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Napačno ime modela v definiciji dejanja."
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5e1151b0877..4638e515db6 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -158,7 +158,7 @@
         </record>
 
         <record id="action_picking_tree4" model="ir.actions.act_window">
-            <field name="name">Packing to be invoiced</field>
+            <field name="name">Picking to be invoiced</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -178,7 +178,7 @@
             <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','in')]</field>
             <field name="filter" eval="True"/>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="stock.view_stock_delivery_filter"/>
         </record>
         <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="stock.menu_action_picking_tree4" groups="base.group_extended"/>
 
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index df2b4939051..01b8be4999b 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:48+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
+"PO-Revision-Date: 2009-11-26 07:23+0000\n"
+"Last-Translator: Miro Glavić <glavicmiro@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: 2009-11-17 04:53+0000\n"
+"X-Launchpad-Export-Date: 2009-11-27 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -21,46 +21,48 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Naziv Objekta mora početi sa x_ i ne smije sadržavati nikakve specijalne "
+"znakove !"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid ">="
-msgstr ""
+msgstr ">="
 
 #. module: delivery
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Prodaja i Nabava"
 
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Destination"
-msgstr ""
+msgstr "Odredište"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
 msgid "Delivery by Poste"
-msgstr ""
+msgstr "Dostava Poštom"
 
 #. module: delivery
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nevažeći XML za Arhitekturu Prikaza!"
 
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Greška ! Ne možete kreirati rekurzivno pridružene članove."
 
 #. module: delivery
 #: field:delivery.grid,state_ids:0
 msgid "States"
-msgstr ""
+msgstr "Države"
 
 #. module: delivery
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nevažeće ime modela u definiciji akcije."
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
@@ -70,7 +72,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr ""
+msgstr "Dostavna Mreža"
 
 #. module: delivery
 #: field:delivery.grid,zip_from:0
@@ -80,7 +82,7 @@ msgstr ""
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Fiksno"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
@@ -91,7 +93,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
 msgid "Delivery Pricelist"
-msgstr ""
+msgstr "Cijenik Dostave"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree5
@@ -107,7 +109,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
 msgid "Delivery"
-msgstr ""
+msgstr "Dostava"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -117,23 +119,23 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr ""
+msgstr "Mreža"
 
 #. module: delivery
 #: view:res.partner:0
 msgid "Deliveries Properties"
-msgstr ""
+msgstr "Svojstva Dostave"
 
 #. module: delivery
 #: field:delivery.carrier,active:0
 #: field:delivery.grid,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivno"
 
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr ""
+msgstr "Definicija mreže"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -144,7 +146,7 @@ msgstr ""
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: delivery
 #: field:delivery.carrier,product_id:0
@@ -154,7 +156,7 @@ msgstr ""
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Condition"
-msgstr ""
+msgstr "Uvjet"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_carrier
@@ -164,12 +166,12 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Cijena Koštanja"
 
 #. module: delivery
 #: field:delivery.grid.line,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naziv"
 
 #. module: delivery
 #: constraint:product.template:0
@@ -179,7 +181,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid,country_ids:0
 msgid "Countries"
-msgstr ""
+msgstr "Zemlje"
 
 #. module: delivery
 #: constraint:product.template:0
@@ -190,23 +192,23 @@ msgstr ""
 #. module: delivery
 #: view:sale.order:0
 msgid "Notes"
-msgstr ""
+msgstr "Bilješke"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
 msgid "Variable Factor"
-msgstr ""
+msgstr "Varijabilni Faktor"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 #: field:delivery.grid.line,type:0
 msgid "Variable"
-msgstr ""
+msgstr "Varijabla"
 
 #. module: delivery
 #: field:delivery.grid,name:0
 msgid "Grid Name"
-msgstr ""
+msgstr "Naziv Mreže"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -214,24 +216,24 @@ msgstr ""
 #: field:delivery.grid,carrier_id:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr ""
+msgstr "Nosač"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: field:stock.picking,volume:0
 msgid "Volume"
-msgstr ""
+msgstr "Zapremina"
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
-msgstr ""
+msgstr "Maksimalna Vrijednost"
 
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,delivery:0
 msgid "Add Delivery Costs"
-msgstr ""
+msgstr "Dodaj Troškove Dostave"
 
 #. module: delivery
 #: wizard_field:delivery.sale.order,init,carrier_id:0
@@ -239,17 +241,17 @@ msgstr ""
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
 #: field:res.partner,property_delivery_carrier:0
 msgid "Delivery Method"
-msgstr ""
+msgstr "Način Dostave"
 
 #. module: delivery
 #: field:sale.order,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Operator"
 
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
@@ -259,19 +261,19 @@ msgstr ""
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr ""
+msgstr "Dostavne Mreže"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 #: field:stock.picking,weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Težina"
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvenca"
 
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
@@ -306,12 +308,12 @@ msgstr ""
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Troškovi Dostave"
 
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
 msgid "Sale Price"
-msgstr ""
+msgstr "Prodajna Cijena"
 
 #. module: delivery
 #: constraint:product.product:0
@@ -321,24 +323,24 @@ msgstr ""
 #. module: delivery
 #: view:delivery.grid:0
 msgid "Delivery grids"
-msgstr ""
+msgstr "Dostavne mreže"
 
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Poništi"
 
 #. module: delivery
 #: field:sale.order,carrier_id:0
 msgid "Delivery method"
-msgstr ""
+msgstr "Način dostave"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Price"
-msgstr ""
+msgstr "Cijena"
 
 #. module: delivery
 #: constraint:res.partner:0
@@ -348,4 +350,4 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
-msgstr ""
+msgstr "Vrsta Cijene"
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index ed81d7c6167..299aad4f4d3 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-24 11:51+0000\n"
-"Last-Translator: Miran Gombač <Unknown>\n"
+"PO-Revision-Date: 2009-11-26 12:55+0000\n"
+"Last-Translator: Simon Vidmar <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: 2009-11-25 04:48+0000\n"
+"X-Launchpad-Export-Date: 2009-11-27 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -21,7 +21,7 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -61,7 +61,7 @@ msgstr ""
 #. module: delivery
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Napačno ime modela v definiciji dejanja."
 
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
@@ -76,12 +76,12 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid,zip_from:0
 msgid "Start Zip"
-msgstr ""
+msgstr "Zažetna poštna številka"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Stalno"
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
@@ -92,7 +92,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
 #: model:ir.ui.menu,name:delivery.menu_action_delivery_grid_form
 msgid "Delivery Pricelist"
-msgstr ""
+msgstr "Cenik dostave"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree5
@@ -113,7 +113,7 @@ msgstr "Dostava"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr ""
+msgstr "Mrežne črte"
 
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
@@ -140,7 +140,7 @@ msgstr ""
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Weight * Volume"
-msgstr ""
+msgstr "Teža * prostornina"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -165,7 +165,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Lastna cena"
 
 #. module: delivery
 #: field:delivery.grid.line,name:0
@@ -196,7 +196,7 @@ msgstr "Opombe"
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
 msgid "Variable Factor"
-msgstr ""
+msgstr "Spremenljivi faktor"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -227,7 +227,7 @@ msgstr "Prostornina"
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
 msgid "Maximum Value"
-msgstr ""
+msgstr "Največja vrednost"
 
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,delivery:0
@@ -245,7 +245,7 @@ msgstr "Način dostave"
 #. module: delivery
 #: field:sale.order,id:0
 msgid "ID"
-msgstr ""
+msgstr "Oznaka"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -290,7 +290,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.grid,zip_to:0
 msgid "To Zip"
-msgstr ""
+msgstr "do poštbe številke"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
@@ -307,7 +307,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Stroški dostave"
 
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
@@ -332,7 +332,7 @@ msgstr "Prekliči"
 #. module: delivery
 #: field:sale.order,carrier_id:0
 msgid "Delivery method"
-msgstr ""
+msgstr "Način dostave"
 
 #. module: delivery
 #: field:delivery.carrier,price:0
@@ -344,9 +344,9 @@ msgstr "Cena"
 #. module: delivery
 #: constraint:res.partner:0
 msgid "The VAT doesn't seem to be correct."
-msgstr ""
+msgstr "Napaka pri obračunu DDV"
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
-msgstr ""
+msgstr "Vrsta cene"
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index 841c56df9e5..e293af59937 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,12 +26,12 @@ class res_partner(osv.osv):
     _columns = {
         'property_delivery_carrier': fields.property(
           'delivery.carrier',
-          type='many2one', 
-          relation='delivery.carrier', 
-          string="Delivery Method", 
+          type='many2one',
+          relation='delivery.carrier',
+          string="Delivery Method",
           method=True,
           view_load=True,
-          help="This delivery method will be used when invoicing from packing."),
+          help="This delivery method will be used when invoicing from picking."),
     }
 res_partner()
 
diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py
index 5a902224883..a9f6e38a9e7 100644
--- a/addons/delivery/sale.py
+++ b/addons/delivery/sale.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 import netsvc
@@ -24,9 +24,9 @@ from osv import fields,osv
 
 # Overloaded sale_order to manage carriers :
 class sale_order(osv.osv):
-    _inherit = 'sale.order' 
+    _inherit = 'sale.order'
     _columns = {
-        'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on packing."),
+        'carrier_id':fields.many2one("delivery.carrier","Delivery method", help="Complete this field if you plan to invoice the shipping based on picking."),
         'id': fields.integer('ID', readonly=True,invisible=True),
     }
 
diff --git a/addons/document/document.py b/addons/document/document.py
index cd3d667f8bf..4acef4d3ab8 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -242,6 +242,7 @@ class document_directory(osv.osv):
     _description = 'Document directory'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=1),
+        'company_id': fields.many2one('res.company', 'Company'),
         'write_date': fields.datetime('Date Modified', readonly=True),
         'write_uid':  fields.many2one('res.users', 'Last Modification User', readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
@@ -269,6 +270,7 @@ class document_directory(osv.osv):
         'user_id': lambda self,cr,uid,ctx: uid,
         'domain': lambda self,cr,uid,ctx: '[]',
         'type': lambda *args: 'directory',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'document.directory', c),
         'ressource_id': lambda *a: 0
     }
     _sql_constraints = [
diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po
index 76d8ee4c583..3fd385875df 100644
--- a/addons/document/i18n/pt.po
+++ b/addons/document/i18n/pt.po
@@ -7,51 +7,52 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 15:41+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 23:37+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:18+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
 #: field:document.directory,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Data de criação"
 
 #. module: document
 #: field:document.directory,ressource_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Id do recurso"
 
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr ""
+msgstr "Incluir Nome do Registo"
 
 #. module: document
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
+"O nome do objecto deve começar com x_ e não pode conter nenhum caracter "
+"especial!"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr ""
+msgstr "ID do Modelo"
 
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr "Erro! Não é possível criar directorias recursivos."
+msgstr "Erro! Não é possível criar pastas recursivamente."
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_configuration
 msgid "Document Configuration"
-msgstr ""
+msgstr "Configuração de Documento"
 
 #. module: document
 #: view:ir.attachment:0
@@ -61,17 +62,17 @@ msgstr "Pré-visualizar"
 #. module: document
 #: field:ir.attachment,store_method:0
 msgid "Storing Method"
-msgstr ""
+msgstr "Método de armazenamento"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr ""
+msgstr "Auto-configurar pastas"
 
 #. module: document
 #: field:ir.attachment,file_size:0
 msgid "File Size"
-msgstr ""
+msgstr "Tamanho do ficheiro"
 
 #. module: document
 #: help:document.directory.content,include_name:0
@@ -79,21 +80,23 @@ msgid ""
 "Check this field if you want that the name of the file start by the record "
 "name."
 msgstr ""
+"Assinale este campo se quer que o nome dos ficheiros comece pelo nome do "
+"registo."
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Other Resources"
-msgstr ""
+msgstr "Outros recursos"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "Modelo-Pai"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Document Management System."
-msgstr ""
+msgstr "Sistema de gestão documental"
 
 #. module: document
 #: view:ir.attachment:0
@@ -103,23 +106,23 @@ msgstr "Anexo"
 #. module: document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Static Directory"
-msgstr ""
+msgstr "Pasta estática"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr ""
+msgstr "Tipo de conteúdo da pasta"
 
 #. module: document
 #: help:document.directory,domain:0
 msgid ""
 "Use a domain if you want to apply an automatic filter on visible resources."
-msgstr ""
+msgstr "Use um domínio se quer um filtro automático aos recursos visíveis"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -127,59 +130,61 @@ msgid ""
 "Check this if you want to use the same tree structure as the object selected "
 "in the system."
 msgstr ""
+"Assinale aqui se quer usar a mesma estrutura em árvore como a do objecto "
+"seleccionado no sistema"
 
 #. module: document
 #: field:document.directory,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directorie's Structure"
-msgstr ""
+msgstr "Estrutura de pastas"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Item"
-msgstr ""
+msgstr "Item-pai"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "File Information"
-msgstr ""
+msgstr "Informação do Ficheiro"
 
 #. module: document
 #: field:document.directory,file_ids:0
 #: view:ir.attachment:0
 msgid "Files"
-msgstr ""
+msgstr "Ficheiros"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Ficheiro guardado"
 
 #. module: document
 #: field:document.directory,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr ""
+msgstr "Utilizador da última modificação"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
 msgid "Tree Structure"
-msgstr ""
+msgstr "Estrutura em árvore"
 
 #. module: document
 #: field:ir.attachment,title:0
 msgid "Resource Title"
-msgstr ""
+msgstr "Título do recurso"
 
 #. module: document
 #: model:ir.actions.todo,note:document.config_auto_directory
@@ -187,11 +192,13 @@ msgid ""
 "This wizard will configure the URL of the server of the document management "
 "system."
 msgstr ""
+"Este assistente vai configurar o URL do servidor do sistema de gestão "
+"documental."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
 msgid "Directory Content"
-msgstr ""
+msgstr "Conteúdo da pasta"
 
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
@@ -199,32 +206,34 @@ msgid ""
 "If you put an object here, this directory template will appear bellow all of "
 "these objects. Don't put a parent directory if you select a parent model."
 msgstr ""
+"Se colocar um objecto aqui, este modelo de pasta vai aparecer abaixo destes "
+"objectos. Não atribua uma pasta-mãe se seleccionou um modelo-pai."
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document
 msgid "Document Management"
-msgstr ""
+msgstr "Gestão documental"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
 msgid "Link"
-msgstr ""
+msgstr "Ligação"
 
 #. module: document
 #: view:document.directory:0
 msgid "Directory Type"
-msgstr ""
+msgstr "Tipo de pasta"
 
 #. module: document
 #: field:document.directory,group_ids:0
 #: field:ir.attachment,group_ids:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupos"
 
 #. module: document
 #: field:document.directory.content,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Relatório"
 
 #. module: document
 #: help:document.configuration.wizard,host:0
@@ -232,6 +241,8 @@ msgid ""
 "Put here the server address or IP. Keep localhost if you don't know what to "
 "write."
 msgstr ""
+"Coloque aqui o endereço do servidor ou o IP. Se não sabe, Deixe ficar "
+"\"localhost\"."
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -239,6 +250,8 @@ msgid ""
 "This wizard will automatically configure the document management system "
 "according to modules installed on your system."
 msgstr ""
+"O assistente vai configurar automaticamente o sistema de gestão documental, "
+"de acordo com os módulos instalados."
 
 #. module: document
 #: view:ir.attachment:0
@@ -254,12 +267,12 @@ msgstr "Notas"
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr ""
+msgstr "Conteúdo indexado"
 
 #. module: document
 #: view:document.directory:0
 msgid "Definition"
-msgstr ""
+msgstr "Definição"
 
 #. module: document
 #: constraint:ir.ui.view:0
@@ -274,59 +287,63 @@ msgid ""
 "    * User Authentication\n"
 "    * Document Indexation\n"
 msgstr ""
+"Este é um Sistema de gestão Documental completo:\n"
+"    * Interface FTP\n"
+"    * Autenticação dos utilizadores\n"
+"    * Indexação dos documentos\n"
 
 #. module: document
 #: field:document.directory,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: document
 #: field:document.directory.content.type,code:0
 msgid "Extension"
-msgstr ""
+msgstr "Extensão"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
 msgid "Database"
-msgstr ""
+msgstr "Base de dados"
 
 #. module: document
 #: field:document.directory,content_ids:0
 msgid "Virtual Files"
-msgstr ""
+msgstr "Ficheiros virtuais"
 
 #. module: document
 #: view:document.directory:0
 #: model:ir.ui.menu,name:document.menu_document_directories
 msgid "Directories"
-msgstr ""
+msgstr "Pastas"
 
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Seq."
 
 #. module: document
 #: model:ir.module.module,shortdesc:document.module_meta_information
 msgid "Integrated Document Management System"
-msgstr ""
+msgstr "Sistema de gestão documental Integrado"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
 #: field:ir.attachment,parent_id:0
 msgid "Directory"
-msgstr ""
+msgstr "Pasta"
 
 #. module: document
 #: field:document.directory,user_id:0
 #: field:ir.attachment,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "Dono"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration_wizard
 msgid "document.configuration.wizard"
-msgstr ""
+msgstr "document.configuration.wizard"
 
 #. module: document
 #: view:ir.attachment:0
@@ -336,35 +353,35 @@ msgstr "Ligado a"
 #. module: document
 #: selection:ir.attachment,store_method:0
 msgid "Filesystem"
-msgstr ""
+msgstr "Sistema de ficheiros"
 
 #. module: document
 #: field:document.directory,file_type:0
 #: field:document.directory.content.type,name:0
 #: field:ir.attachment,file_type:0
 msgid "Content Type"
-msgstr ""
+msgstr "Tipo de conteúdo"
 
 #. module: document
 #: view:document.directory:0
 #: view:ir.attachment:0
 msgid "Security"
-msgstr ""
+msgstr "Segurança"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_browse
 msgid "Browse Files Using FTP"
-msgstr ""
+msgstr "Navegue pelos ficheiros via FTP"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Directories Mapped to Objects"
-msgstr ""
+msgstr "Pastas mapeadas aos objectos"
 
 #. module: document
 #: view:ir.attachment:0
 msgid "History"
-msgstr ""
+msgstr "Histórico"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -372,100 +389,102 @@ msgid ""
 "Select an object here and Open ERP will create a mapping for each of these "
 "objects, using the given domain, when browsing through FTP."
 msgstr ""
+"Seleccione um objecto aqui para o OpenERP mapear cada um destes objectos, "
+"usando o domínio dado, ao navegar por FTP."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "Others Info"
-msgstr ""
+msgstr "Outras Informações"
 
 #. module: document
 #: field:document.directory,domain:0
 msgid "Domain"
-msgstr ""
+msgstr "Domínio"
 
 #. module: document
 #: field:document.directory,write_date:0
 #: field:ir.attachment,write_date:0
 msgid "Date Modified"
-msgstr ""
+msgstr "Data da modificação"
 
 #. module: document
 #: field:document.directory.content,suffix:0
 msgid "Suffix"
-msgstr ""
+msgstr "Sufixo"
 
 #. module: document
 #: field:document.configuration.wizard,host:0
 msgid "Server Address"
-msgstr ""
+msgstr "Endereço do servidor"
 
 #. module: document
 #: model:ir.actions.url,name:document.action_document_browse
 msgid "Browse Files"
-msgstr ""
+msgstr "Naveguar pelos ficheiros"
 
 #. module: document
 #: field:document.directory.content,name:0
 msgid "Content Name"
-msgstr ""
+msgstr "Nome do conteúdo"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory
 #: field:process.node,directory_id:0
 msgid "Document directory"
-msgstr ""
+msgstr "Pasta de documentos"
 
 #. module: document
 #: field:document.directory,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Autor"
 
 #. module: document
 #: view:document.directory:0
 msgid "Auto-Generated Files"
-msgstr ""
+msgstr "Ficheiros auto-gerados"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequência"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Search a File"
-msgstr ""
+msgstr "Procure um ficheiro"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Auto Configure"
-msgstr ""
+msgstr "Auto-configurar"
 
 #. module: document
 #: view:document.configuration.wizard:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: document
 #: field:ir.attachment,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Parceiro"
 
 #. module: document
 #: view:document.directory:0
 msgid "PDF Report"
-msgstr ""
+msgstr "Relatório PDF"
 
 #. module: document
 #: field:document.directory.content,extension:0
 msgid "Document Type"
-msgstr ""
+msgstr "Tipo de documento"
 
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Dependentes"
 
 #. module: document
 #: view:document.directory:0
 msgid "Contents"
-msgstr ""
+msgstr "Conteúdo"
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 52b4e6de990..cddf24cddea 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -10,5 +10,17 @@
         <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
     </record>
 
+
+    <record model="ir.rule.group" id="document_directory_comp_rule_group">
+        <field name="name">Document Directory multi-company</field>
+        <field name="model_id" ref="model_document_directory"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="document_directory_comp_rule">
+        <field name="field_id" search="[('model','=','document.directory'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="document_directory_comp_rule_group"/>
+        <field name="domain_force">['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py
index 21f472a55bd..a4e5c9017b3 100644
--- a/addons/document_ics/document_ics_config_wizard.py
+++ b/addons/document_ics/document_ics_config_wizard.py
@@ -28,47 +28,47 @@ import base64
 import pooler
 
 SECTION_NAME = {
-    'meeting' : 'Meetings', 
-    'lead':'Prospects', 
-    'opportunity':'Opportunities', 
-    'jobs':'Jobs', 
-    'bugs':'Bug Tracking', 
-    'fund':'Fund Raising', 
-    'helpdesk':'HelpDesk', 
-    'claims':'Claims', 
-    'phonecall':'Phone Calls', 
+    'meeting' : 'Meetings',
+    'lead':'Prospects',
+    'opportunity':'Opportunities',
+    'jobs':'Jobs',
+    'bugs':'Bug Tracking',
+    'fund':'Fund Raising',
+    'helpdesk':'HelpDesk',
+    'claims':'Claims',
+    'phonecall':'Phone Calls',
                 }
 
 ICS_TAGS = {
-        'summary':'Description', 
-        'uid':'Calendar Code' , 
-        'dtstart':'Date' , 
-        'dtend':'Deadline' , 
-        'url':'Partner Email' , 
-        'description':'Your action', 
+        'summary':'Description',
+        'uid':'Calendar Code' ,
+        'dtstart':'Date' ,
+        'dtend':'Deadline' ,
+        'url':'Partner Email' ,
+        'description':'Your action',
             }
 
 class document_ics_crm_wizard(osv.osv_memory):
     _name='document.ics.crm.wizard'
     _columns = {
-        'name':fields.char('Name', size=64), 
-        'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."), 
-        'lead' : fields.boolean('Prospect', help="Allows you to track and manage prospects which are pre-sales requests or contacts, the very first contact with a customer request."), 
-        'opportunity' : fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."), 
-        'jobs' : fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."), 
-        'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."), 
-        'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on softwares"), 
-        'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."), 
-        'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."), 
-        'claims' : fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."), 
-        'phonecall' : fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to planify a list of phone calls to process."), 
+        'name':fields.char('Name', size=64),
+        'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
+        'lead' : fields.boolean('Prospect', help="Allows you to track and manage prospects which are pre-sales requests or contacts, the very first contact with a customer request."),
+        'opportunity' : fields.boolean('Business Opportunities', help="Tracks identified business opportunities for your sales pipeline."),
+        'jobs' : fields.boolean('Jobs Hiring Process', help="Help you to organise the jobs hiring process: evaluation, meetings, email integration..."),
+        'document_ics':fields.boolean('Shared Calendar', help=" Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."),
+        'bugs' : fields.boolean('Bug Tracking', help="Used by companies to track bugs and support requests on software"),
+        'helpdesk': fields.boolean('Helpdesk', help="Manages an Helpdesk service."),
+        'fund' : fields.boolean('Fund Raising Operations', help="This may help associations in their fund raising process and tracking."),
+        'claims' : fields.boolean('Claims', help="Manages the supplier and customers claims, including your corrective or preventive actions."),
+        'phonecall' : fields.boolean('Phone Calls', help="Help you to encode the result of a phone call or to plan a list of phone calls to process."),
     }
     _defaults = {
-        'meeting': lambda *args: True, 
-        'opportunity': lambda *args: True, 
-        'phonecall': lambda *args: True, 
+        'meeting': lambda *args: True,
+        'opportunity': lambda *args: True,
+        'phonecall': lambda *args: True,
     }
-    
+
     def action_create(self, cr, uid, ids, context=None):
         data=self.read(cr, uid, ids, [])[0]
         dir_obj = self.pool.get('document.directory')
@@ -85,46 +85,46 @@ class document_ics_crm_wizard(osv.osv_memory):
                 section_id=self.pool.get('crm.case.section').search(cr, uid, [('name', '=', SECTION_NAME[section])])
                 if not section_id:
                     continue
-                else:                    
+                else:
                     object_id=self.pool.get('ir.model').search(cr, uid, [('name', '=', 'Case')])[0]
-                    
+
                     vals_cont={
-                          'name': SECTION_NAME[section], 
-                          'sequence': 1, 
-                          'directory_id': dir_id, 
-                          'suffix': section, 
-                          'extension': '.ics', 
-                          'ics_object_id': object_id, 
-                          'ics_domain': [('section_id', '=', section_id[0])], 
+                          'name': SECTION_NAME[section],
+                          'sequence': 1,
+                          'directory_id': dir_id,
+                          'suffix': section,
+                          'extension': '.ics',
+                          'ics_object_id': object_id,
+                          'ics_domain': [('section_id', '=', section_id[0])],
                           'include_name' : False
-                        } 
-                    
+                        }
+
                     content_id = dir_cont_obj.create(cr, uid, vals_cont)
-                    
+
                     ics_obj=self.pool.get('document.directory.ics.fields')
                     for tag in ['description', 'url', 'summary', 'dtstart', 'dtend', 'uid']:
                         field_id =  self.pool.get('ir.model.fields').search(cr, uid, [('model_id.name', '=', 'Case'), ('field_description', '=', ICS_TAGS[tag])])[0]
-                        vals_ics={ 
-                                'field_id':  field_id , 
-                                'name':  tag , 
-                                'content_id': content_id , 
+                        vals_ics={
+                                'field_id':  field_id ,
+                                'name':  tag ,
+                                'content_id': content_id ,
                                   }
                         ics_obj.create(cr, uid, vals_ics)
 
         return {
-                'view_type': 'form', 
-                "view_mode": 'form', 
-                'res_model': 'ir.actions.configuration.wizard', 
-                'type': 'ir.actions.act_window', 
-                'target':'new', 
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
          }
     def action_cancel(self, cr, uid, ids, conect=None):
         return {
-                'view_type': 'form', 
-                "view_mode": 'form', 
-                'res_model': 'ir.actions.configuration.wizard', 
-                'type': 'ir.actions.act_window', 
-                'target':'new', 
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'ir.actions.configuration.wizard',
+                'type': 'ir.actions.act_window',
+                'target':'new',
          }
 
 document_ics_crm_wizard()
diff --git a/addons/google_map/i18n/hu.po b/addons/google_map/i18n/hu.po
index bd193b6ccbf..eda59d08c83 100644
--- a/addons/google_map/i18n/hu.po
+++ b/addons/google_map/i18n/hu.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:26+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2009-11-27 20:52+0000\n"
+"Last-Translator: Kisrobert <kisrobert@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-17 04:50+0000\n"
+"X-Launchpad-Export-Date: 2009-11-28 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
 msgid "Launch Google Map"
-msgstr ""
+msgstr "Google Maps indítása"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Nem valós XML"
 
 #. module: google_map
 #: view:res.partner:0
@@ -39,9 +39,11 @@ msgid ""
 "so that we can directly open google map from the\n"
 "url widget."
 msgstr ""
+"Ez a modul egy Google Maps mezőt ad hozzá a partner címéhez.\n"
+"Így közvetlenül megnyitja a Google Maps -et a böngészőben."
 
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Map"
-msgstr ""
+msgstr "Térkép"
diff --git a/addons/google_map/i18n/sk.po b/addons/google_map/i18n/sk.po
index 20188d1c175..38d966e3a41 100644
--- a/addons/google_map/i18n/sk.po
+++ b/addons/google_map/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-18 15:16+0000\n"
+"PO-Revision-Date: 2009-11-27 12:21+0000\n"
 "Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-19 04:34+0000\n"
+"X-Launchpad-Export-Date: 2009-11-28 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
@@ -40,6 +40,8 @@ msgid ""
 "so that we can directly open google map from the\n"
 "url widget."
 msgstr ""
+"Modul pridáva Google Map do poľa na adresu partnera\n"
+"takže môžete otvoriť adresu partnera priamo v Google Map."
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 65a02fa4e19..a017ebd7460 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 23:21+0000\n"
+"Last-Translator: Paulino <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: 2009-11-18 04:42+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -57,7 +57,7 @@ msgstr "Ascendentes"
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 0658300bf14..5cc7c1236ab 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -63,7 +63,7 @@ class hr_expense_expense(osv.osv):
         'date_confirm': fields.date('Date Confirmed'),
         'date_valid': fields.date('Date Validated'),
         'user_valid': fields.many2one('res.users', 'Validation User'),
-        'account_move_id': fields.many2one('account.move', 'Account Move'),
+        'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
         'amount': fields.function(_amount, method=True, string='Total Amount'),
@@ -127,7 +127,7 @@ class hr_expense_expense(osv.osv):
                     acc = self.pool.get('ir.property').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`'))
-                    
+
                 lines.append((0, False, {
                     'name': l.name,
                     'account_id': acc,
@@ -174,11 +174,11 @@ hr_expense_expense()
 
 class product_product(osv.osv):
     _inherit = "product.product"
-    
+
     _columns = {
                 'hr_expense_ok': fields.boolean('Can be Expensed', help="Determine if the product can be visible in the list of product within a selection from an HR expense sheet line."),
     }
-    
+
 product_product()
 
 
diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml
index 088e793453a..2026902dd5c 100755
--- a/addons/hr_holidays/process/hr_holidays_process.xml
+++ b/addons/hr_holidays/process/hr_holidays_process.xml
@@ -164,7 +164,7 @@
 		<record id="process_transition_action_reufse0" model="process.transition.action">
 			<field eval="&quot;&quot;&quot;holidays_refuse&quot;&quot;&quot;" name="action"/>
 			<field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-			<field eval="&quot;&quot;&quot;Reufse&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Refuse&quot;&quot;&quot;" name="name"/>
 			<field name="transition_id" ref="process_transition_refusedrequest0"/>
 		</record>
 		
diff --git a/addons/idea/i18n/pt.po b/addons/idea/i18n/pt.po
index b610754d90c..854bd310fe0 100644
--- a/addons/idea/i18n/pt.po
+++ b/addons/idea/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 11:30+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 23:01+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:07+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -44,7 +44,7 @@ msgstr "Minhas ideias"
 #. module: idea
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -118,7 +118,7 @@ msgstr "Categorias para uma ideia"
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Gestão de Ideias"
 
 #. module: idea
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
@@ -221,6 +221,12 @@ msgid ""
 "managers can obtain an easy view on best ideas from all the users. Once "
 "installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
+"Este modulo permite aos utilizadores participar de forma fácil e eficiente "
+"na inovação da empresa. Permite que todos expressem ideias acerca de "
+"assuntos diferentes. Depois outros utilizadores podem comentar e votar essas "
+"ideias. Cada ideia obtem uma pontuação. Os gestores podem ter uma visão das "
+"melhores ideias de todos os utilizadores. depois de instalado o módulo, "
+"verifique o menu \"Ideias\" no menu principal \"Ferramentas\"."
 
 #. module: idea
 #: field:idea.comment,create_date:0
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index bb0afe71845..bbb3bab4d7f 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -266,7 +266,7 @@ class Partner(osv.osv):
                                 s = 3
                 if s==4:
                     for mline in partner_data.member_lines:
-                        if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and mline.account_invoice_line.invoice_id.state == 'paid':
+                        if mline.date_from < today and mline.date_to < today and mline.date_from<=mline.date_to and (mline.account_invoice_line and mline.account_invoice_line.invoice_id.state) == 'paid':
                             s = 5
                         else:
                             s = 6
diff --git a/addons/mrp/company.py b/addons/mrp/company.py
index 25154134e92..d9a4b5b94ba 100644
--- a/addons/mrp/company.py
+++ b/addons/mrp/company.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,14 +26,14 @@ class company(osv.osv):
     _columns = {
         'schedule_range': fields.float('Scheduler Range', required=True,
             help="This is the time frame analysed by the scheduler when "\
-            "computing procurements. All procurement that are not between "\
+            "computing Requisitions. All Requisition that are not between "\
             "today and today+range are skipped for futur computation."),
         'po_lead': fields.float('Purchase Lead Time', required=True,
             help="This is the leads/security time for each purchase order."),
         'security_lead': fields.float('Security Days', required=True,
             help="This is the days added to what you promise to customers "\
             "for security purpose"),
-        'manufacturing_lead': fields.float('Manufacturity Lead Time', required=True,
+        'manufacturing_lead': fields.float('Manufacturing Lead Time', required=True,
             help="Security days for each manufacturing operation."),
     }
     _defaults = {
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 5246601699b..b665451c602 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-27 12:39+0000\n"
+"Last-Translator: TeMPO <info@tempo-consulting.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: 2009-11-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2009-11-28 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -87,7 +87,7 @@ msgstr "Approvisionnements en Exception"
 #. module: mrp
 #: view:mrp.routing.workcenter:0
 msgid "Routing Workcenters"
-msgstr "Centre de Travail d'Acheminement"
+msgstr "Postes de charges"
 
 #. module: mrp
 #: help:mrp.property,composition:0
@@ -98,7 +98,7 @@ msgstr "Non utilisé dans les calculs, pour information seulement."
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
 #: model:ir.ui.menu,name:mrp.menu_mrp_routing_action
 msgid "Routings"
-msgstr "Acheminements"
+msgstr "Gammes"
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
@@ -182,9 +182,9 @@ msgid ""
 "Number of operation this workcenter can do in parallel. If this workcenter "
 "represent a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
-"Nombre d'opération que ce centre de travail peut effectuer en parallèle. Si "
-"ce centre de travail représente une équipe de 5 travailleurs, la capacité "
-"par cycle est de 5."
+"Nombre d'opérations que ce poste de charge peut faire en parallèle. si ce "
+"centre de travail représente une équipe de 5 personnes, la capacité par "
+"cycle est 5."
 
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
@@ -212,7 +212,7 @@ msgstr "Produits consommés"
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
-msgstr ""
+msgstr "Compte analyt. du cycle"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -598,7 +598,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
-msgstr "Temps en heures pour effectuer un cycle."
+msgstr "Temps nécessaire à la réalisation d'un cycle"
 
 #. module: mrp
 #: field:mrp.production,date_finnished:0
@@ -636,7 +636,7 @@ msgstr "En attente"
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr "Acheminement"
+msgstr "Gamme"
 
 #. module: mrp
 #: wizard_button:mrp.workcenter.load,init,report:0
@@ -933,7 +933,7 @@ msgstr "Nom"
 #. module: mrp
 #: field:mrp.routing.workcenter,cycle_nbr:0
 msgid "Number of Cycle"
-msgstr "Nombre de Cycle"
+msgstr "Nombre de cycles"
 
 #. module: mrp
 #: wizard_field:mrp.workcenter.load,init,measure_unit:0
@@ -960,7 +960,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,time_efficiency:0
 msgid "Time Efficiency"
-msgstr "Éfficacité dans le temps"
+msgstr "Rendement temps"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1059,7 +1059,7 @@ msgstr "Nombre de produits à manufacturer"
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "Emplacement où le système stoquera les produits finis."
+msgstr "Emplacement où le système stockera les produits finis."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
@@ -1084,7 +1084,7 @@ msgstr "Révisions"
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Product Efficiency"
-msgstr "Efficacité Produit"
+msgstr "Rendement produit"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_warehouse_orderpoint
@@ -1366,7 +1366,7 @@ msgstr "Document central pour l'approvisionnement en produits"
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_action3
 msgid "Production Orders in Progress"
-msgstr "Ordres de Production en Marche"
+msgstr "Ordres de production en cours"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_product_product_2_stock_warehouse_orderpoint
@@ -1670,8 +1670,8 @@ msgid ""
 "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
 "production."
 msgstr ""
-"Efficacité de la production. Un facteur de 0.9 signifie une perte de 10% de "
-"la production."
+"Rendement de la production. Un facteur de 0,9 traduit une perte de "
+"production de 10 %"
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1743,7 +1743,7 @@ msgstr "Propriété"
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr "Acheminement Parent"
+msgstr "Gamme parente"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -1774,11 +1774,10 @@ msgid ""
 "operations and to plan futur loads on workcenters based on production "
 "plannification."
 msgstr ""
-"La liste des opérations (liste des centre de production) pour produire le "
-"produit fini. Le routage est principalement utilisé pour calculer les coûts "
-"des centres de production pendant les opérations et pour planifier la charge "
-"future sur les centres de production basée sur la planification de la "
-"production."
+"La liste des opérations pour fabriquer le produit fini. La gammeest "
+"principalement utilisée pour calculer les coûts des postes de charges "
+"pendant les opérations et pour planifier la charge future sur les centres de "
+"production à partir de la planification de la production."
 
 #. module: mrp
 #: selection:mrp.production,state:0
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index a29496fa538..4a397ee638d 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-16 16:22+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 23:18+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 04:52+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -24,7 +24,7 @@ msgstr "Movimentos criados"
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "No. Of Cycles"
-msgstr ""
+msgstr "Nº de Ciclos"
 
 #. module: mrp
 #: help:mrp.procurement.compute.all,init,automatic:0
@@ -37,12 +37,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.module.module,shortdesc:mrp.module_meta_information
 msgid "Manufacturing Resource Planning"
-msgstr ""
+msgstr "Planeamento de recursos no fabrico"
 
 #. module: mrp
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da acção"
 
 #. module: mrp
 #: field:mrp.bom.revision,indice:0
@@ -53,13 +53,13 @@ msgstr "Revisão"
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
 msgid "Compute Stock Minimum Rules Only"
-msgstr ""
+msgstr "Calcular apenas regras de stock mínimo."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
 #: model:ir.ui.menu,name:mrp.menu_mrp_procurement_action5
 msgid "Exceptions Procurements"
-msgstr ""
+msgstr "Excepções no reaprovisionamento"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -69,7 +69,7 @@ msgstr "Roteamento do centro de trabalho"
 #. module: mrp
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Não utilizado em cálculos, apenas para informação."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -107,7 +107,7 @@ msgstr "Referência"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr ""
+msgstr "Produtos Acabados"
 
 #. module: mrp
 #: wizard_field:mrp.procurement.compute.all,init,automatic:0
@@ -130,6 +130,8 @@ msgstr "XML inválido para a arquitectura de vista"
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
 msgstr ""
+"Estes são os dias adicionados aos que prometeu aos clientes para fins de "
+"segurança"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -149,7 +151,7 @@ msgstr "Produto e localização"
 #. module: mrp
 #: view:res.company:0
 msgid "MRP & Logistic Scheduler"
-msgstr ""
+msgstr "Planificador Logístico e de Produção"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -161,12 +163,12 @@ msgstr ""
 #. module: mrp
 #: wizard_button:product.product.procurement,init,create:0
 msgid "Ask New Products"
-msgstr ""
+msgstr "Pedir novos produtos"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_reordering
 msgid "Automatic Procurements"
-msgstr ""
+msgstr "Aprovisionamentos automáticos"
 
 #. module: mrp
 #: wizard_field:change_production_qty,confirm,product_qty:0
@@ -199,12 +201,12 @@ msgstr "Excepção no empacotamento"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_orderrfq0
 msgid "A purchase order is created for a sub-contracting demand."
-msgstr ""
+msgstr "Uma ordem de compra é criada para a procura de subcontratação."
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Destination Location"
-msgstr ""
+msgstr "Local de destino"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -214,17 +216,18 @@ msgstr "Contabilidade analítica"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Do nothing"
-msgstr ""
+msgstr "Não fazer nada"
 
 #. module: mrp
 #: rml:mrp.production.order:0
 msgid "Partner Ref"
-msgstr ""
+msgstr "Ref. do Parceiro"
 
 #. module: mrp
 #: help:mrp.procurement.orderpoint.compute,init,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
+"Se o stock de um produto é inferior a 0, vai tornar-se um ponto de encomenda."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,init,measure_unit:0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index c3c70ccd61e..1dbf4f07009 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -53,7 +53,7 @@ class mrp_workcenter(osv.osv):
         '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."),
-        'time_efficiency': fields.float('Time Efficiency', help="Factor that multiplies all times expressed in the workcenter."),
+        'time_efficiency': fields.float('Time Efficiency', help="Factor to adjust the work center cycle and before and after production durations"),
 
         'costs_hour': fields.float('Cost per hour'),
         'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')],
@@ -128,7 +128,7 @@ class mrp_routing_workcenter(osv.osv):
         'cycle_nbr': fields.float('Number of Cycle', required=True,
             help="Time in hours for doing one cycle."),
         'hour_nbr': fields.float('Number of Hours', required=True, help="Cost per hour"),
-        'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True,
+        'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True, ondelete='cascade', 
              help="routing indicates all the workcenters used, for how long and/or cycles." \
                 "If Routing is indicated then,the third tab of a production order (workcenters) will be automatically pre-completed."),
         'note': fields.text('Description')
@@ -191,15 +191,15 @@ class mrp_bom(osv.osv):
         'product_qty': fields.float('Product Qty', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True, help="UoM (Unit of Measure) is the unit of measurement for the inventory control"),
         'product_rounding': fields.float('Product Rounding', help="Rounding applied on the product quantity. For integer only values, put 1.0"),
-        'product_efficiency': fields.float('Product Efficiency', required=True, help="Efficiency on the production. A factor of 0.9 means a loss of 10% in the production."),
+        'product_efficiency': fields.float('Product Efficiency', required=True, help="Material efficiency. A factor of 0.9 means a loss of 10% in the production."),
         '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 futur loads on workcenters based on production plannification."),
         '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'),
-        'revision_type': fields.selection([('numeric','numeric indices'),('alpha','alphabetical indices')], 'indice type'),
-        'child_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hyerarchy", type='many2many'),
-        'child_complete_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hyerarchy", type='many2many')
+        'revision_type': fields.selection([('numeric','numeric indices'),('alpha','alphabetical indices')], 'Index type'),
+        'child_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many'),
+        'child_complete_ids': fields.function(_child_compute,relation='mrp.bom', method=True, string="BoM Hierarchy", type='many2many')
     }
     _defaults = {
         'active': lambda *a: 1,
@@ -363,7 +363,7 @@ class mrp_production(osv.osv):
                 parent_move_line=get_parent_move(production['move_prod_id'][0])
                 if parent_move_line:
                     move = move_obj.browse(cr,uid,parent_move_line)
-                    #TODO: fix me sale module can not be used here, 
+                    #TODO: fix me sale module can not be used here,
                     #as may be mrp can be installed without sale module
                     if field_name=='name':
                         res[production['id']]=move.sale_line_id and move.sale_line_id.order_id.name or False
@@ -426,19 +426,18 @@ class mrp_production(osv.osv):
         '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 futur loads on workcenters based on production plannification."),
 
-        'picking_id': fields.many2one('stock.picking', 'Packing list', readonly=True,
-            help="This is the internal picking list take bring the raw materials to the production plan."),
+        'picking_id': fields.many2one('stock.picking', 'Picking list', readonly=True,
+            help="This is the internal picking list of the raw material needed for the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Move product', readonly=True),
         'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products Consummed'),
 
         'move_created_ids': fields.one2many('stock.move', 'production_id', 'Moves Created'),
         'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods'),
         'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Workcenters Utilisation'),
-
-        'state': fields.selection([('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
+        'state': fields.selection([('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Cancelled'),('done','Done')],'State', readonly=True,
                                     help='When the production order is created the state is set to \'Draft\'.\n If the order is confirmed the state is set to \'Waiting Goods\'.\n If any exceptions are there, the state is set to \'Packing Exception\'.\
                                     \nIf the stock is available then the state is set to \'Ready to Produce\'.\n When the production get started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
-        'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),    
+        'hour_total': fields.function(_production_calc, method=True, type='float', string='Total Hours', multi='workorder'),
         'cycle_total': fields.function(_production_calc, method=True, type='float', string='Total Cycles', multi='workorder'),
 
         'sale_name': fields.function(_sale_name_calc, method=True, type='char', string='Sale Name'),
@@ -784,11 +783,11 @@ mrp_production_product_line()
 class mrp_procurement(osv.osv):
     _name = "mrp.procurement"
     _description = "Procurement"
-    _order = 'priority,date_planned'    
+    _order = 'priority,date_planned'
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'origin': fields.char('Origin', size=64,
-            help="Reference of the document that created this procurement.\n"
+            help="Reference of the document that created this Requisition.\n"
             "This is automatically completed by Open ERP."),
         'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', required=True),
         'date_planned': fields.datetime('Scheduled date', required=True),
@@ -804,8 +803,8 @@ class mrp_procurement(osv.osv):
 
         'close_move': fields.boolean('Close Move at end', required=True),
         'location_id': fields.many2one('stock.location', 'Location', required=True),
-        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
-            readonly=True, required=True, help="If you encode manually a procurement, you probably want to use" \
+        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Requisition Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
+            readonly=True, required=True, help="If you encode manually a Requisition, you probably want to use" \
             " a make to order method."),
 
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
@@ -842,7 +841,7 @@ class mrp_procurement(osv.osv):
             if s['state'] in ['draft','cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Procurement Order(s) which are in %s State!' % s['state']))
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete Requisition Order(s) which are in %s State!' % s['state']))
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
     def onchange_product_id(self, cr, uid, ids, product_id, context={}):
@@ -985,7 +984,7 @@ class mrp_procurement(osv.osv):
     def action_confirm(self, cr, uid, ids, context={}):
         for procurement in self.browse(cr, uid, ids):
             if procurement.product_qty <= 0.00:
-                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Procurement Order(s), it should not be less than 1!'))
+                raise osv.except_osv(_('Data Insufficient !'), _('Please check the Quantity of Requisition Order(s), it should not be less than 1!'))
             if procurement.product_id.type in ('product', 'consu'):
                 if not procurement.move_id:
                     source = procurement.location_id.id
@@ -1186,12 +1185,12 @@ class stock_warehouse_orderpoint(osv.osv):
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True ),
         'product_min_qty': fields.float('Min Quantity', required=True,
             help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a procurement to bring the virtual stock to the Max Quantity."),
+            "a requisition to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
             help="When the virtual stock goes belong the Min Quantity, Open ERP generates "\
-            "a procurement to bring the virtual stock to the Max Quantity."),
+            "a requisition to bring the virtual stock to the Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The procurement quantity will by rounded up to this multiple."),
+            help="The requisition quantity will by rounded up to this multiple."),
         'procurement_id': fields.many2one('mrp.procurement', 'Purchase Order')
     }
     _defaults = {
@@ -1226,7 +1225,7 @@ stock_warehouse_orderpoint()
 class StockMove(osv.osv):
     _inherit = 'stock.move'
     _columns = {
-        'procurements': fields.one2many('mrp.procurement', 'move_id', 'Procurements'),
+        'procurements': fields.one2many('mrp.procurement', 'move_id', 'Requisitions'),
     }
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 7434045ca97..c415a12d7c3 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -4,7 +4,7 @@
 
         <menuitem icon="terp-mrp" id="menu_mrp_root" name="Manufacturing"
             groups="group_mrp_user,group_mrp_manager"/>
-        <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/>
+        <menuitem id="menu_mrp_reordering" name="Automatic Requisitions" parent="stock.menu_stock_root" sequence="4"/>
 
         <!--
         Property / Property Group
@@ -666,7 +666,7 @@
         </record>
 
         <!--
-    Procurement
+    	Requisition
     -->
 
         <record id="mrp_procurement_tree_view" model="ir.ui.view">
@@ -674,7 +674,7 @@
             <field name="model">mrp.procurement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Procurement Lines">
+                <tree string="Requisition Lines">
                     <field name="name"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
@@ -692,10 +692,10 @@
             <field name="model">mrp.procurement</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Procurement">
+                <form string="Requisition">
                     <group col="2" colspan="2">
                         <separator colspan="2" string="References"/>
-                        <field name="name" select="1" string="Procurement Reason"/>
+                        <field name="name" select="1" string="Requisition Reason"/>
                         <field name="origin" select="2"/>
                     </group>
                     <group col="2" colspan="2">
@@ -705,7 +705,7 @@
                         <field name="priority" groups="base.group_extended"/>
                     </group>
                     <notebook colspan="4">
-                    <page string="Procurement Details">
+                    <page string="Requisition Details">
                         <separator colspan="4" string="Product &amp; Location"/>
                         <field name="product_id" select="1" on_change="onchange_product_id(product_id)"/>
                         <field name="location_id" select="2"/>
@@ -722,7 +722,7 @@
                             <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
                             <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
                             <button name="button_cancel" states="exception,waiting" string="Cancel" icon="gtk-cancel"/>
-                            <button name="button_check" states="confirmed" string="Run procurement" icon="gtk-media-play"/>
+                            <button name="button_check" states="confirmed" string="Run 	Requisition" icon="gtk-media-play"/>
                             <button name="button_cancel" states="draft,running" string="Cancel" icon="gtk-cancel"/>
                         </group>
                     </page>
@@ -749,9 +749,9 @@
             <field name="model">mrp.procurement</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Procurement">
+                <search string="Search Requisition">
                        <group col='8' colspan='4'>
-                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Procurement orders with exceptions"/>
+                       <filter icon="terp-mrp" string="Exceptions" domain="[('state','=','exception')]" help="Requisition orders with exceptions"/>
                        <separator orientation="vertical"/>
                        <field name="name" select='1'/>
                        <field name="product_id" select='1'/>
@@ -762,7 +762,7 @@
             </field>
         </record>
         <record id="mrp_procurement_action" model="ir.actions.act_window">
-            <field name="name">Procurement Orders</field>
+            <field name="name">Requisition Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -773,7 +773,7 @@
                   sequence="-40" />
 
         <record id="mrp_procurement_action3" model="ir.actions.act_window">
-            <field name="name">Unscheduled procurements</field>
+            <field name="name">Unscheduled Requisitions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -782,7 +782,7 @@
         </record>
 
         <record id="mrp_procurement_action5" model="ir.actions.act_window">
-            <field name="name">Exceptions Procurements</field>
+            <field name="name">Requisition Exceptions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -791,7 +791,7 @@
         </record>
 
         <record id="mrp_procurement_action4" model="ir.actions.act_window">
-            <field name="name">Exceptions Procurements to Fix</field>
+            <field name="name">Requisition Exceptions to Fix</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -801,7 +801,7 @@
         </record>
 
         <record id="mrp_procurement_action11" model="ir.actions.act_window">
-            <field name="name">Temporary Procurement Exceptions</field>
+            <field name="name">Temporary Requisition Exceptions</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
@@ -810,7 +810,7 @@
         </record>
 
          <record id="mrp_procurement_new" model="ir.actions.act_window">
-            <field name="name">New Procurement</field>
+            <field name="name">New Requisition</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.procurement</field>
             <field name="view_type">form</field>
diff --git a/addons/mrp/mrp_wizard.xml b/addons/mrp/mrp_wizard.xml
index d4db5c2de61..06c9f7aae3a 100644
--- a/addons/mrp/mrp_wizard.xml
+++ b/addons/mrp/mrp_wizard.xml
@@ -3,8 +3,7 @@
     <data>
         <wizard id="wiz_mrp_proc0" model="mrp.procurement" string="Compute All Schedulers" name="mrp.procurement.compute.all"/>
         <menuitem action="wiz_mrp_proc0" id="mrp_Sched_all" parent="mrp.menu_mrp_root" type="wizard" sequence="-49"/>
-
-        <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute Procurements Only" name="mrp.procurement.compute"/>
+        <wizard id="wiz_mrp_proc1" model="mrp.procurement" string="Compute 	Requisitions Only" name="mrp.procurement.compute"/>
         <menuitem action="wiz_mrp_proc1" id="menu_wiz_mrp_proc1" parent="mrp.mrp_Sched_all" type="wizard"/>
 
         <wizard id="wiz_mrp_proc2" model="mrp.procurement" string="Compute Stock Minimum Rules Only" name="mrp.procurement.orderpoint.compute"/>
@@ -22,7 +21,7 @@
         </record>
 
     <wizard
-        string="Procurement Request"
+        string="Requisition Request"
         model="product.product"
         name="product.product.procurement"
         keyword="client_action_multi"
diff --git a/addons/mrp/mrp_workflow.xml b/addons/mrp/mrp_workflow.xml
index 69c7840ceaf..c9358a2f194 100644
--- a/addons/mrp/mrp_workflow.xml
+++ b/addons/mrp/mrp_workflow.xml
@@ -2,13 +2,13 @@
 <openerp>
     <data>
         <!-- Production -->
-        
+
         <record id="wkf_prod" model="workflow">
             <field name="name">mrp.production.basic</field>
             <field name="osv">mrp.production</field>
             <field name="on_create">True</field>
         </record>
-        
+
         <record id="prod_act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf_prod"/>
             <field name="flow_start">True</field>
@@ -53,7 +53,7 @@
             <field name="kind">function</field>
             <field name="action">action_cancel()</field>
         </record>
-        
+
         <record id="prod_trans_draft_ready" model="workflow.transition">
             <field name="act_from" ref="prod_act_draft"/>
             <field name="act_to" ref="prod_act_ready"/>
@@ -112,15 +112,15 @@
             <field name="act_to" ref="prod_act_cancel"/>
             <field name="signal">button_cancel</field>
         </record>
-        
+
         <!-- Procurement -->
-        
+
         <record id="wkf" model="workflow">
             <field name="name">mrp.procurement.basic</field>
             <field name="osv">mrp.procurement</field>
             <field name="on_create">True</field>
         </record>
-        
+
         <record id="act_draft" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="flow_start">True</field>
@@ -203,7 +203,7 @@
             <field name="kind">function</field>
             <field name="action">action_done()</field>
         </record>
-        
+
         <record id="trans_draft_confirm" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_confirm"/>
@@ -322,13 +322,13 @@
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">subflow.cancel</field>
         </record>
-        
+
         <record id="trans_produce_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce"/>
             <field name="act_to" ref="act_make_done"/>
             <field name="signal">subflow.done</field>
         </record>
-        
+
         <record id="trans_produce_service_make_done" model="workflow.transition">
             <field name="act_from" ref="act_produce_service"/>
             <field name="act_to" ref="act_make_done"/>
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml
index 86f7f9ee3ee..ccd353357d7 100755
--- a/addons/mrp/process/procurement_process.xml
+++ b/addons/mrp/process/procurement_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
 			Process
 		-->
-	
+
 		<record id="process_process_procurementprocess0" model="process.process">
-			<field eval="&quot;&quot;&quot;Procurement&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Requisition&quot;&quot;&quot;" name="name"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="1" name="active"/>
 		</record>
-		
+
 		<!--
 			Process Node
 		-->
-		
+
 		<record id="process_node_stockproduct1" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -27,7 +27,7 @@
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="1" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_serviceproduct1" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -39,18 +39,18 @@
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="1" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_productionorder0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;Drives the procurement orders for raw material.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Drives the requisition orders for raw material.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Production Order&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_procurementprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'picking_except', 'confirmed', 'ready', 'in_production', 'cancel', 'done')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="1" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_minimumstockrule0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
 			<field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
@@ -60,18 +60,18 @@
 			<field name="process_id" ref="process_process_procurementprocess0"/>
 			<field eval="1" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_procureproducts0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-			<field eval="&quot;&quot;&quot;The way to procure depends on the product type.&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;The way to requisition depends on the product type.&quot;&quot;&quot;" name="note"/>
 			<field eval="&quot;&quot;&quot;Procure Products&quot;&quot;&quot;" name="name"/>
 			<field name="process_id" ref="process_process_procurementprocess0"/>
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_stockproduct0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -83,7 +83,7 @@
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_serviceproduct0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -95,7 +95,7 @@
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_purchaseprocure0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -106,7 +106,7 @@
             <field name="process_id" ref="purchase.process_process_purchaseprocess0"/>
             <field eval="1" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_productminimumstockrule0" model="process.node">
             <field name="menu_id" ref="mrp.menu_action_orderpoint_form"/>
             <field name="model_id" ref="mrp.model_stock_warehouse_orderpoint"/>
@@ -116,7 +116,7 @@
             <field name="process_id" ref="product.process_process_productprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_routing0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_routing_action"/>
             <field name="model_id" ref="mrp.model_mrp_routing"/>
@@ -126,7 +126,7 @@
             <field name="process_id" ref="product.process_process_productprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
+
         <record id="process_node_billofmaterial0" model="process.node">
             <field name="menu_id" ref="mrp.menu_mrp_bom_form_action"/>
             <field name="model_id" ref="mrp.model_mrp_bom"/>
@@ -136,11 +136,11 @@
             <field name="process_id" ref="product.process_process_productprocess0"/>
             <field eval="0" name="flow_start"/>
         </record>
-		
+
 		<!--
 			Process Transition
 		-->
-		
+
 		<record id="process_transition_servicemto0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -149,7 +149,7 @@
 			<field model="process.node" name="target_node_id" ref="mrp.process_node_serviceonorder0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
 		</record>
-	
+
 		<record id="process_transition_servicemts0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -158,7 +158,7 @@
 			<field model="process.node" name="target_node_id" ref="mrp.process_node_servicemts0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_serviceproduct1"/>
 		</record>
-		
+
 		<record id="process_transition_stockmts0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -167,7 +167,7 @@
 			<field model="process.node" name="target_node_id" ref="mrp.process_node_mts0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_stockproduct1"/>
 		</record>
-	
+
 		<record id="process_transition_stockproduct0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -180,12 +180,12 @@
 		<record id="process_transition_productionprocureproducts0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Procurement of raw material&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Requisition of raw material&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;In order to supply raw material (to be purchased or produced), the production order creates as much requisition orders as components listed in the BOM, through a run of the schedulers (MRP).&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_productionorder0"/>
 		</record>
-	
+
 		<record id="process_transition_minimumstockprocure0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -194,7 +194,7 @@
 			<field model="process.node" name="target_node_id" ref="process_node_procureproducts0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_minimumstockrule0"/>
 		</record>
-	
+
 		<record id="process_transition_procurestockableproduct0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -203,16 +203,16 @@
 			<field model="process.node" name="target_node_id" ref="process_node_stockproduct0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
 		</record>
-	
+
 		<record id="process_transition_procureserviceproduct0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
-			<field eval="&quot;&quot;&quot;Procurement of services&quot;&quot;&quot;" name="name"/>
-			<field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the procurement order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
+			<field eval="&quot;&quot;&quot;Requisition of services&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Depending on the chosen method to 'supply' the service, the requisition order creates a RFQ for a subcontracting purchase order or waits until the service is done (= the delivery of the products).&quot;&quot;&quot;" name="note"/>
 			<field model="process.node" name="target_node_id" ref="process_node_serviceproduct0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_procureproducts0"/>
 		</record>
-	
+
 		<record id="process_transition_purchaseprocure0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -221,7 +221,7 @@
             <field model="process.node" name="target_node_id" ref="purchase.process_node_draftpurchaseorder0"/>
             <field model="process.node" name="source_node_id" ref="process_node_purchaseprocure0"/>
         </record>
-        
+
          <record id="process_transition_producttostockrules0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -230,7 +230,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_productminimumstockrule0"/>
             <field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
         </record>
-        
+
         <record id="process_transition_billofmaterialrouting0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -239,7 +239,7 @@
             <field model="process.node" name="target_node_id" ref="process_node_routing0"/>
             <field model="process.node" name="source_node_id" ref="process_node_billofmaterial0"/>
         </record>
-		
+
 		<record id="process_transition_bom0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -248,6 +248,6 @@
             <field model="process.node" name="target_node_id" ref="process_node_billofmaterial0"/>
             <field model="process.node" name="source_node_id" ref="product.process_node_product0"/>
         </record>
-		
+
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml
index 89bffdaa230..60bf3b562b9 100644
--- a/addons/mrp/process/service_product_process.xml
+++ b/addons/mrp/process/service_product_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
 			Process
 		-->
-	
+
 		<record id="process_process_serviceproductprocess0" model="process.process">
-			<field eval="&quot;&quot;&quot;Service Product&quot;&quot;&quot;" name="name"/>
+			<field eval="&quot;&quot;&quot;Service&quot;&quot;&quot;" name="name"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="1" name="active"/>
 		</record>
-		
+
 		<!--
 			Process Node
 		-->
-		
+
 		<record id="process_node_serviceonorder0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -26,7 +26,7 @@
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_servicemts0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -37,7 +37,7 @@
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_orderrfq0" model="process.node">
 			<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
 			<field name="model_id" ref="purchase.model_purchase_order"/>
@@ -49,11 +49,11 @@
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<!--
 			Process Transition
 		-->
-		
+
 		<record id="process_transition_servicerfq0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -62,6 +62,6 @@
 			<field model="process.node" name="target_node_id" ref="process_node_orderrfq0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_serviceonorder0"/>
 		</record>
-		
+
 	</data>
 </openerp>
\ No newline at end of file
diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml
index 846815ac677..c053103f476 100644
--- a/addons/mrp/process/stockable_product_process.xml
+++ b/addons/mrp/process/stockable_product_process.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" ?>
 <openerp>
 	<data>
-	
+
 		<!--
 			Process
 		-->
-	
+
 		<record id="process_process_stockableproductprocess0" model="process.process">
 			<field eval="&quot;&quot;&quot;Stockable Product&quot;&quot;&quot;" name="name"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
 			<field eval="1" name="active"/>
 		</record>
-		
+
 		<!--
 			Process Node
 		-->
-		
+
 		<record id="process_node_mts0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -26,7 +26,7 @@
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_stock0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
 			<field name="model_id" ref="mrp.model_mrp_procurement"/>
@@ -37,7 +37,7 @@
 			<field eval="&quot;&quot;&quot;object.state in ('draft', 'confirmed', 'cancel', 'exception', 'running', 'done', 'waiting')&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<record id="process_node_rfq0" model="process.node">
 			<field name="menu_id" ref="purchase.menu_purchase_form_action"/>
 			<field name="model_id" ref="purchase.model_purchase_order"/>
@@ -49,7 +49,7 @@
 			<field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-	
+
 		<record id="process_node_production0" model="process.node">
 			<field name="menu_id" ref="mrp.menu_mrp_production_action"/>
 			<field name="model_id" ref="mrp.model_mrp_production"/>
@@ -60,11 +60,11 @@
 			<field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
 			<field eval="0" name="flow_start"/>
 		</record>
-		
+
 		<!--
 			Process Transition
 		-->
-		
+
 		<record id="process_transition_stockrfq0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -73,7 +73,7 @@
 			<field model="process.node" name="target_node_id" ref="process_node_rfq0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
 		</record>
-	
+
 		<record id="process_transition_stockproduction0" model="process.transition">
 			<field eval="[(6,0,[])]" name="role_ids"/>
 			<field eval="[(6,0,[])]" name="transition_ids"/>
@@ -82,6 +82,6 @@
 			<field model="process.node" name="target_node_id" ref="process_node_production0"/>
 			<field model="process.node" name="source_node_id" ref="process_node_stock0"/>
 		</record>
-	
+
 	</data>
 </openerp>
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 709733b6013..9d372bf29e3 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@ from tools.translate import _
 class report_custom(report_rml):
     def create_xml(self, cr, uid, ids, datas, context={}):
         number = (datas.get('form', False) and datas['form']['number']) or 1
-        
+
         def process_bom(bom, currency_id):
             xml = '<row>'
             sum = 0
@@ -40,7 +40,7 @@ class report_custom(report_rml):
 
             prod_name = bom['name']
             prod_qtty = bom['product_qty']
-            prod_uom = prod.uom_id.name 
+            prod_uom = prod.uom_id.name
             level = 1
             main_sp_price = ''
             main_sp_name = ''
@@ -136,7 +136,7 @@ class report_custom(report_rml):
                     <col>%s</col>
                 </row>
             </lines>
-        """ % (_('Workcenter name'), _('Cycles Cost'), _('Hours Cost'))
+        """ % (_('Workcenter name'), _('Cycles Cost'), _('Total hourly costs'))
         prod_header = """
             <lines style='header'>
                 <row>
diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index 96669754b4a..2f62c94587a 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -115,7 +115,7 @@ class mrp_procurement(osv.osv):
     '''% (start_date, end_date, report_total, report_except, report_later)
             summary += '\n'.join(report)
             request.create(cr, uid,
-                {'name': "Procurement calculation report.",
+                {'name': "Requisition calculation report.",
                     'act_from': uid,
                     'act_to': uid,
                     'body': summary,
diff --git a/addons/mrp/wizard/make_procurement.py b/addons/mrp/wizard/make_procurement.py
index a2633f7ed6d..423ac4bd65c 100644
--- a/addons/mrp/wizard/make_procurement.py
+++ b/addons/mrp/wizard/make_procurement.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -53,12 +53,12 @@ class MakeProcurement(wizard.interface):
     '''Wizard that create a procurement from a product form'''
 
     done_form = """<?xml version="1.0"?>
-<form string="Make Procurement">
+<form string="Make Requisition">
     <label string="Your procurement request has been sent !"/>
 </form>"""
     procurement_form = """<?xml version="1.0"?>
-<form string="Internal Procurement Request">
-    <label string="This wizard will planify the procurement for this product. This procurement may generate task, production orders or purchase orders." align="0.0" colspan="4"/>
+<form string="Internal Requisition Request">
+    <label string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders." align="0.0" colspan="4"/>
     <field name="product_id"/>
     <field name="warehouse_id"/>
     <field name="qty"/>
diff --git a/addons/mrp/wizard/wizard_orderpoint_procurement.py b/addons/mrp/wizard/wizard_orderpoint_procurement.py
index 63490e561c6..3a1cc1e326d 100644
--- a/addons/mrp/wizard/wizard_orderpoint_procurement.py
+++ b/addons/mrp/wizard/wizard_orderpoint_procurement.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -58,7 +58,7 @@ class procurement_compute(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Procurements')]}
+            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Requisitions')]}
         },
         'compute': {
             'actions': [_procure_calculation],
diff --git a/addons/mrp/wizard/wizard_procurement.py b/addons/mrp/wizard/wizard_procurement.py
index 5964b9e65a3..0bd09ace396 100644
--- a/addons/mrp/wizard/wizard_procurement.py
+++ b/addons/mrp/wizard/wizard_procurement.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -50,7 +50,7 @@ class procurement_compute(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Procurements') ]}
+            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Requisitions') ]}
         },
         'compute': {
             'actions': [_procure_calculation],
diff --git a/addons/mrp/wizard/wizard_schedulers_all.py b/addons/mrp/wizard/wizard_schedulers_all.py
index 58c481c972e..c9363dd19b8 100644
--- a/addons/mrp/wizard/wizard_schedulers_all.py
+++ b/addons/mrp/wizard/wizard_schedulers_all.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -51,7 +51,7 @@ class procurement_compute(wizard.interface):
     states = {
         'init': {
             'actions': [],
-            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Procurements') ]}
+            'result': {'type': 'form', 'arch':parameter_form, 'fields': parameter_fields, 'state':[('end','Cancel'),('compute','Compute Requisitions') ]}
         },
         'compute': {
             'actions': [_procure_calculation],
diff --git a/addons/mrp_jit/mrp_jit.xml b/addons/mrp_jit/mrp_jit.xml
index 9db4c930930..14821c63e63 100644
--- a/addons/mrp_jit/mrp_jit.xml
+++ b/addons/mrp_jit/mrp_jit.xml
@@ -3,7 +3,7 @@
 <data>
 
 	# -----------------------------------------------------------
-	# Procurement - Automatic schedule
+	# 	Requisition - Automatic schedule
 	# -----------------------------------------------------------
 
 		<record model="workflow.transition" id="mrp.trans_confirm_confirm_wait">
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index e446f4a5014..f670aaecaa9 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -77,7 +77,7 @@ class mrp_production_workcenter_line(osv.osv):
        'delay': fields.float('Working Hours',help="This is delay between operation start and stop in this workcenter",readonly=True),
        'production_state':fields.related('production_id','state',
             type='selection',
-            selection=[('draft','Draft'),('picking_except', 'Packing Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],
+            selection=[('draft','Draft'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','In Production'),('cancel','Canceled'),('done','Done')],
             string='Prod.State', readonly=True),
        'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product',
             readonly=True),
@@ -230,9 +230,9 @@ class mrp_production(osv.osv):
                     if l.production_id.state not in ('done','cancel'):
                         for wc in l.production_id.workcenter_lines:
                             i = self.pool.get('hr.timesheet.group').interval_min_get(
-                                cr, 
-                                uid, 
-                                wc.workcenter_id.timesheet_id.id or False, 
+                                cr,
+                                uid,
+                                wc.workcenter_id.timesheet_id.id or False,
                                 dt, wc.hour or 0.0
                             )
                             dt = i[0][0]
@@ -328,8 +328,8 @@ class mrp_operations_operation(osv.osv):
                 if not i: continue
                 if code_lst[i-1] not in ('resume','start'):
                    continue
-                a = datetime.datetime.strptime(time_lst[i-1],'%Y:%m:%d %H:%M:%S')
-                b = datetime.datetime.strptime(time_lst[i],'%Y:%m:%d %H:%M:%S')
+                a = datetime.datetime.strptime(time_lst[i-1],'%Y-%m-%d %H:%M:%S')
+                b = datetime.datetime.strptime(time_lst[i],'%Y-%m-%d %H:%M:%S')
                 diff += (b-a).days * 24
                 diff += (b-a).seconds / (60*60)
         return diff
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 93f671baeaa..fca6bc76232 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -102,11 +102,11 @@ class mrp_repair(osv.osv):
            ], "Invoice Method",
             select=True, required=True, states={'draft':[('readonly',False)]}, readonly=True, help='This field allow you to change the workflow of the repair order. If value selected is different from \'No Invoice\', it also allow you to select the pricelist and invoicing address.'),
         'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
-        'picking_id': fields.many2one('stock.picking', 'Packing',readonly=True),
+        'picking_id': fields.many2one('stock.picking', 'Picking',readonly=True),
         'fees_lines' : fields.one2many('mrp.repair.fee', 'repair_id', 'Fees Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'internal_notes' : fields.text('Internal Notes'),
         'quotation_notes' : fields.text('Quotation Notes'),
-        'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired. If cheked, it will create a packing with selected product. Note that you can select the locations in the Info tab, if you have the extended view."),
+        'deliver_bool': fields.boolean('Deliver', help="Check this box if you want to manage the delivery once the product is repaired. If cheked, it will create a picking with selected product. Note that you can select the locations in the Info tab, if you have the extended view."),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'repaired' : fields.boolean('Repaired', readonly=True),
         'amount_untaxed': fields.function(_amount_untaxed, method=True, string='Untaxed Amount'),
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 984d47bb61e..6dd8df26924 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -92,7 +92,7 @@
     <para style="terp_default_8">[[ setLang(o.user_id.context_lang) ]]</para>
     <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
     <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
-    <para style="terp_default_Centre_9">Tel : + 32 (0) 2 231 04 35</para>
+    <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
     <para style="terp_default_Centre_9">Fax : [[ address and address.fax ]]</para>
     <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
     <para style="terp_default_Centre_9">
@@ -158,18 +158,17 @@
               </td>
             </tr>
           </blockTable>
-    <blockTable colWidths="105.0,78.0" style="Table_Amount">
-      <tr>
-        <td>
-          <para style="terp_default_2">[[ repeatIn(o.payments,'d') ]]</para>
-          <para style="terp_default_Bold_9_Right1">[[ d.journal_id.name ]]:</para>
-          </td>
-        <td>
-          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
-        </td>
-      </tr>
-	</blockTable>
-
+	<blockTable colWidths="105.0,78.0" style="Table_Amount">
+	      <tr>
+	        <td>
+	          <para style="terp_default_2">[[ repeatIn(o.payments,'d') or removeParentNode('blockTable') ]]</para>
+	          <para style="terp_default_Bold_9_Right1">[[ d.journal_id.name ]]:</para>
+	        </td>
+	        <td>
+	          <para style="terp_default_Bold_9_Right2">[[ d.amount ]]</para>
+	        </td>
+	      </tr>
+		</blockTable>
           <para style="terp_default_2">
             <font color="white"> </font>
           </para>
diff --git a/addons/process/process_demo.xml b/addons/process/process_demo.xml
index 05251e6fd22..41a4588fc0f 100644
--- a/addons/process/process_demo.xml
+++ b/addons/process/process_demo.xml
@@ -52,7 +52,7 @@
         </record>
 
         <record id="node_packing" model="process.node">
-            <field name="name">Packing List</field>
+            <field name="name">Picking List</field>
             <field name="note">The workers pack the requested items</field>
             <field name="model_id" model="ir.model" search="[('name', '=', 'Packing list')]"></field>
             <field name="menu_id" model="ir.ui.menu" search="[('name', '=', 'Packing to Process')]"></field>
@@ -69,7 +69,7 @@
             <field name="kind">state</field>
             <field name="model_states"></field>
             <field name="process_id" ref="sales_workflow"/>
-        </record>  
+        </record>
 
         <record id="node_invoice_on_delivery" model="process.node">
             <field name="name">Invoice</field>
@@ -79,7 +79,7 @@
             <field name="kind">subflow</field>
             <field name="model_states"></field>
             <field name="process_id" ref="sales_workflow"/>
-        </record>  
+        </record>
 
         <!-- Node conditions (Gray nodes) -->
 
@@ -106,7 +106,7 @@
         </record>
 
         <record id="transition_packing" model="process.transition">
-            <field name="name">Packing</field>
+            <field name="name">Picking</field>
             <field name="source_node_id" ref="node_sale_order"></field>
             <field name="target_node_id" ref="node_packing"></field>
         </record>
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index aa48e07160c..4c3f0bc10c9 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 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 19:12+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 04:20+0000\n"
+"Last-Translator: Jeroen Vet <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: 2009-11-17 05:08+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -690,6 +690,8 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
+"当复制版本时复本会被设定为未激活的。这样复本和原版的日期不会重叠。\"\r\n"
+"\"您应该改日期并激活价格表。"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
diff --git a/addons/product/product.py b/addons/product/product.py
index 9a1ac0cc3b3..e4d65a5b146 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -272,11 +272,11 @@ class product_template(osv.osv):
         'description': fields.text('Description',translate=True),
         'description_purchase': fields.text('Purchase Description',translate=True),
         'description_sale': fields.text('Sale Description',translate=True),
-        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumables are stockable products with infinite stock, or for use when you have no stock management in the system."),
+        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way requisitions are processed. Consumables are stockable products with infinite stock, or for use when you have no stock management in the system."),
         'supply_method': fields.selection([('produce','Produce'),('buy','Buy')], 'Supply method', required=True, help="Produce will generate production order or tasks, according to the product type. Purchase will trigger purchase orders when requested."),
         'sale_delay': fields.float('Customer Lead Time', help="This is the average time between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
         'produce_delay': fields.float('Manufacturing Lead Time', help="Average time to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different delays will be summed for all levels and purchase orders."),
-        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procure Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
+        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Requisition Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the requisition request."),
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Category', required=True, change_default=True),
         'list_price': fields.float('Sale Price', digits=(16, int(config['price_accuracy'])), help="Base price for computing the customer price. Sometimes called the catalog price."),
@@ -499,8 +499,8 @@ class product_product(osv.osv):
         product = self.browse(cr, uid, [product_id], context)[0]
         for supinfo in product.seller_ids:
             if supinfo.name.id == partner_id:
-                return {'code': supinfo.product_code, 'name': supinfo.product_name, 'variants': ''}                
-        return {'code' : product.default_code, 'name' : product.name, 'variants': product.variants}                
+                return {'code': supinfo.product_code, 'name': supinfo.product_name, 'variants': ''}
+        return {'code' : product.default_code, 'name' : product.name, 'variants': product.variants}
 
     def _product_code(self, cr, uid, ids, name, arg, context={}):
         res = {}
@@ -513,7 +513,7 @@ class product_product(osv.osv):
         for p in self.browse(cr, uid, ids, context):
             data = self._get_partner_code_name(cr, uid, [], p.id, context.get('partner_id', None), context)
             if not data['variants']:
-                data['variants'] = p.variants            
+                data['variants'] = p.variants
             if not data['code']:
                 data['code'] = p.code
             if not data['name']:
@@ -546,10 +546,10 @@ class product_product(osv.osv):
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True),
         'ean13': fields.char('EAN13', size=13),
-        'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the packing order and is mainly used if you use the EDI module."),
+        'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits=(16, int(config['price_accuracy']))),
         'price_margin': fields.float('Variant Price Margin', digits=(16, int(config['price_accuracy']))),
-        'pricelist_id': fields.dummy(string='Pricelist',relation='product.pricelist', type='many2one'),        
+        'pricelist_id': fields.dummy(string='Pricelist',relation='product.pricelist', type='many2one'),
     }
 
     def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
@@ -647,7 +647,7 @@ class product_product(osv.osv):
             default = {}
         default = default.copy()
         default['name'] = product['name'] + _(' (copy)')
-        
+
         if context.get('variant',False):
             fields = ['product_tmpl_id', 'active', 'variants', 'default_code',
                     'price_margin', 'price_extra']
@@ -692,7 +692,7 @@ class product_packaging(osv.osv):
     }
 
     _order = 'sequence'
-    
+
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
             return []
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 60995fde34a..30499aab977 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -79,7 +79,7 @@
                     <notebook colspan="4">
                         <page string="Information">
                             <group colspan="2" col="2">
-                                <separator string="Procurement" colspan="2"/>
+                                <separator string="	Requisition" colspan="2"/>
                                 <field name="type" select="2"/>
                                 <field name="procure_method"/>
                                 <field name="supply_method"/>
@@ -113,7 +113,7 @@
                             </group>
 
                         </page>
-                        <page string="Procurement &amp; Locations">
+                        <page string="Requisition &amp; Locations">
                             <group colspan="2" col="2" name="delay">
                                 <separator string="Delays" colspan="2"/>
                                 <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@@ -510,7 +510,7 @@
                     <notebook colspan="4">
                         <page string="Information">
                             <group colspan="2" col="2">
-                                <separator string="Procurement" colspan="2"/>
+                                <separator string="Requisition" colspan="2"/>
                                 <field name="type" select="2"/>
                                 <field name="procure_method"/>
                                 <field name="supply_method"/>
@@ -544,7 +544,7 @@
                             </group>
 
                         </page>
-                        <page string="Procurement &amp; Locations">
+                        <page string="Requisition &amp; Locations">
                             <group colspan="2" col="2" name="delay">
                                 <separator string="Delays" colspan="2"/>
                                 <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
@@ -607,7 +607,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="company_wise_cost_price_tree_view" model="ir.ui.view">
             <field name="name">company.wise.cost.price.tree</field>
             <field name="model">company.wise.cost.price</field>
@@ -620,7 +620,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="company_wise_sale_price_form_view" model="ir.ui.view">
             <field name="name">company.wise.sale.price.form</field>
             <field name="model">company.wise.sale.price</field>
@@ -633,7 +633,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="company_wise_sale_price_tree_view" model="ir.ui.view">
             <field name="name">company.wise.sale.price.tree</field>
             <field name="model">company.wise.sale.price</field>
@@ -646,6 +646,6 @@
                 </tree>
             </field>
         </record>
-       
+
     </data>
 </openerp>
diff --git a/addons/profile_manufacturing/profile_manufacturing.py b/addons/profile_manufacturing/profile_manufacturing.py
index acb76f85d44..8876b59fd9a 100644
--- a/addons/profile_manufacturing/profile_manufacturing.py
+++ b/addons/profile_manufacturing/profile_manufacturing.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -30,7 +30,7 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
             help="The JIT module allows you to not run the scheduler "\
                 "periodically. It's easier and faster for real time "\
                 "stock computation but, in counter-part, it manages less "\
-                "efficiently priorities in procurements."
+                "efficiently priorities in requisitions."
         ),
         'sale_margin':fields.boolean('Margins on Sales Order',
             help="Display margins on the sale order form."),
@@ -46,7 +46,7 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
             ),
         'mrp_operation': fields.boolean('Manufacturing Operations',
             help="This module allows you to not only manage by production order "\
-            "but also by work order/operation. You will be able to planify, "\
+            "but also by work order/operation. You will be able to plan, "\
             "analyse the cost, check times, ... on all operations of each "\
             "manufacturing order"),
         'stock_location': fields.boolean('Advanced Locations',
@@ -70,9 +70,9 @@ class profile_manufacturing_config_install_modules_wizard(osv.osv_memory):
             help="This module allows you to add sub poducts in mrp bom."),
          'warning': fields.boolean('Warning',
             help="Able you to set warnings on products and partners."),
-        'board_document':fields.boolean('Document Management', 
+        'board_document':fields.boolean('Document Management',
             help= "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."),
-        'mrp_repair': fields.boolean('Repair', 
+        'mrp_repair': fields.boolean('Repair',
             help="Allow to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."),
 
     }
diff --git a/addons/project/project.py b/addons/project/project.py
index edd03ee68e3..43572ecae7d 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -326,9 +326,14 @@ class task(osv.osv):
     # Override view according to the company definition
     #
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
-        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
-        if not tm:
+        tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode or False
+        f = self.pool.get('res.company').fields_get(cr, uid, ['project_time_mode'], context)
+        word = 'Hours'
+        if tm:
+            word = dict(f['project_time_mode']['selection'])[tm]
+
+        res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
+        if (not tm) or (tm=='hours'):
             return res
         tm = tm.name
         f = self.pool.get('res.company').fields_get(cr, uid, ['project_time_mode_id'], context)        
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index 7c7a0bfed96..b087883618f 100755
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    
-    <!--    
+
+    <!--
         Process Node
     -->
-    
+
     	<record id="process_node_procuretasktask0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
@@ -17,7 +17,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_saleordertask0" model="process.node">
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
@@ -29,7 +29,7 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="1" name="flow_start"/>
         </record>
-    
+
         <record id="process_node_mrptask0" model="process.node">
             <field name="menu_id" ref="project.menu_action_view_task"/>
             <field name="model_id" ref="project.model_project_task"/>
@@ -41,19 +41,19 @@
             <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
             <field eval="0" name="flow_start"/>
         </record>
-        
-    <!--    
+
+    <!--
         Process Transition
     -->
-    
+
     	<record id="process_transition_procuretask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Procure Task&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;	Requisition Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
             <field model="process.node" name="source_node_id" ref="sale.process_node_saleprocurement0"/>
         </record>
-    
+
         <record id="process_transition_createtask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Task&quot;&quot;&quot;" name="name"/>
@@ -61,19 +61,19 @@
             <field model="process.node" name="target_node_id" ref="project.process_node_drafttask0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleordertask0"/>
         </record>
-        
+
         <record id="process_transition_ordertask0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Order Task&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;If procure method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;If Requisition method is Make to order and supply method is produce&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_mrptask0"/>
             <field model="process.node" name="source_node_id" ref="mrp.process_node_serviceonorder0"/>
         </record>
-        
-        <!--    
+
+        <!--
         	Process Action
     	-->
-        
+
 <!--        <record id="process_transition_action_orderconfirmtask0" model="process.transition.action">-->
 <!--            <field eval="&quot;&quot;&quot;action_confirm&quot;&quot;&quot;" name="action"/>-->
 <!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
@@ -91,9 +91,9 @@
 <!--        <record id="process_transition_action_taskrunprocurement0" model="process.transition.action">-->
 <!--            <field eval="&quot;&quot;&quot;write({'state':'exception'})&quot;&quot;&quot;" name="action"/>-->
 <!--            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>-->
-<!--            <field eval="&quot;&quot;&quot;Run Procurement&quot;&quot;&quot;" name="name"/>-->
+<!--            <field eval="&quot;&quot;&quot;Run Requisition&quot;&quot;&quot;" name="name"/>-->
 <!--            <field name="transition_id" ref="process_transition_ordertask0"/>-->
 <!--        </record>-->
-        
+
     </data>
 </openerp>
diff --git a/addons/project_mrp/project.py b/addons/project_mrp/project.py
index a01834e344b..e8cf31ebfba 100644
--- a/addons/project_mrp/project.py
+++ b/addons/project_mrp/project.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,7 +26,7 @@ class project_task(osv.osv):
     _name = "project.task"
     _inherit = "project.task"
     _columns = {
-        'procurement_id': fields.many2one('mrp.procurement', 'Procurement', ondelete='set null')
+        'procurement_id': fields.many2one('mrp.procurement', 'Requisition', ondelete='set null')
     }
     def do_close(self, cr, uid, ids, *args):
         res = super(project_task, self).do_close(cr, uid, ids, *args)
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index d23761a7ed3..f2063354cad 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -180,22 +180,22 @@ class purchase_order(osv.osv):
                 "Manual: no invoice will be pre-generated. The accountant will have to encode manually."
         ),
         'minimum_planned_date':fields.function(_minimum_planned_date, fnct_inv=_set_minimum_planned_date, method=True,store=True, string='Planned Date', type='datetime', help="This is computed as the minimum scheduled date of all purchase order lines' products."),
-        'amount_untaxed': fields.function(_amount_all, method=True, string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Untaxed Amount',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums"),
-        'amount_tax': fields.function(_amount_all, method=True, string='Taxes',
+        'amount_tax': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Taxes',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums"),
-        'amount_total': fields.function(_amount_all, method=True, string='Total',
+        'amount_total': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Total',
             store={
                 'purchase.order.line': (_get_order, None, 10),
             }, multi="sums"),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
-        'create_uid':  fields.many2one('res.users', 'Responsible'),    
-        'company_id': fields.many2one('res.company','Company',required=True),    
+        'create_uid':  fields.many2one('res.users', 'Responsible'),
+        'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
         'date_order': lambda *a: time.strftime('%Y-%m-%d'),
@@ -357,7 +357,7 @@ class purchase_order(osv.osv):
                 if pick.state not in ('draft','cancel'):
                     raise osv.except_osv(
                         _('Could not cancel purchase order !'),
-                        _('You must first cancel all packing attached to this purchase order.'))
+                        _('You must first cancel all picking attached to this purchase order.'))
             for pick in purchase.picking_ids:
                 wf_service = netsvc.LocalService("workflow")
                 wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index ef4ade4724f..aefce270e1c 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -11,7 +11,7 @@
 		'dest_address_id':fields.many2one('res.partner.address', 'Destination Address', states={'posted':[('readonly',True)]}),
 		'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'posted':[('readonly',True)]}),
 		'invoice_method': fields.selection([('manual','Manual'),('order','From order'),('picking','From picking')], 'Invoicing method', required=True),
-		
+
 		Mandatory fields:
 		'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
 		'partner_id':fields.many2one('res.partner', 'Partner', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, change_default=True),
@@ -39,7 +39,7 @@
 		'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
 		'notes': fields.text('Notes'),
 		'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
-		
+
 		Mandatory fields:
 		'date_planned': fields.date('Date Promised', required=True),
 		'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True),
@@ -64,38 +64,38 @@
             <field name="price_unit">88</field>
             <field name="product_qty">3</field>
         </record>
-        
+
         <assert model="purchase.order" id="test_purchase_1" string="The amount of Test purchase is correctly computed" severity="error">
             <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed" />
         </assert>
-        
+
         <workflow model="purchase.order" ref="test_purchase_1" action="purchase_confirm" />
-        
+
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now confirmed">
             <test expr="state">confirmed</test>
         </assert>
-        
+
         <workflow model="purchase.order" ref="test_purchase_1" action="purchase_approve" uid="base.user_root" />
-        
+
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now in progress">
             <test expr="state">approved</test>
         </assert>
-        
+
         <!-- Treat generated invoice -->
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase has now a corresponding invoice" severity="fatal">
             <test expr="bool(invoice_id)" />
         </assert>
-        
+
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice has the same amount and is currently a draft" severity="error">
             <test expr="invoice_id.amount_untaxed == amount_untaxed" />
             <test expr="invoice_id.amount_total == amount_total" />
             <test expr="invoice_id.state">draft</test>
         </assert>
-        
+
         <workflow model="account.invoice" action="invoice_open">
             <value model="purchase.order" eval="obj(ref('test_purchase_1')).invoice_id.id" />
         </workflow>
-        
+
         <function model="account.invoice" name="pay_and_reconcile">
             <value model="purchase.order" eval="[obj(ref('test_purchase_1')).invoice_id.id]" />
             <value eval="1164" />
@@ -106,36 +106,36 @@
             <value eval="ref('account.period_' + str(int(time.strftime('%m'))))" />
             <value eval="ref('account.bank_journal')" />
         </function>
-        
+
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase's invoice is now paid" severity="error">
             <test expr="invoice_id.state">paid</test>
         </assert>
-        
+
         <!-- Treat generated picking -->
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase has now a corresponding packing" severity="fatal">
+        <assert model="purchase.order" id="test_purchase_1" string="Test purchase has now a corresponding picking" severity="fatal">
             <test expr="len(picking_ids) == 1" />
         </assert>
-        
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's packing will be sent to the good address" severity="error">
+
+        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's picking will be sent to the good address" severity="error">
             <test expr="picking_ids[0].address_id == partner_address_id" />
         </assert>
-        
+
         <!-- Do the same as in wizard_partial_picking lines 143-144 -->
         <function model="stock.picking" name="action_move">
             <value model="purchase.order" eval="[obj(ref('test_purchase_1')).picking_ids[0].id]" />
         </function>
-        
+
         <workflow model="stock.picking" action="button_done">
             <value model="purchase.order" eval="obj(ref('test_purchase_1')).picking_ids[0].id" />
         </workflow>
-        
-        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's packing is now done" severity="error">
+
+        <assert model="purchase.order" id="test_purchase_1" string="Test purchase's picking is now done" severity="error">
             <test expr="picking_ids[0].state">done</test>
         </assert>
-        
+
         <assert model="purchase.order" id="test_purchase_1" string="Test purchase is now completed" severity="fatal">
             <test expr="state">done</test>
         </assert>
     </data>
 </openerp>
- 
+
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 4cf0414b27d..84b9a87ff05 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -9,5 +9,28 @@
         <field name="name">Purchase / User</field>
     </record>
 
+
+    <record model="ir.rule.group" id="purchase_order_comp_rule_group">
+        <field name="name">Purchase Order multi-company</field>
+        <field name="model_id" ref="model_purchase_order"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="purchase_order_comp_rule">
+        <field name="field_id" search="[('model','=','purchase.order'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="purchase_order_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <record model="ir.rule.group" id="purchase_order_line_comp_rule_group">
+        <field name="name">Purchase Order Line multi-company</field>
+        <field name="model_id" ref="model_purchase_order_line"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="purchase_order_line_comp_rule">
+        <field name="field_id" search="[('model','=','purchase.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="purchase_order_line_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 83e5b7e3095..867f48f6fe0 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <record id="stock_picking_inherit_purchase" model="ir.ui.view">
-            <field name="name">Packing list</field>
+            <field name="name">Picking list</field>
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="stock.view_picking_form"/>
@@ -13,13 +13,13 @@
                 </field>
             </field>
         </record>
-        
+
         <act_window
-            domain="[('purchase_id', '=', active_id)]" 
-            id="act_purchase_order_2_stock_picking" 
-            name="Packing" 
-            res_model="stock.picking" 
+            domain="[('purchase_id', '=', active_id)]"
+            id="act_purchase_order_2_stock_picking"
+            name="Picking"
+            res_model="stock.picking"
             src_model="purchase.order"/>
-        
+
     </data>
 </openerp>
diff --git a/addons/report_account/i18n/el.po b/addons/report_account/i18n/el.po
index 03aada2286b..ff168c1e096 100644
--- a/addons/report_account/i18n/el.po
+++ b/addons/report_account/i18n/el.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:37+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2009-11-28 16:26+0000\n"
+"Last-Translator: Andreas Porevopoulos <Unknown>\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: 2009-11-17 05:08+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Πίστωση πελάτη"
 
 #. module: report_account
 #: constraint:ir.model:0
@@ -33,42 +33,42 @@ msgstr ""
 #. module: report_account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Διάρκεια μηνός"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Τιμολόγιο Πελάτη"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Τιμολόγια που εκδόθηκαν τις τελευταίες 15 μέρες"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Έκθεση τιμολογίων των τελευταίων 15 ημερών"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Τιμολόγιο Προμηθευτή"
 
 #. module: report_account
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr ""
+msgstr "Πολιτεία"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Πρόχειρο"
 
 #. module: report_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
 
 #. module: report_account
 #: field:report.account.receivable,debit:0
@@ -78,57 +78,57 @@ msgstr "Χρέωση"
 #. module: report_account
 #: field:report.account.receivable,type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Τύπος Λογαριασμού"
 
 #. module: report_account
 #: field:report.invoice.created,type:0
 msgid "Type"
-msgstr ""
+msgstr "Τύπος"
 
 #. module: report_account
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "Περιγραφή"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Σύνολο"
 
 #. module: report_account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr ""
+msgstr "Υπόλοιπο"
 
 #. module: report_account
 #: field:report.invoice.created,date_invoice:0
 msgid "Date Invoiced"
-msgstr ""
+msgstr "Ημερομηνία Τιμολόγησης"
 
 #. module: report_account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr "Λογαριασμοί κατα τύπο"
+msgstr "Λογαριασμοί με βάση τον τύπο"
 
 #. module: report_account
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Αριθμός Τιμολογίου"
 
 #. module: report_account
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Αφορολόγητο"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr ""
+msgstr "Ολοκληρώθηκε"
 
 #. module: report_account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Παλαιωμένα εισπρακτέα μέχρι σήμερα"
 
 #. module: report_account
 #: constraint:ir.ui.view:0
@@ -143,7 +143,7 @@ msgstr "Εισπρακτέοι λογαριασμοί"
 #. module: report_account
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Ημερομηνία λήξης"
 
 #. module: report_account
 #: field:report.account.receivable,credit:0
@@ -153,22 +153,22 @@ msgstr "Πίστωση"
 #. module: report_account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Εύρος"
 
 #. module: report_account
 #: model:ir.module.module,description:report_account.module_meta_information
 msgid "A module that adds new reports based on the account module."
-msgstr ""
+msgstr "Ένα πρόσθετο με νέες εκθέσεις βασισμένο στο account module"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Επιστροφή σε Προμηθευτή"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Ακυρώθηκε"
 
 #. module: report_account
 #: field:report.account.receivable,balance:0
@@ -184,7 +184,7 @@ msgstr ""
 #. module: report_account
 #: field:report.invoice.created,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Προέλευση"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
@@ -195,17 +195,17 @@ msgstr "Ισοζύγιο κατα Τύπο Λογαριασμού"
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Invoices"
-msgstr ""
+msgstr "Τιμολόγια"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Προ-φόρμα"
 
 #. module: report_account
 #: field:report.invoice.created,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Νόμισμα"
 
 #. module: report_account
 #: field:report.account.receivable,name:0
@@ -215,30 +215,30 @@ msgstr "Εβδομάδα Έτους"
 #. module: report_account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Ημερομηνία Δημιουργίας"
 
 #. module: report_account
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Παλαιωμένα εισπρακτέα"
 
 #. module: report_account
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Συνεργάτης"
 
 #. module: report_account
 #: field:report.invoice.created,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Σύνολο"
 
 #. module: report_account
 #: selection:report.invoice.created,state:0
 msgid "Open"
-msgstr ""
+msgstr "Άνοιγμα"
 
 #. module: report_account
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Αφορολόγητο Ποσό"
diff --git a/addons/report_mrp/i18n/el.po b/addons/report_mrp/i18n/el.po
new file mode 100644
index 00000000000..b60772e7506
--- /dev/null
+++ b/addons/report_mrp/i18n/el.po
@@ -0,0 +1,103 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2009-11-28 12:10+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2009-11-29 04:35+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: report_mrp
+#: field:report.mrp.inout,date:0
+#: field:report.workcenter.load,name:0
+msgid "Week"
+msgstr ""
+
+#. module: report_mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: report_mrp
+#: model:ir.ui.menu,name:report_mrp.next_id_77
+msgid "Reporting"
+msgstr ""
+
+#. module: report_mrp
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: report_mrp
+#: view:report.workcenter.load:0
+msgid "Workcenters load"
+msgstr ""
+
+#. module: report_mrp
+#: model:ir.model,name:report_mrp.model_report_workcenter_load
+msgid "Workcenter Load"
+msgstr ""
+
+#. module: report_mrp
+#: model:ir.module.module,shortdesc:report_mrp.module_meta_information
+msgid "MRP Management - Reporting"
+msgstr ""
+
+#. module: report_mrp
+#: field:report.mrp.inout,value:0
+msgid "Stock value"
+msgstr ""
+
+#. module: report_mrp
+#: field:report.workcenter.load,cycle:0
+msgid "Nbr of cycle"
+msgstr ""
+
+#. module: report_mrp
+#: field:report.workcenter.load,hour:0
+msgid "Nbr of hour"
+msgstr ""
+
+#. module: report_mrp
+#: field:report.workcenter.load,workcenter_id:0
+msgid "Workcenter"
+msgstr ""
+
+#. module: report_mrp
+#: model:ir.actions.act_window,name:report_mrp.action_report_workcenter_load_tree
+#: model:ir.ui.menu,name:report_mrp.menu_report_workcenter_load
+msgid "Workcenter Loads"
+msgstr ""
+
+#. module: report_mrp
+#: model:ir.actions.act_window,name:report_mrp.action_report_in_out_picking_tree
+#: model:ir.ui.menu,name:report_mrp.menu_report_in_out_picking
+msgid "Weekly Stock Value Variation"
+msgstr ""
+
+#. module: report_mrp
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: report_mrp
+#: model:ir.model,name:report_mrp.model_report_mrp_inout
+#: view:report.mrp.inout:0
+msgid "Stock value variation"
+msgstr ""
+
+#. module: report_mrp
+#: view:report.workcenter.load:0
+msgid "Workcenter load"
+msgstr ""
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index 5240adc3775..ff7673558d8 100755
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -32,8 +32,8 @@
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Sale Order Procurement&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Drives procurement orders for every sale order line.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Sale Order Requisition&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Drives requisition orders for every sale order line.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="process_process_salesprocess0"/>
             <field name="process_id" ref="mrp.process_process_procurementprocess0"/>
             <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
@@ -66,8 +66,8 @@
             <field name="menu_id" ref="mrp.menu_mrp_procurement_action"/>
             <field name="model_id" ref="mrp.model_mrp_procurement"/>
             <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;One procurement order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Requisition Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;One requisition order for each sale order line and for each of the components.&quot;&quot;&quot;" name="note"/>
             <field name="subflow_id" ref="mrp.process_process_procurementprocess0"/>
             <field name="process_id" ref="process_process_salesprocess0"/>
             <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
@@ -158,8 +158,8 @@
 
         <record id="process_transition_saleprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. &quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Create Requisition Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A requisition order is automatically created as soon as a sale order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sale order's parameters. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
         </record>
@@ -167,7 +167,7 @@
         <record id="process_transition_packing0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
             <field eval="&quot;&quot;&quot;Create Pick List&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sale order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sale order is confirmed, in the same time as the requisition order. It represents the assignment of parts to the sale order. There is 1 pick list by sale order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
         </record>
@@ -200,8 +200,8 @@
         <record id="process_transition_saleorderprocurement0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
             <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;For every sale order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
+            <field eval="&quot;&quot;&quot;Requisition of sold material&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;For every sale order line, a requisition order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="mrp.process_node_procureproducts0"/>
             <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
         </record>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 1ab84d9fb98..3d58d4a0350 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -196,7 +196,7 @@ class sale_order(osv.osv):
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')
-            ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the packing list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Date Ordered'.", select=True),
+            ], 'Order State', readonly=True, help="Gives the state of the quotation or sale order. The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Date Ordered'.", select=True),
         'date_order': fields.date('Date Ordered', required=True, readonly=True, states={'draft': [('readonly', False)]}),
 
         'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),
@@ -207,24 +207,24 @@ class sale_order(osv.osv):
 
         'incoterm': fields.selection(_incoterm_get, 'Incoterm', size=3),
         'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
-            'Packing Policy', required=True, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
+            'Picking Policy', required=True, help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
         'order_policy': fields.selection([
             ('prepaid', 'Payment Before Delivery'),
             ('manual', 'Shipping & Manual Invoice'),
             ('postpaid', 'Invoice on Order After Delivery'),
-            ('picking', 'Invoice from the Packing'),
+            ('picking', 'Invoice from Picking'),
         ], 'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)]},
                     help="""The Shipping Policy is used to synchronise invoice and delivery operations.
   - The 'Pay before delivery' choice will first generate the invoice and then generate the packing order after the payment of this invoice.
   - The 'Shipping & Manual Invoice' will create the packing order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
-  - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all packing lists have been finished.
-  - The 'Invoice from the packing' choice is used to create an invoice during the packing process."""),
+  - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all picking lists have been finished.
+  - The 'Invoice from the picking' choice is used to create an invoice during the packing process."""),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'project_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft': [('readonly', False)]}),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)]}),
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', help="This is the list of invoices that have been generated for this sale order. The same sale order may have been invoiced in several times (by line for example)."),
-        'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Packing', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
+        'picking_ids': fields.one2many('stock.picking', 'sale_id', 'Related Picking', readonly=True, help="This is the list of picking list that have been generated for this invoice"),
         'shipped': fields.boolean('Picked', readonly=True),
         'picked_rate': fields.function(_picked_rate, method=True, string='Picked', type='float'),
         'invoiced_rate': fields.function(_invoiced_rate, method=True, string='Invoiced', type='float'),
@@ -232,19 +232,19 @@ class sale_order(osv.osv):
             fnct_search=_invoiced_search, type='boolean'),
         'note': fields.text('Notes'),
 
-        'amount_untaxed': fields.function(_amount_all, method=True, string='Untaxed Amount',
+        'amount_untaxed': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Untaxed Amount',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums'),
-        'amount_tax': fields.function(_amount_all, method=True, string='Taxes',
+        'amount_tax': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Taxes',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
             },
             multi='sums'),
-        'amount_total': fields.function(_amount_all, method=True, string='Total',
+        'amount_total': fields.function(_amount_all, method=True, digits=(16, int(config['price_accuracy'])), string='Total',
             store = {
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
                 'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
@@ -257,6 +257,7 @@ class sale_order(osv.osv):
         'company_id': fields.many2one('res.company','Company'),
     }
     _defaults = {
+        'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'sale.order', c),
         'picking_policy': lambda *a: 'direct',
         'date_order': lambda *a: time.strftime('%Y-%m-%d'),
         'order_policy': lambda *a: 'manual',
@@ -396,7 +397,7 @@ class sale_order(osv.osv):
         invoice_ids = []
 
         context = {}
-        # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the 
+        # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
         # last day of the last month as invoice date
         if date_inv:
             context['date_inv'] = date_inv
@@ -497,7 +498,7 @@ class sale_order(osv.osv):
                 if line.procurement_id:
                     res.append(line.procurement_id.id)
         return res
-        
+
     # if mode == 'finished':
     #   returns True if all lines are done, False otherwise
     # if mode == 'canceled':
@@ -511,13 +512,13 @@ class sale_order(osv.osv):
         write_cancel_ids = []
         stock_move_obj = self.pool.get('stock.move')
         for order in self.browse(cr, uid, ids, context={}):
-            
-            #check for pending deliveries 
+
+            #check for pending deliveries
             pending_deliveries = False
             # check => if order_lines do not exist,don't proceed for any mode.
             if not order.order_line:
                 return False
-            for line in order.order_line:    
+            for line in order.order_line:
                 move_ids = stock_move_obj.search(cr, uid, [('sale_line_id','=', line.id)])
                 for move in stock_move_obj.browse( cr, uid, move_ids ):
                     #if one of the related order lines is in state draft, auto or confirmed
@@ -746,12 +747,12 @@ class sale_order_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
-        'procurement_id': fields.many2one('mrp.procurement', 'Procurement'),
+        'procurement_id': fields.many2one('mrp.procurement', 'Requisition'),
         'price_unit': fields.float('Unit Price', required=True, digits=(16, int(config['price_accuracy']))),
         'price_net': fields.function(_amount_line_net, method=True, string='Net Price', digits=(16, int(config['price_accuracy']))),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal'),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes'),
-        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procure Method', required=True),
+        'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Requisition Method', required=True),
         'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties'),
         'address_allotment_id': fields.many2one('res.partner.address', 'Allotment Partner'),
         'product_uom_qty': fields.float('Quantity (UoM)', digits=(16, 2), required=True),
@@ -936,7 +937,7 @@ class sale_order_line(osv.osv):
                 warn_msg = _("You selected a quantity of %d Units.\nBut it's not compatible with the selected packaging.\nHere is a proposition of quantities according to the packaging: ") % (qty)
                 warn_msg = warn_msg + "\n\n" + _("EAN: ") + str(ean) + _(" Quantity: ") + str(qty_pack) + _(" Type of ul: ") + str(type_ul.name)
                 warning = {
-                    'title': _('Packing Information !'),
+                    'title': _('Picking Information !'),
                     'message': warn_msg
                     }
             result['product_uom_qty'] = qty
@@ -1051,14 +1052,14 @@ class sale_config_picking_policy(osv.osv_memory):
         'picking_policy': fields.selection([
             ('direct', 'Direct Delivery'),
             ('one', 'All at Once')
-        ], 'Packing Default Policy', required=True),
+        ], 'Picking Default Policy', required=True),
         'order_policy': fields.selection([
             ('manual', 'Invoice Based on Sales Orders'),
             ('picking', 'Invoice Based on Deliveries'),
         ], 'Shipping Default Policy', required=True),
         'step': fields.selection([
             ('one', 'Delivery Order Only'),
-            ('two', 'Packing List & Delivery Order')
+            ('two', 'Picking List & Delivery Order')
         ], 'Steps To Deliver a Sale Order', required=True,
            help="By default, Open ERP is able to manage complex routing and paths "\
            "of products in your warehouse and partner locations. This will configure "\
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index 6f2b9327319..dc507edb4a0 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -32,38 +32,38 @@
             <field name="product_uos_qty">3</field>
             <field name="type">make_to_stock</field>
         </record>
-        
+
         <assert id="test_order_1" model="sale.order" severity="error" string="The amount of the sale order is correctly computed">
             <test expr="sum([l.price_subtotal for l in order_line]) == amount_untaxed"/>
         </assert>
-        
+
         <workflow action="order_confirm" model="sale.order" ref="test_order_1"/>
-        
+
         <assert id="test_order_1" model="sale.order" string="the sale order is now in 'Manual in progress' state">
             <test expr="state">manual</test>
         </assert>
-        
+
         <workflow action="manual_invoice" model="sale.order" ref="test_order_1" uid="base.user_root"/>
-        
+
         <assert id="test_order_1" model="sale.order" string="the sale order is now in progress">
             <test expr="state">progress</test>
         </assert>
-        
+
         <!-- Treat generated invoice -->
         <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a corresponding invoice">
             <test expr="len(invoice_ids) == 1"/>
         </assert>
-        
+
         <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's has the same amount and is currently a draft">
             <test expr="invoice_ids[0].amount_untaxed == amount_untaxed"/>
             <test expr="invoice_ids[0].amount_total == amount_total"/>
             <test expr="invoice_ids[0].state">draft</test>
         </assert>
-        
+
         <workflow action="invoice_open" model="account.invoice">
             <value eval="obj(ref('test_order_1')).invoice_ids[0].id" model="sale.order"/>
         </workflow>
-        
+
         <function model="account.invoice" name="pay_and_reconcile">
             <value eval="[obj(ref('test_order_1')).invoice_ids[0].id]" model="sale.order"/>
             <value eval="obj(ref('test_order_1')).amount_total" model="sale.order"/>
@@ -74,46 +74,46 @@
             <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
             <value eval="ref('account.bank_journal')"/>
         </function>
-        
+
         <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's invoice is now paid">
             <test expr="invoice_ids[0].state">paid</test>
         </assert>
-        
+
         <!-- Treat generated picking -->
-        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a correspending packing">
+        <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order has now a correspending picking">
             <test expr="len(picking_ids) == 1"/>
         </assert>
-        
+
         <assert id="test_order_1" model="sale.order" severity="error" string="the sale order's picking will be sent to the good address and is already confirmed">
             <test expr="picking_ids[0].address_id == partner_shipping_id"/>
             <!-- test expr="picking_ids[0].state">confirmed</test # Desactivated because of MRP_JIT -->
         </assert>
-        
+
         <!-- Here we need to use the function tag because action_assign is a method of stock_picking and not part of the workflow -->
         <function model="stock.picking" name="action_assign">
             <value eval="[obj(ref('test_order_1')).picking_ids[0].id]" model="sale.order"/>
         </function>
-        
+
         <assert id="test_order_1" model="sale.order" severity="fatal" string="the sale order's picking is now assigned">
             <test expr="picking_ids[0].state">assigned</test>
         </assert>
-        
+
         <!-- Do the same as in wizard_partial_picking lines 143-144 -->
         <function model="stock.picking" name="action_move">
             <value eval="[obj(ref('test_order_1')).picking_ids[0].id]" model="sale.order"/>
         </function>
-        
+
         <workflow action="button_done" model="stock.picking">
             <value eval="obj(ref('test_order_1')).picking_ids[0].id" model="sale.order"/>
         </workflow>
-        
+
         <assert id="test_order_1" model="sale.order" string="the sale order's picking is now done">
             <test expr="picking_ids[0].state">done</test>
         </assert>
-        
+
         <!-- Run all schedulers -->
         <function model="mrp.procurement" name="run_scheduler"/>
-        
+
         <assert id="test_order_1" model="sale.order" string="the sale order is now done">
             <test expr="state">done</test>
         </assert>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index cd17df62bf1..590ddb445db 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -187,8 +187,8 @@
                                 <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
                                 <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-print"/>
                                 <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="gtk-apply"/>
-                                <button name="ship_recreate" states="shipping_except" string="Recreate Procurement" icon="gtk-ok"/>
-                                <button name="ship_corrected" states="shipping_except" string="Procurement Corrected" icon="gtk-apply"/>
+                                <button name="ship_recreate" states="shipping_except" string="Recreate Requisition" icon="gtk-ok"/>
+                                <button name="ship_corrected" states="shipping_except" string="Requisition Corrected" icon="gtk-apply"/>
                                 <button name="manual_invoice" states="manual" string="Create Invoice" icon="gtk-print"/>
                                 <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 4faf2990fa9..cd95e9398bf 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -25,5 +25,17 @@
         <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
+    <record model="ir.rule.group" id="sale_order_line_comp_rule_group">
+        <field name="name">Sale Order Line multi-company</field>
+        <field name="model_id" ref="model_sale_order_line"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="sale_order_line_comp_rule">
+        <field name="field_id" search="[('model','=','sale.order.line'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="sale_order_line_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+
 </data>
 </openerp>
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 1b103cd37d0..bd1b89dcaf0 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -130,13 +130,19 @@ class stock_picking(osv.osv):
         for invoice in invoice_obj.browse(cursor, user, invoice_ids,
                 context=context):
             invoices[invoice.id] = invoice
-
+            
         for picking in picking_obj.browse(cursor, user, picking_ids,
                 context=context):
 
             if not picking.sale_id:
                 continue
             sale_lines = picking.sale_id.order_line
+            invoice_created = invoices[result[picking.id]]
+            
+            if picking.sale_id.client_order_ref:
+                inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name
+                invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context)
+            
             for sale_line in sale_lines:
                 if sale_line.product_id.type == 'service' and sale_line.invoiced == False:
                     if group:
diff --git a/addons/sale_crm/wizard/makesale.py b/addons/sale_crm/wizard/makesale.py
index b8304b013e5..8ad5f6b1163 100644
--- a/addons/sale_crm/wizard/makesale.py
+++ b/addons/sale_crm/wizard/makesale.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -42,7 +42,7 @@ sale_fields = {
     'partner_id': {'string': 'Customer', 'type': 'many2one',
         'relation': 'res.partner',
         'help': 'Use this partner if there is no partner on the case'},
-    'picking_policy': {'string': 'Packing Policy', 'type': 'selection',
+    'picking_policy': {'string': 'Picking Policy', 'type': 'selection',
         'selection': [('direct','Direct Delivery'),('one','All at once')]},
     'products': {'string': 'Products', 'type': 'many2many',
         'relation': 'product.product'},
@@ -62,9 +62,9 @@ class make_sale(wizard.interface):
 
     def _makeOrder(self, cr, uid, data, context):
         pool = pooler.get_pool(cr.dbname)
-        mod_obj = pool.get('ir.model.data') 
+        mod_obj = pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'sale', 'view_sales_order_filter')
-        id = mod_obj.read(cr, uid, result, ['res_id'])        
+        id = mod_obj.read(cr, uid, result, ['res_id'])
         case_obj = pool.get('crm.case')
         sale_obj = pool.get('sale.order')
         partner_obj = pool.get('res.partner')
@@ -93,7 +93,7 @@ class make_sale(wizard.interface):
 
             if False in partner_addr.values():
                 raise wizard.except_wizard(_('Data Insufficient!'),_('Customer has no addresses defined!'))
-            
+
             vals = {
                 'origin': 'CRM:%s' % str(case.id),
                 'picking_policy': data['form']['picking_policy'],
@@ -131,7 +131,7 @@ class make_sale(wizard.interface):
             'res_model': 'sale.order',
             'view_id': False,
             'type': 'ir.actions.act_window',
-            'search_view_id': id['res_id']            
+            'search_view_id': id['res_id']
         }
         return value
 
diff --git a/addons/sale_journal/picking_journal_view.xml b/addons/sale_journal/picking_journal_view.xml
index 5215b89f210..72559f31620 100644
--- a/addons/sale_journal/picking_journal_view.xml
+++ b/addons/sale_journal/picking_journal_view.xml
@@ -6,7 +6,7 @@
 		<field name="model">sale_journal.picking.journal</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
-			<form string="Packing Journal">
+			<form string="Picking Journal">
 				<notebook>
 				<page string="Journal">
 					<separator string="Journal Information" colspan="4"/>
@@ -24,7 +24,7 @@
                         <button name="button_draft" string="Set to Draft" states="close,open" type="object" icon="gtk-convert"/>
 					</group>
 				</page>
-				<page string="Packing">
+				<page string="Picking">
                     <button string="Cancel Packing" name="button_picking_cancel" states="draft,open" type="object" icon="gtk-cancel"/>
 					<newline/>
 					<field name="picking_stats_ids" colspan="4" nolabel="1"/>
@@ -40,7 +40,7 @@
 		<field name="model">sale_journal.picking.journal</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
-			<tree string="Packing Journal">
+			<tree string="Picking Journal">
 				<field name="name" select="1"/>
 				<field name="code" select="1"/>
 				<field name="user_id" select="1"/>
@@ -50,25 +50,25 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="action_definition_picking_journal">
-		<field name="name">Packing journals</field>
+		<field name="name">Picking journals</field>
 		<field name="res_model">sale_journal.picking.journal</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	
-	
-	<menuitem name="Packing Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
+
+
+	<menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/>
 
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree">
-		<field name="name">Packing by journal</field>
+		<field name="name">Picking by journal</field>
 		<field name="res_model">sale_journal.picking.journal</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[]</field>
 	</record>
-	
-	
-	<menuitem name="Packing by Journal" id="menu_definition_journal_picking_byjournal" parent="stock.menu_stock_root" action="action_definition_picking_journal_tree"/>
+
+
+	<menuitem name="Picking by Journal" id="menu_definition_journal_picking_byjournal" parent="stock.menu_stock_root" action="action_definition_picking_journal_tree"/>
 
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_my">
 		<field name="name">My open packing journals</field>
@@ -76,36 +76,36 @@
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('user_id','=',uid),('state','=','open')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
-	
+
 	<menuitem name="My Open Journals" id="menu_definition_journal_picking_byjournal_my" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_my"  groups="base.group_extended"/>
-	
+
 	<record model="ir.actions.act_window" id="action_definition_picking_journal_tree_all">
-		<field name="name">Packing by journal</field>
+		<field name="name">Picking by journal</field>
 		<field name="res_model">sale_journal.picking.journal</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('state','=','open')]</field>
-        <field name="filter" eval="True"/>		
+        <field name="filter" eval="True"/>
 	</record>
-	
+
 	<menuitem name="All Open Journals" id="menu_definition_journal_picking_byjournal_all" parent="menu_definition_journal_picking_byjournal" action="action_definition_picking_journal_tree_all" groups="base.group_extended"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_type_tree">
-		<field name="name">Packing by invoice_method</field>
+		<field name="name">Picking by invoice_method</field>
 		<field name="name">sale_journal.invoice.type.tree</field>
 		<field name="res_model">sale_journal.invoice.type</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">tree</field>
 	</record>
-	
-	
-	<menuitem name="Packing to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>
-	<menuitem name="Packing by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>
-	
+
+
+	<menuitem name="Picking to Invoice" id="menu_definition_journal_picking_invoice" parent="stock.menu_action_picking_tree"/>
+	<menuitem name="Picking by Invoice Method" id="menu_definition_journal_picking_invoice_method" parent="menu_definition_journal_picking_invoice" action="action_invoice_type_tree"/>
+
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_open">
-		<field name="name">Packing to invoice</field>
+		<field name="name">Picking to invoice</field>
 		<field name="res_model">stock.picking</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -115,7 +115,7 @@
 	<record model="ir.values" id="ir_open_invoice_type">
 		<field name="key2">tree_but_open</field>
 		<field name="model">sale_journal.invoice.type</field>
-		<field name="name">Packing to invoice</field>
+		<field name="name">Picking to invoice</field>
 		<field name="value" eval="'ir.actions.act_window,%d'%action_invoice_type_picking_open"/>
 		<field name="object" eval="True"/>
 	</record>
diff --git a/addons/sale_journal/picking_journal_view_report.xml b/addons/sale_journal/picking_journal_view_report.xml
index 44759a2b621..060b1fd1da6 100644
--- a/addons/sale_journal/picking_journal_view_report.xml
+++ b/addons/sale_journal/picking_journal_view_report.xml
@@ -2,7 +2,7 @@
 <data>
 
 	#
-	# Packings by invoice type
+	# Pickings by invoice type
 	#
 
 	<record model="ir.ui.view" id="view_picking_invoice_type_stats_form">
@@ -10,7 +10,7 @@
 		<field name="model">sale_journal.invoice.type.stats</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
-			<form string="Packing by invoice method">
+			<form string="Picking by invoice method">
 				<field name="name" select="1"/>
 				<field name="invoice_state" select="1"/>
 				<field name="state" select="1"/>
@@ -40,7 +40,7 @@
 		</field>
 	</record>
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open">
-		<field name="name">Statistics on packing to invoice</field>
+		<field name="name">Statistics on picking to invoice</field>
 		<field name="res_model">sale_journal.invoice.type.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
@@ -49,28 +49,28 @@
 	</record>
 
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open_menu_month">
-		<field name="name">Packing by invoice method</field>
+		<field name="name">Picking by invoice method</field>
 		<field name="res_model">sale_journal.invoice.type.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
 	</record>
-	
-	<menuitem name="Packing Journal" id="menu_definition_journal_reporting" parent="stock.next_id_61"/>
+
+	<menuitem name="Picking Journal" id="menu_definition_journal_reporting" parent="stock.next_id_61"/>
 	<menuitem name="This Month" id="menu_definition_journal_reporting_this" parent="menu_definition_journal_reporting"/>
-	<menuitem name="Packing by Invoice Method" id="menu_invoice_type_picking_stats_open_menu" parent="menu_definition_journal_reporting_this" action="action_invoice_type_picking_stats_open_menu_month"/>
+	<menuitem name="Picking by Invoice Method" id="menu_invoice_type_picking_stats_open_menu" parent="menu_definition_journal_reporting_this" action="action_invoice_type_picking_stats_open_menu_month"/>
 
 	<record model="ir.actions.act_window" id="action_invoice_type_picking_stats_open_menu_all">
-		<field name="name">Packing by invoice method</field>
+		<field name="name">Picking by invoice method</field>
 		<field name="res_model">sale_journal.invoice.type.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	
+
 	<menuitem name="All Months" id="menu_definition_journal_reporting_all" parent="menu_definition_journal_reporting"/>
-	<menuitem name="Packing by Invoice Method" id="menu_invoice_type_picking_stats_open_all" parent="menu_definition_journal_reporting_all" action="action_invoice_type_picking_stats_open_menu_all"/>
+	<menuitem name="Picking by Invoice Method" id="menu_invoice_type_picking_stats_open_all" parent="menu_definition_journal_reporting_all" action="action_invoice_type_picking_stats_open_menu_all"/>
 
 	#
 	# Packing by journal
@@ -81,7 +81,7 @@
 		<field name="model">sale_journal.picking.stats</field>
 		<field name="type">form</field>
 		<field name="arch" type="xml">
-			<form string="Packing by journals">
+			<form string="Picking by journals">
 				<field name="name" select="1"/>
 				<field name="state" select="1"/>
 				<field name="journal_id" select="1"/>
@@ -97,7 +97,7 @@
 		<field name="model">sale_journal.picking.stats</field>
 		<field name="type">tree</field>
 		<field name="arch" type="xml">
-			<tree string="Packing by journals">
+			<tree string="Picking by journals">
 				<field name="name"/>
 				<field name="state"/>
 				<field name="journal_id"/>
@@ -110,25 +110,25 @@
 	</record>
 
 	<record model="ir.actions.act_window" id="action_picking_picking_stats_open_menu_month">
-		<field name="name">Packing by journal</field>
+		<field name="name">Picking by journal</field>
 		<field name="res_model">sale_journal.picking.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 		<field name="domain">[('name','=',time.strftime('%Y-%m-01'))]</field>
 	</record>
-	
-	<menuitem name="Packing by Journal" id="menu_picking_picking_stats_open_menu" parent="menu_definition_journal_reporting_this" action="action_picking_picking_stats_open_menu_month"/>
-	
+
+	<menuitem name="Picking by Journal" id="menu_picking_picking_stats_open_menu" parent="menu_definition_journal_reporting_this" action="action_picking_picking_stats_open_menu_month"/>
+
 	<record model="ir.actions.act_window" id="action_picking_picking_stats_open_menu_all">
-		<field name="name">Packing by journal</field>
+		<field name="name">Picking by journal</field>
 		<field name="res_model">sale_journal.picking.stats</field>
 		<field name="type">ir.actions.act_window</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,form</field>
 	</record>
-	
-	<menuitem name="Packing by Journal" id="menu_picking_picking_stats_open_all" parent="menu_definition_journal_reporting_all" action="action_picking_picking_stats_open_menu_all"/>
+
+	<menuitem name="Picking by Journal" id="menu_picking_picking_stats_open_all" parent="menu_definition_journal_reporting_all" action="action_picking_picking_stats_open_menu_all"/>
 
 </data>
 </openerp>
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index aca51f9a822..5d7199d57ad 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -90,7 +90,7 @@ sale_journal()
 
 class picking_journal(osv.osv):
     _name = 'sale_journal.picking.journal'
-    _description = 'Packing Journal'
+    _description = 'Picking Journal'
     _columns = {
         'name': fields.char('Journal', size=64, required=True),
         'code': fields.char('Code', size=16, required=True),
diff --git a/addons/sale_journal/sale_journal_picking_report.py b/addons/sale_journal/sale_journal_picking_report.py
index ce5856cb255..5ae9ee814e4 100644
--- a/addons/sale_journal/sale_journal_picking_report.py
+++ b/addons/sale_journal/sale_journal_picking_report.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -71,7 +71,7 @@ report_sale_journal_invoice_type_stats()
 
 class report_sale_journal_picking(osv.osv):
     _name = "sale_journal.picking.stats"
-    _description = "Packing lists by Journal"
+    _description = "Picking lists by Journal"
     _auto = False
     _columns = {
         'name': fields.date('Month', readonly=True),
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index a78da2362e5..3a595b319c8 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -331,25 +331,25 @@
         src_model="sale_journal.sale.journal"
         id="act_sale_journal_sale_journal_2_sale_journal_sale_stats"/>
 
-    <act_window name="Assigned packing"
+    <act_window name="Assigned picking"
         domain="[('journal_id', '=', active_id),('state', '=', 'assigned')]"
         res_model="stock.picking"
         src_model="sale_journal.picking.journal"
         id="act_sale_journal_picking_journal_2_stock_picking_assigned"/>
 
-    <act_window name="Confirmed packing"
+    <act_window name="Confirmed picking"
         domain="[('journal_id', '=', active_id),('state', '=', 'confirmed')]"
         res_model="stock.picking"
         src_model="sale_journal.picking.journal"
         id="act_sale_journal_picking_journal_2_stock_picking_confirmed"/>
 
-    <act_window name="Assigned packing"
+    <act_window name="Assigned picking"
         domain="[('sale_journal_id', '=', active_id),('state', '=', 'assigned')]"
         res_model="stock.picking"
         src_model="sale_journal.sale.journal"
         id="act_sale_journal_sale_journal_2_stock_picking_assigned"/>
 
-    <act_window name="Confirmed packing"
+    <act_window name="Confirmed picking"
         domain="[('sale_journal_id', '=', active_id),('state', '=', 'confirmed')]"
         res_model="stock.picking"
         src_model="sale_journal.sale.journal"
diff --git a/addons/scrum/i18n/es.po b/addons/scrum/i18n/es.po
index 257f34ad4b3..e28d991f8a6 100644
--- a/addons/scrum/i18n/es.po
+++ b/addons/scrum/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 10:41+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
+"PO-Revision-Date: 2009-11-28 14:20+0000\n"
+"Last-Translator: viktor <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: 2009-11-18 04:35+0000\n"
+"X-Launchpad-Export-Date: 2009-11-29 04:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
@@ -56,7 +56,7 @@ msgstr "Nombre de modelo no válido en la definición de acción."
 #. module: scrum
 #: model:ir.module.module,shortdesc:scrum.module_meta_information
 msgid "Scrum, Agile Development Method"
-msgstr ""
+msgstr "Scrum, método de desarrollo ágil"
 
 #. module: scrum
 #: field:scrum.project,progress_rate:0
@@ -638,6 +638,8 @@ msgid ""
 "If you have [?] in the project name, it means there are no analytic account "
 "linked to this project."
 msgstr ""
+"Si tiene [?] en el nombre del proyecto, significa que no hay cuenta "
+"analítica vinculada a este proyecto."
 
 #. module: scrum
 #: help:scrum.project,planned_hours:0
@@ -669,6 +671,10 @@ msgid ""
 "projects. It enables you to connect projects with budgets, planning, cost "
 "and revenue analysis, timesheets on projects, etc."
 msgstr ""
+"Enlace este proyecto a una cuenta analítica si necesita la gestión "
+"financiera de los proyectos. Le permite conectar los proyectos con "
+"presupuestos, planificación, análisis de costes e ingresos, planificación "
+"del tiempo en los proyectos, etc."
 
 #. module: scrum
 #: selection:scrum.product.backlog,state:0
diff --git a/addons/scrum/i18n/zh_CN.po b/addons/scrum/i18n/zh_CN.po
index 8e6f8c5d503..05d3d685b2b 100644
--- a/addons/scrum/i18n/zh_CN.po
+++ b/addons/scrum/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-11-26 04:37+0000\n"
+"X-Launchpad-Export-Date: 2009-11-27 04:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
diff --git a/addons/stock/product.py b/addons/stock/product.py
index 242f7519a5e..f614fb7eb08 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -163,7 +163,7 @@ class product_product(osv.osv):
 
     _columns = {
         'qty_available': fields.function(_product_available, method=True, type='float', string='Real Stock', help="Current quantities of products in selected locations or all internal if none have been selected.", multi='qty_available'),
-        'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Futur stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'),
+        'virtual_available': fields.function(_product_available, method=True, type='float', string='Virtual Stock', help="Future stock for this product according to the selected location or all internal if none have been selected. Computed as: Real Stock - Outgoing + Incoming.", multi='qty_available'),
         'incoming_qty': fields.function(_product_available, method=True, type='float', string='Incoming', help="Quantities of products that are planned to arrive in selected locations or all internal if none have been selected.", multi='qty_available'),
         'outgoing_qty': fields.function(_product_available, method=True, type='float', string='Outgoing', help="Quantities of products that are planned to leave in selected locations or all internal if none have been selected.", multi='qty_available'),
         'track_production': fields.boolean('Track Production Lots' , help="Force to use a Production Lot during production order"),
@@ -179,34 +179,34 @@ class product_product(osv.osv):
             if fields:
                 if location_info.usage == 'supplier':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = _('Futur Receptions')
+                        res['fields']['virtual_available']['string'] = _('Future Receptions')
                     if fields.get('qty_available'):
                         res['fields']['qty_available']['string'] = _('Received Qty')
 
                 if location_info.usage == 'internal':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = _('Futur Stock')
+                        res['fields']['virtual_available']['string'] = _('Future Stock')
 
                 if location_info.usage == 'customer':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = _('Futur Deliveries')
+                        res['fields']['virtual_available']['string'] = _('Future Deliveries')
                     if fields.get('qty_available'):
                         res['fields']['qty_available']['string'] = _('Delivered Qty')
 
                 if location_info.usage == 'inventory':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = _('Futur P&L')
+                        res['fields']['virtual_available']['string'] = _('Future P&L')
                     res['fields']['qty_available']['string'] = _('P&L Qty')
 
                 if location_info.usage == 'procurement':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = _('Futur Qty')
+                        res['fields']['virtual_available']['string'] = _('Future Qty')
                     if fields.get('qty_available'):
                         res['fields']['qty_available']['string'] = _('Unplanned Qty')
 
                 if location_info.usage == 'production':
                     if fields.get('virtual_available'):
-                        res['fields']['virtual_available']['string'] = _('Futur Productions')
+                        res['fields']['virtual_available']['string'] = _('Future Productions')
                     if fields.get('qty_available'):
                         res['fields']['qty_available']['string'] = _('Produced Qty')
 
@@ -222,7 +222,7 @@ class product_template(osv.osv):
             'stock.location',
             type='many2one',
             relation='stock.location',
-            string="Procurement Location",
+            string="Requisition Location",
             method=True,
             view_load=True,
             domain=[('usage','like','procurement')],
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index e8ee007b173..fb615a2a3d2 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -56,6 +56,8 @@ class report_stock(report_int):
         dt_to = now
 
         names = dict(pooler.get_pool(cr.dbname).get('product.product').name_get(cr, uid, product_ids))
+        for name in names:
+            names[name] = names[name].encode('utf8')
         products = {}
         prods = pooler.get_pool(cr.dbname).get('stock.location')._product_all_get(cr, uid, location_id, product_ids)
 
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index bdb7c4eed74..793e06c90cb 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -17,5 +17,50 @@
         <field name="groups_id" eval="[(6,0,[ref('group_stock_manager')])]"/>
     </record>
 
+    <record model="ir.rule.group" id="stock_warehouse_comp_rule_group">
+        <field name="name">Warehouse multi-company</field>
+        <field name="model_id" ref="model_stock_warehouse"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="stock_warehouse_comp_rule">
+        <field name="field_id" search="[('model','=','stock.warehouse'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="stock_warehouse_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+
+    <record model="ir.rule.group" id="stock_location_comp_rule_group">
+        <field name="name">Location multi-company</field>
+        <field name="model_id" ref="model_stock_location"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="stock_location_comp_rule">
+        <field name="field_id" search="[('model','=','stock.location'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="stock_location_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+
+    <record model="ir.rule.group" id="stock_inventory_line_comp_rule_group">
+        <field name="name">Inventory Line multi-company</field>
+        <field name="model_id" ref="model_stock_inventory_line"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="stock_inventory_line_comp_rule">
+        <field name="field_id" search="[('model','=','stock.inventory.line'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="stock_inventory_line_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <record model="ir.rule.group" id="stock_inventory_comp_rule_group">
+        <field name="name">Inventory multi-company</field>
+        <field name="model_id" ref="model_stock_inventory"/>
+        <field name="global" eval="True"/>
+    </record>
+    <record model="ir.rule" id="stock_inventory_comp_rule">
+        <field name="field_id" search="[('model','=','stock.inventory'),('name','=','company_id')]" model="ir.model.fields"/>
+        <field name="rule_group" ref="stock_inventory_comp_rule_group"/>
+        <field name="domain_force">['|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b76ae30fd70..9a7123f06da 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -130,6 +130,7 @@ class stock_location(osv.osv):
     _columns = {
         'name': fields.char('Location Name', size=64, required=True, translate=True),
         'active': fields.boolean('Active'),
+        'company_id': fields.many2one('res.company','Company',required=True),
         'usage': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production')], 'Location Type', required=True),
         'allocation_method': fields.selection([('fifo', 'FIFO'), ('lifo', 'LIFO'), ('nearest', 'Nearest')], 'Allocation Method', required=True),
 
@@ -174,6 +175,7 @@ class stock_location(osv.osv):
         'allocation_method': lambda *a: 'fifo',
         'chained_location_type': lambda *a: 'none',
         'chained_auto_packing': lambda *a: 'manual',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.location', c),
         'posx': lambda *a: 0,
         'posy': lambda *a: 0,
         'posz': lambda *a: 0,
@@ -373,7 +375,7 @@ stock_tracking()
 #----------------------------------------------------------
 class stock_picking(osv.osv):
     _name = "stock.picking"
-    _description = "Packing List"
+    _description = "Picking List"
 
     def _set_maximum_date(self, cr, uid, ids, name, value, arg, context):
         if not value:
@@ -459,18 +461,18 @@ class stock_picking(osv.osv):
             \n* The \'Available\' state is set automatically when the products are ready to be moved.\
             \n* The \'Waiting\' state is used in MTO moves when a movement is waiting for another one.'),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
-                 method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Packing. Default it takes current date"),
+                 method=True, store=True, type='datetime', string='Planned Date', select=1, help="Planned date for Picking. Default it takes current date"),
         'date': fields.datetime('Date Order', help="Date of Order"),
         'date_done': fields.datetime('Date Done', help="Date of completion"),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  method=True, store=True, type='datetime', string='Max. Planned Date', select=2),
-        'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
-        'auto_picking': fields.boolean('Auto-Packing'),
+        'move_lines': fields.one2many('stock.move', 'picking_id', 'Entry lines', states={'done': [('readonly', True)], 'cancel': [('readonly', True)]}),
+        'auto_picking': fields.boolean('Auto-Picking'),
         'address_id': fields.many2one('res.partner.address', 'Partner', help="Address of partner"),
         'invoice_state': fields.selection([
             ("invoiced", "Invoiced"),
             ("2binvoiced", "To Be Invoiced"),
-            ("none", "Not from Packing")], "Invoice Status",
+            ("none", "Not from Picking")], "Invoice Status",
             select=True, required=True, readonly=True, states={'draft': [('readonly', False)]}),
     }
     _defaults = {
@@ -711,7 +713,7 @@ class stock_picking(osv.osv):
                     'name': (invoice.name or '') + ', ' + (picking.name or ''),
                     'origin': (invoice.origin or '') + ', ' + (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
                     'comment': (comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
-                    'date_invoice':context.get('date_inv',False)                    
+                    'date_invoice':context.get('date_inv',False)
                 }
                 invoice_obj.write(cursor, user, [invoice_id], invoice_vals, context=context)
             else:
@@ -765,6 +767,11 @@ class stock_picking(osv.osv):
                 tax_ids = self._get_taxes_invoice(cursor, user, move_line, type)
                 account_analytic_id = self._get_account_analytic_invoice(cursor,
                         user, picking, move_line)
+                
+                #set UoS if it's a sale and the picking doesn't have one
+                uos_id = move_line.product_uos and move_line.product_uos.id or False
+                if not uos_id and type in ('out_invoice', 'out_refund'):
+                    uos_id = move_line.product_uom.id
 
                 account_id = self.pool.get('account.fiscal.position').map_account(cursor, user, partner.property_account_position, account_id)
                 notes = False
@@ -772,12 +779,12 @@ class stock_picking(osv.osv):
                     notes = move_line.sale_line_id.notes
                 elif move_line.purchase_line_id:
                     notes = move_line.purchase_line_id.notes
-                
+
                 invoice_line_id = invoice_line_obj.create(cursor, user, {
                     'name': name,
                     'origin': origin,
                     'invoice_id': invoice_id,
-                    'uos_id': move_line.product_uos.id,
+                    'uos_id': uos_id,
                     'product_id': move_line.product_id.id,
                     'account_id': account_id,
                     'price_unit': price_unit,
@@ -785,7 +792,7 @@ class stock_picking(osv.osv):
                     'quantity': move_line.product_uos_qty or move_line.product_qty,
                     'invoice_line_tax_id': [(6, 0, tax_ids)],
                     'account_analytic_id': account_analytic_id,
-                    'note': notes,                    
+                    'note': notes,
                     }, context=context)
                 self._invoice_line_hook(cursor, user, move_line, invoice_line_id)
 
@@ -979,7 +986,7 @@ class stock_move(osv.osv):
         'move_dest_id': fields.many2one('stock.move', 'Dest. Move'),
         'move_history_ids': fields.many2many('stock.move', 'stock_move_history_ids', 'parent_id', 'child_id', 'Move History'),
         'move_history_ids2': fields.many2many('stock.move', 'stock_move_history_ids', 'child_id', 'parent_id', 'Move History'),
-        'picking_id': fields.many2one('stock.picking', 'Packing List', select=True),
+        'picking_id': fields.many2one('stock.picking', 'Picking List', select=True),
 
         'note': fields.text('Notes'),
 
@@ -1054,15 +1061,38 @@ class stock_move(osv.osv):
                 'message': 'You are moving %.2f products but only %.2f available in this lot.' % (product_qty, prodlot.stock_available or 0.0)
             }
         return {'warning': warning}
-
+    
+    def onchange_quantity(self, cr, uid, ids, product_id, product_qty, product_uom, product_uos):
+        result = {
+                  'product_uos_qty': 0.00
+          }
+        
+        if (not product_id) or (product_qty <=0.0):
+            return {'value': result}
+            
+        product_obj = self.pool.get('product.product')
+        uos_coeff = product_obj.read(cr, uid, product_id, ['uos_coeff'])
+        
+        if product_uos and product_uom and (product_uom != product_uos):
+            result['product_uos_qty'] = product_qty * uos_coeff['uos_coeff']
+        else:
+            result['product_uos_qty'] = product_qty
+        
+        return {'value': result}
+    
     def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False, loc_dest_id=False):
         if not prod_id:
             return {}
         product = self.pool.get('product.product').browse(cr, uid, [prod_id])[0]
+        uos_id  = product.uos_id and product.uos_id.id or False
         result = {
-            'name': product.name,
+            'name': product.partner_ref,
             'product_uom': product.uom_id.id,
+            'product_uos': uos_id,
+            'product_qty': 1.00,
+            'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty']
         }
+        
         if loc_id:
             result['location_id'] = loc_id
         if loc_dest_id:
@@ -1169,8 +1199,8 @@ class stock_move(osv.osv):
                 if res:
                     #_product_available_test depends on the next status for correct functioning
                     #the test does not work correctly if the same product occurs multiple times
-                    #in the same order. This is e.g. the case when using the button 'split in two' of 
-                    #the stock outgoing form                    
+                    #in the same order. This is e.g. the case when using the button 'split in two' of
+                    #the stock outgoing form
                     self.write(cr, uid, move.id, {'state':'assigned'})
                     done.append(move.id)
                     pickings[move.picking_id.id] = 1
@@ -1347,10 +1377,12 @@ class stock_inventory(osv.osv):
         'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
         'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('cancel','Cancelled')), 'State', readonly=True),
+        'company_id': fields.many2one('res.company','Company',required=True),
     }
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'state': lambda *a: 'draft',
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', c)
     }
 
     #
@@ -1417,7 +1449,8 @@ class stock_inventory_line(osv.osv):
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
-        'product_qty': fields.float('Quantity')
+        'product_qty': fields.float('Quantity'),
+        'company_id': fields.related('inventory_id','company_id',type='many2one',object='res.company',string='Company')
     }
 
     def on_change_product_id(self, cr, uid, ids, location_id, product, uom=False):
@@ -1442,12 +1475,15 @@ class stock_warehouse(osv.osv):
     _columns = {
         'name': fields.char('Name', size=60, required=True),
 #       'partner_id': fields.many2one('res.partner', 'Owner'),
+        'company_id': fields.many2one('res.company','Company',required=True),
         'partner_address_id': fields.many2one('res.partner.address', 'Owner Address'),
         'lot_input_id': fields.many2one('stock.location', 'Location Input', required=True),
         'lot_stock_id': fields.many2one('stock.location', 'Location Stock', required=True),
         'lot_output_id': fields.many2one('stock.location', 'Location Output', required=True),
     }
-
+    _defaults = {
+        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.inventory', c)
+    }
 stock_warehouse()
 
 
@@ -1471,9 +1507,9 @@ class stock_picking_move_wizard(osv.osv_memory):
     _columns = {
         'name': fields.char('Name', size=64, invisible=True),
         #'move_lines': fields.one2many('stock.move', 'picking_id', 'Move lines',readonly=True),
-        'move_ids': fields.many2many('stock.move', 'picking_move_wizard_rel', 'picking_move_wizard_id', 'move_id', 'Move lines', required=True),
+        'move_ids': fields.many2many('stock.move', 'picking_move_wizard_rel', 'picking_move_wizard_id', 'move_id', 'Entry lines', required=True),
         'address_id': fields.many2one('res.partner.address', 'Dest. Address', invisible=True),
-        'picking_id': fields.many2one('stock.picking', 'Packing list', select=True, invisible=True),
+        'picking_id': fields.many2one('stock.picking', 'Picking list', select=True, invisible=True),
     }
     _defaults = {
         'picking_id': _get_picking,
@@ -1500,4 +1536,4 @@ class stock_picking_move_wizard(osv.osv_memory):
 
 stock_picking_move_wizard()
 
-# 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/stock/stock_report.xml b/addons/stock/stock_report.xml
index ed71ca90635..d72106eead6 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -5,8 +5,8 @@
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Future Stock Forecast"/>
 
 
-<!--        <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Packing list" xml="stock/report/picking.xml" xsl="stock/report/picking.xsl"/>-->
-        <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Packing list" rml="stock/report/picking.rml"/>
+<!--        <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" xml="stock/report/picking.xml" xsl="stock/report/picking.xsl"/>-->
+        <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Print Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
 
         <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Overview" rml="stock/report/lot_overview.rml"/>
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 464d0035584..d002b62ae83 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -2,20 +2,20 @@
 <openerp>
     <data noupdate="1">
         <!--
-    Sequences for packings
+    Sequences for pickings
     -->
-        
+
         <record id="seq_type_picking" model="ir.sequence.type">
-            <field name="name">Packing</field>
+            <field name="name">Picking</field>
             <field name="code">stock.picking</field>
         </record>
 
         <record id="seq_picking" model="ir.sequence">
-            <field name="name">Packing</field>
+            <field name="name">Picking</field>
             <field name="code">stock.picking</field>
             <field name="prefix">PACK</field>
         </record>
-        
+
         <!--
     Sequences from tracking numbers
     -->
@@ -31,12 +31,12 @@
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
-        
+
         <record id="sequence_type_tracking" model="ir.sequence.type">
             <field name="name">Stock Tracking Lots</field>
             <field name="code">stock.lot.tracking</field>
         </record>
-        
+
         <record id="sequence_tracking" model="ir.sequence">
             <field name="name">Stock Tracking Lots</field>
             <field name="code">stock.lot.tracking</field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f1b52bad331..a2dfb9d5e5d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -79,7 +79,7 @@
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_inventory_tree"/>
-            <field name="context">{'full':'1'}</field>            
+            <field name="context">{'full':'1'}</field>
         </record>
         <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_root"/>
 
@@ -89,7 +89,7 @@
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
             <field name="domain">[('state','=','draft')]</field>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_inventory_form_new" model="ir.actions.act_window">
@@ -98,7 +98,7 @@
             <field name="res_model">stock.inventory</field>
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
-            <field name="domain">[('state','=','draft')]</field>            
+            <field name="domain">[('state','=','draft')]</field>
         </record>
 
         =============================
@@ -223,7 +223,7 @@
             <field name="res_model">stock.production.lot</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_production_lot_tree"/>
-            <field name="context">{'full':'1'}</field>            
+            <field name="context">{'full':'1'}</field>
         </record>
         <menuitem action="action_production_lot_form" id="menu_action_production_lot_form" parent="menu_traceability"/>
 
@@ -231,7 +231,7 @@
         # Lot composition (history)
         #
         <record id="stock_move_tree" model="ir.ui.view">
-            <field name="name">stock.move.tree2</field>
+            <field name="name">Stock Moves</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids</field>
@@ -253,7 +253,7 @@
         </record>
 
         <record id="stock_move_tree2" model="ir.ui.view">
-            <field name="name">stock.move.tree2</field>
+            <field name="name">Stock Moves</field>
             <field name="model">stock.move</field>
             <field name="type">tree</field>
             <field name="field_parent">move_history_ids2</field>
@@ -386,7 +386,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="view_location_tree2"/>
-            <field name="context">{'full':'1'}</field>            
+            <field name="context">{'full':'1'}</field>
         </record>
         <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration"/>
 
@@ -410,7 +410,7 @@
             <field name="view_id" ref="view_location_tree"/>
         </record>
         <menuitem action="action_location_tree" id="menu_action_location_tree" parent="menu_stock_root"/>
-		
+
         =============================
         Warehouse
         =============================
@@ -460,7 +460,7 @@
             <field name="model">stock.picking.move.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Move Lines">
+                <form string="Entry Lines">
                     <field name="address_id" invisible="True" context="{'contact_display':'partner'}"/>
                     <field name="picking_id" invisible="True"/>
                     <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"/><newline/>
@@ -485,7 +485,7 @@
 
 
         =============================
-        Packing
+        Picking
         =============================
         <record model="ir.ui.view" id="stock_picking_calendar">
             <field name="name">stock.picking.calendar</field>
@@ -505,7 +505,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree color="red:state=='cancel'" string="Packing list">
+                <tree color="red:state=='cancel'" string="Picking list">
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="address_id" select="1"/>
@@ -522,7 +522,7 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Packing list">
+                <form string="Picking list">
                     <group colspan="4" col="6">
                         <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
                         <field name="type"/>
@@ -538,9 +538,9 @@
                                     <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
                                     <field name="location_dest_id" select="1" domain="[('usage','=','internal')]"/>
                                     <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                    <field name="product_qty" select="1"/>
+                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" select="1"/>
-                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field groups="product.group_uos" name="product_uos_qty"/>
                                     <field colspan="4" invisible="1" name="name" select="1"/>
                                     <field invisible="1" name="date"/>
@@ -566,7 +566,7 @@
                             </field>
                             <group col="7" colspan="4">
                                 <label colspan="6"/>
-                                <button name="%(move_split)d" string="Split move lines in two" type="action" icon="gtk-justify-fill"/>
+                                <button name="%(move_split)d" string="Split Entry Lines in two" type="action" icon="gtk-justify-fill"/>
                             </group>
                             <group col="10" colspan="4">
                                 <field name="state" readonly="1"/>
@@ -604,7 +604,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree color="red:state=='cancel'" string="Packing list">
+                <tree color="red:state=='cancel'" string="Picking list">
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="address_id" select="1"/>
@@ -620,7 +620,7 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Packing list">
+                <form string="Picking list">
                     <group col="6" colspan="4">
                         <field name="address_id" select="1"/>
                         <field name="type"/>
@@ -637,9 +637,9 @@
                                     <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
                                     <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
                                     <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                    <field name="product_qty" select="1"/>
+                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" select="1"/>
-                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field groups="product.group_uos" name="product_uos_qty"/>
                                     <field colspan="4" invisible="1" name="name" select="1"/>
                                     <field invisible="1" name="date"/>
@@ -715,7 +715,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="domain">[('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -746,7 +746,7 @@
             <field name="domain">[('state','=','assigned'),('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1_toproc" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -775,7 +775,7 @@
             <field name="domain">[('state','=','confirmed'),('type','=','delivery')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_delivery_view1_waiting" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -814,7 +814,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:state=='cancel';grey:state=='confirmed';blue:state=='done'" string="Packing list">            
+                <tree colors="red:state=='cancel';grey:state=='confirmed';blue:state=='done'" string="Picking list">
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="address_id"/>
@@ -831,7 +831,7 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Packing list">
+                <form string="Picking list">
                     <group col="6" colspan="4">
                         <field name="address_id" select="2"/>
                         <field name="type"/>
@@ -849,9 +849,9 @@
                                     <field name="location_id" select="1" domain="[('usage','=','internal')]"/>
                                     <field name="location_dest_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
                                     <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                    <field name="product_qty" select="1"/>
+                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" />
                                     <field name="product_uom" select="1"/>
-                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field groups="product.group_uos" name="product_uos_qty"/>
                                     <field colspan="4" invisible="1" name="name" select="1"/>
                                     <field invisible="1" name="date"/>
@@ -883,7 +883,7 @@
                                 <button name="draft_validate" states="draft" string="Process Now" type="object" icon="gtk-yes"/>
                                 <button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-apply"/>
                                 <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                <button name="%(partial_picking)d" states="assigned" string="Packing Done" type="action" icon="gtk-execute"/>
+                                <button name="%(partial_picking)d" states="assigned" string="Picking Done" type="action" icon="gtk-execute"/>
                                 <button name="button_cancel" states="assigned,confirmed,draft" string="Cancel" icon="gtk-cancel"/>
                             </group>
                         </page>
@@ -912,7 +912,7 @@
             <field name="domain">[('type','=','out')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree_out_view1_waiting" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -934,7 +934,7 @@
         <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_root" sequence="19"/>
 
         <record id="action_picking_tree2" model="ir.actions.act_window">
-            <field name="name">Available Packing</field>
+            <field name="name">Available Picking</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -942,7 +942,7 @@
             <field name="domain">[('state','=','assigned'),('type','=','out')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree2_out_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -963,7 +963,7 @@
         </record>
 
         <record id="action_picking_tree3" model="ir.actions.act_window">
-            <field name="name">Confirmed Packing Waiting Availability</field>
+            <field name="name">Confirmed Picking Waiting Availability</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -971,7 +971,7 @@
             <field name="domain">[('state','=','confirmed'),('type','=','out')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_picking_tree3_out_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -999,7 +999,7 @@
             <field name="model">stock.picking</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree color="red:state=='cancel'" string="Packing list">
+                <tree color="red:state=='cancel'" string="Picking list">
                     <field name="name"/>
                     <field name="origin"/>
                     <field name="address_id"/>
@@ -1016,7 +1016,7 @@
             <field name="model">stock.picking</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Input Packing List">
+                <form string="Input Picking List">
                     <group colspan="4" col="6">
                         <field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'contact_display':'partner'}"/>
                         <field name="type"/>
@@ -1042,16 +1042,16 @@
                                     <field name="location_id" select="1" domain="[('usage','&lt;&gt;','view')]"/>
                                     <field domain="[('usage','=','internal')]" name="location_dest_id" select="1"/>
                                     <field colspan="4" context="location=location_id" name="product_id" on_change="onchange_product_id(product_id, location_id, location_dest_id)" select="1"/>
-                                    <field name="product_qty" select="1"/>
+                                    <field name="product_qty" select="1" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field name="product_uom" select="1"/>
-                                    <field groups="product.group_uos" name="product_uos"/>
+                                    <field groups="product.group_uos" name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                     <field groups="product.group_uos" name="product_uos_qty"/>
                                     <field colspan="4" invisible="1" name="name" select="1"/>
                                     <field groups="base.group_extended" name="date_planned"/>
                                     <newline/>
                                     <newline/>
                                     <field groups="base.group_extended" name="product_packaging"/>
-                                    <newline/>                                    
+                                    <newline/>
                                     <field name="prodlot_id" select="1"
                                         context="{'location_id':location_id, 'product_id':product_id}"
                                         domain="[('product_id','=',product_id)]"
@@ -1100,7 +1100,7 @@
             <field name="domain">[('type','=','in')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_invoice_tree5_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -1122,7 +1122,7 @@
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_root" sequence="17"/>
 
         <record id="action_picking_tree5" model="ir.actions.act_window">
-            <field name="name">Packing to Process</field>
+            <field name="name">Picking to Process</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1130,7 +1130,7 @@
             <field name="domain">[('state','=','assigned'),('type','=','in')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <record id="action_invoice_tree6_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -1152,7 +1152,7 @@
         <menuitem action="action_picking_tree5" id="menu_action_picking_tree5" parent="menu_action_picking_tree4" groups="base.group_extended"/>
 
         <record id="action_picking_form" model="ir.actions.act_window">
-            <field name="name">New Reception Packing</field>
+            <field name="name">New Reception Picking</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1188,13 +1188,13 @@
             <field name="domain">[('type','=','internal')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
         <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_root" sequence="18"/>
 
 
         <record id="action_picking_tree7" model="ir.actions.act_window">
-            <field name="name">Available Packing</field>
+            <field name="name">Available Picking</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1202,11 +1202,11 @@
             <field name="domain">[('state','=','assigned'),('type','=','internal')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
 
         <record id="action_picking_tree8" model="ir.actions.act_window">
-            <field name="name">Confirmed Packing Waiting Availability</field>
+            <field name="name">Confirmed Picking Waiting Availability</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1214,11 +1214,11 @@
             <field name="domain">[('state','=','confirmed'),('type','=','internal')]</field>
             <field name="context">{'contact_display': 'partner'}</field>
             <field name="filter" eval="True"/>
-            <field name="search_view_id" ref="view_stock_delivery_filter"/>            
+            <field name="search_view_id" ref="view_stock_delivery_filter"/>
         </record>
 
         <record id="action_picking_tree9" model="ir.actions.act_window">
-            <field name="name">New Internal Packing</field>
+            <field name="name">New Internal Picking</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1246,7 +1246,7 @@
                 <tree color="grey:state=='cancel'" string="Moves">
                     <field name="name"/>
                     <field name="product_id"/>
-                    <field name="product_qty"/>
+                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" string="UOM"/>
                     <field name="picking_id" select="1"/>
                     <field name="prodlot_id"/>
@@ -1271,8 +1271,9 @@
                     <field name="location_id" select="1"/>
                     <field name="location_dest_id" select="1"/>
                     <field colspan="4" name="product_id" select="1"/>
-                    <field name="product_qty" select="2"/>
+                    <field name="product_qty" select="2" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                     <field name="product_uom" select="2"/>
+                    <field name="product_uos" select="2"/>
                     <field colspan="4" name="name" select="2"/>
                     <field name="date"/>
                     <field name="date_planned"/>
@@ -1316,7 +1317,7 @@
             <field name="view_type">form</field>
             <field name="domain">[('state','=','draft')]</field>
             <field name="view_id" ref="view_move_tree"/>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_move_form4" model="ir.actions.act_window">
@@ -1326,11 +1327,11 @@
             <field name="view_type">form</field>
             <field name="domain">[('state','=','assigned')]</field>
             <field name="view_id" ref="view_move_tree"/>
-            <field name="filter" eval="True"/>            
+            <field name="filter" eval="True"/>
         </record>
 
         <record id="action_picking_all" model="ir.actions.act_window">
-            <field name="name">Packing</field>
+            <field name="name">Picking</field>
             <field name="res_model">stock.picking</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
@@ -1388,14 +1389,14 @@
             domain="[('product_id','=',active_id)]"
             id="act_product_stock_move_open"
             name="All Stock Moves"
-            res_model="stock.move" 
+            res_model="stock.move"
             src_model="product.product"/>
 
         <act_window
             domain="[('move_lines','in',[active_id])]"
             id="act_relate_picking"
             name="Related Picking"
-            res_model="stock.picking" 
+            res_model="stock.picking"
             src_model="stock.move"/>
 
         <act_window
@@ -1403,7 +1404,7 @@
             domain="[('product_id','=',active_id),('state','in',('waiting','confirmed','assigned'))]"
             id="act_product_stock_move_futur_open"
             name="Future Stock Moves"
-            res_model="stock.move" 
+            res_model="stock.move"
             src_model="product.product"/>
 
         <record id="ir_act_product_location_open" model="ir.values">
diff --git a/addons/stock/stock_wizard.xml b/addons/stock/stock_wizard.xml
index df268a0a574..319e8926bb7 100644
--- a/addons/stock/stock_wizard.xml
+++ b/addons/stock/stock_wizard.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <!--
         <wizard string="UPS xml file" model="stock.move.lot" name="stock.ups_xml" />
         -->
-        
-        
+
+
         <wizard
             id="move_split"
             model="stock.picking"
@@ -19,7 +19,7 @@
             model="stock.picking"
             multi="True"
             name="stock.partial_picking"
-            string="Partial packing"/>
+            string="Partial picking"/>
 
     <wizard
         id="track_line"
@@ -28,13 +28,13 @@
         name="stock.move.track"
         string="Track line"/>
 
-    <wizard id="make_picking" model="stock.picking" multi="True" name="stock.picking.make" string="Make packing"/>
+    <wizard id="make_picking" model="stock.picking" multi="True" name="stock.picking.make" string="Make picking"/>
 
     <wizard
         id="return_picking"
         model="stock.picking"
         name="stock.return.picking"
-        string="Return packing"/>
+        string="Return picking"/>
 
     <wizard
         id="wizard_invoice_onshipping"
@@ -70,6 +70,6 @@
         id="location_product"
         model="stock.location"
         name="stock.location.products"
-        string="Products by Location"/> 
+        string="Products by Location"/>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/wizard_invoice_onshipping.py b/addons/stock/wizard/wizard_invoice_onshipping.py
index e1322ef337d..3105e778133 100644
--- a/addons/stock/wizard/wizard_invoice_onshipping.py
+++ b/addons/stock/wizard/wizard_invoice_onshipping.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -32,7 +32,7 @@ invoice_form = """<?xml version="1.0"?>
     <newline/>
     <field name="type"/>
     <newline/>
-    <field name="invoice_date" />    
+    <field name="invoice_date" />
 </form>
 """
 
@@ -53,7 +53,7 @@ invoice_fields = {
         'selection': [],
         'required': True
     },
-    'invoice_date': {'string': 'Invoiced date', 'type':'date' }    
+    'invoice_date': {'string': 'Invoiced date', 'type':'date' }
 }
 
 def _get_type(obj, cr, uid, data, context):
@@ -63,7 +63,7 @@ def _get_type(obj, cr, uid, data, context):
     if pick.invoice_state == 'invoiced':
         raise wizard.except_wizard(_('UserError'), _('Invoice is already created.'))
     if pick.invoice_state == 'none':
-        raise wizard.except_wizard(_('UserError'), _('Invoice cannot be created from Packing.'))
+        raise wizard.except_wizard(_('UserError'), _('Invoice cannot be created from Picking.'))
 
     if pick.move_lines:
         usage = pick.move_lines[0].location_id.usage
@@ -85,7 +85,7 @@ def _get_type(obj, cr, uid, data, context):
             ('out_refund', 'Customer Refund'),
             ('in_refund', 'Supplier Refund'),
             ]
-                    
+
     if pick.type == 'out' and usage == 'supplier':
         type = 'in_refund'
     elif pick.type == 'out' and usage == 'customer':
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index 8f26ff011c0..416558735ff 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -27,13 +27,14 @@ import pooler
 import wizard
 from osv import osv
 import tools
+from tools.translate import _
 
 _moves_arch = UpdateableStr()
 _moves_fields = UpdateableDict()
 
 _moves_arch_end = '''<?xml version="1.0"?>
-<form string="Packing result">
-    <label string="The packing has been successfully made !" colspan="4"/>
+<form string="Picking result">
+    <label string="The picking has been successfully made !" colspan="4"/>
     <field name="back_order_notification" colspan="4" nolabel="1"/>
 </form>'''
 _moves_fields_end = {
@@ -54,7 +55,7 @@ def _get_moves(self, cr, uid, data, context):
     res = {}
 
     _moves_fields.clear()
-    _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make packing">']
+    _moves_arch_lst = ['<?xml version="1.0"?>', '<form string="Make picking">']
 
     for m in pick.move_lines:
         quantity = m.product_qty
@@ -63,7 +64,7 @@ def _get_moves(self, cr, uid, data, context):
 
         _moves_arch_lst.append('<field name="move%s" />' % (m.id,))
         _moves_fields['move%s' % m.id] = {
-                'string': '%s - %s' % (_to_xml(m.product_id.code or '/'), _to_xml(m.product_id.name)),
+                'string': _to_xml(m.name),
                 'type' : 'float', 'required' : True, 'default' : make_default(quantity)}
 
         if (pick.type == 'in') and (m.product_id.cost_method == 'average'):
@@ -208,7 +209,7 @@ def _do_split(self, cr, uid, data, context):
 
 def _get_default(self, cr, uid, data, context):
     if data['form']['back_order']:
-        data['form']['back_order_notification'] = _('Back Order %s Assigned to this Packing.') % (tools.ustr(data['form']['back_order']),)
+        data['form']['back_order_notification'] = _('Back Order %s Assigned to this Picking.') % (tools.ustr(data['form']['back_order']),)
     return data['form']
 
 class partial_picking(wizard.interface):
diff --git a/addons/stock/wizard/wizard_picking_make.py b/addons/stock/wizard/wizard_picking_make.py
index 31d3dd7d489..42b2f2f1d96 100644
--- a/addons/stock/wizard/wizard_picking_make.py
+++ b/addons/stock/wizard/wizard_picking_make.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -24,14 +24,14 @@ import pooler
 import netsvc
 
 ARCH = '''<?xml version="1.0"?>
-<form string="Make packing">
+<form string="Make picking">
     <field name="pickings" nolabel="1" colspan="4"
         width="600" height="300"/>
 </form>'''
 
 FIELDS = {
     'pickings': {
-        'string': 'Packing',
+        'string': 'Picking',
         'type': 'one2many',
         'relation': 'stock.picking',
         'readonly': True,
diff --git a/addons/stock/wizard/wizard_return.py b/addons/stock/wizard/wizard_return.py
index 8e035556b05..e6ce8ffc686 100644
--- a/addons/stock/wizard/wizard_return.py
+++ b/addons/stock/wizard/wizard_return.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -46,7 +46,7 @@ def _get_returns(self, cr, uid, data, context):
     for m in [line for line in pick.move_lines]:
         quantity=m.product_qty
         arch_lst.append('<field name="return%s"/>\n<newline/>' % (m.id,))
-        fields['return%s' % m.id]={'string':m.product_id.name, 'type':'float', 'required':True, 'default':make_default(quantity)}
+        fields['return%s' % m.id]={'string':m.name, 'type':'float', 'required':True, 'default':make_default(quantity)}
         res.setdefault('returns', []).append(m.id)
     arch_lst.append('<field name="invoice_state"/>\n<newline/>')
     if pick.invoice_state=='invoiced':
@@ -77,7 +77,7 @@ def _create_returns(self, cr, uid, data, context):
             else:
                 new_type='internal'
             new_picking=pick_obj.copy(cr, uid, pick.id, {'name':'%s (return)' % pick.name,
-                    'move_lines':[], 'state':'draft', 'type':new_type, 
+                    'move_lines':[], 'state':'draft', 'type':new_type,
                     'date':date_cur, 'invoice_state':data['form']['invoice_state'],})
         new_location=move.location_dest_id.id
 
@@ -101,7 +101,7 @@ def _action_open_window(self, cr, uid, data, context):
         return {}
     return {
         'domain': "[('id', 'in', ["+str(res)+"])]",
-        'name': 'Packing List',
+        'name': 'Picking List',
         'view_type':'form',
         'view_mode':'tree,form',
         'res_model':'stock.picking',
diff --git a/addons/stock_location/stock_view.xml b/addons/stock_location/stock_view.xml
index bdb62963c09..b3730cb4979 100644
--- a/addons/stock_location/stock_view.xml
+++ b/addons/stock_location/stock_view.xml
@@ -40,7 +40,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <page string="Procurement &amp; Locations">
+                <page string="Requisition &amp; Locations">
                     <field name="path_ids" editable="bottom" colspan="4" nolabel="1">
                         <tree string="Location Paths" editable="bottom">
                             <field name="location_from_id"/>
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 49ad477759a..62c26a5390f 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -39,6 +39,12 @@ class subscription_document(osv.osv):
     _defaults = {
         'active' : lambda *a: True,
     }
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        if 'model' in vals:
+            raise osv.except_osv(_('Error !'),_('You cannot modify the Object linked to the Document Type!\nCreate another Document instead !'))
+        return super(subscription_document, self).write(cr, uid, ids, vals, context=context)
+    
 subscription_document()
 
 class subscription_document_fields(osv.osv):
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index 927281a203a..68cd3143d7d 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -78,7 +78,7 @@ class sale_order(osv.osv):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
             
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
 sale_order()
 
 
@@ -106,7 +106,7 @@ class purchase_order(osv.osv):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
             
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 purchase_order()
 
@@ -145,7 +145,7 @@ class account_invoice(osv.osv):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
         
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 account_invoice()
 
@@ -173,7 +173,7 @@ class stock_picking(osv.osv):
             warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
         
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 stock_picking()
 
@@ -228,7 +228,7 @@ class sale_order_line(osv.osv):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
         
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 sale_order_line()
 
@@ -259,7 +259,7 @@ class purchase_order_line(osv.osv):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
             warning['message'] = message and message +'\n\n'+result['warning']['message'] or result['warning']['message']
         
-        return {'value': result['value'], 'warning':warning}
+        return {'value': result.get('value',{}), 'warning':warning}
     
 purchase_order_line()
 
diff --git a/addons/wiki/i18n/pt.po b/addons/wiki/i18n/pt.po
index 8bad7100562..2ab074ef554 100644
--- a/addons/wiki/i18n/pt.po
+++ b/addons/wiki/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:11+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-29 00:24+0000\n"
+"Last-Translator: Paulino <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: 2009-11-17 05:17+0000\n"
+"X-Launchpad-Export-Date: 2009-11-30 04:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -145,7 +145,7 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki,write_uid:0
 msgid "Last Author"
-msgstr ""
+msgstr "Ultimo Autor"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_view_diff
@@ -196,7 +196,7 @@ msgstr "XML inválido para a arquitectura de vista"
 #. module: wiki
 #: field:wiki.wiki.history,text_area:0
 msgid "Text area"
-msgstr ""
+msgstr "Área de texto"
 
 #. module: wiki
 #: wizard_field:wiki.create.menu,init,menu_parent_id:0
@@ -320,7 +320,7 @@ msgstr ""
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
 msgid "Modify By"
-msgstr ""
+msgstr "Modificado Por"
 
 #. module: wiki
 #: field:wiki.wiki,toc:0