[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121130111416-rust1fu0xwo132fn

297 files changed, 12554 insertions, 4469 deletions

diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index c538614fd0f..019af2cdef5 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -73,7 +73,6 @@ for a particular financial year and for preparation of vouchers there is a modul
         'wizard/account_fiscalyear_close_state.xml',
         'wizard/account_chart_view.xml',
         'wizard/account_tax_chart_view.xml',
-        'wizard/account_move_journal_view.xml',
         'wizard/account_move_line_reconcile_select_view.xml',
         'wizard/account_open_closed_fiscalyear_view.xml',
         'wizard/account_move_line_unreconcile_select_view.xml',
@@ -128,9 +127,11 @@ for a particular financial year and for preparation of vouchers there is a modul
     ],
     'js': [
         'static/src/js/account_move_reconciliation.js',
+        'static/src/js/account_move_line_quickadd.js',
     ],
     'qweb' : [
         "static/src/xml/account_move_reconciliation.xml",
+        "static/src/xml/account_move_line_quickadd.xml",
     ],
     'css':['static/src/css/account_move_reconciliation.css'
     ],
diff --git a/addons/account/account.py b/addons/account/account.py
index cfba30856a9..438dff47aae 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -641,8 +641,7 @@ class account_account(osv.osv):
         return True
 
     def _check_allow_type_change(self, cr, uid, ids, new_type, context=None):
-        group1 = ['payable', 'receivable', 'other']
-        group2 = ['consolidation','view']
+        restricted_groups = ['consolidation','view']
         line_obj = self.pool.get('account.move.line')
         for account in self.browse(cr, uid, ids, context=context):
             old_type = account.type
@@ -650,14 +649,25 @@ class account_account(osv.osv):
             if line_obj.search(cr, uid, [('account_id', 'in', account_ids)]):
                 #Check for 'Closed' type
                 if old_type == 'closed' and new_type !='closed':
-                    raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from 'Closed' to any other type which contains journal items!"))
-                #Check for change From group1 to group2 and vice versa
-                if (old_type in group1 and new_type in group2) or (old_type in group2 and new_type in group1):
-                    raise osv.except_osv(_('Warning!'), _("You cannot change the type of account from '%s' to '%s' type as it contains journal items!") % (old_type,new_type,))
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account from 'Closed' to any other type as it contains journal items!"))
+                # Forbid to change an account type for restricted_groups as it contains journal items (or if one of its children does)
+                if (new_type in restricted_groups):
+                    raise osv.except_osv(_('Warning !'), _("You cannot change the type of account to '%s' type as it contains journal items!") % (new_type,))
+
         return True
 
-    def write(self, cr, uid, ids, vals, context=None):
+    # For legal reason (forbiden to modify journal entries which belongs to a closed fy or period), Forbid to modify
+    # the code of an account if journal entries have been already posted on this account. This cannot be simply 
+    # 'configurable' since it can lead to a lack of confidence in OpenERP and this is what we want to change.
+    def _check_allow_code_change(self, cr, uid, ids, context=None):
+        line_obj = self.pool.get('account.move.line')
+        for account in self.browse(cr, uid, ids, context=context):
+            account_ids = self.search(cr, uid, [('id', 'child_of', [account.id])], context=context)
+            if line_obj.search(cr, uid, [('account_id', 'in', account_ids)], context=context):
+                raise osv.except_osv(_('Warning !'), _("You cannot change the code of account which contains journal items!"))
+        return True
 
+    def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
         if not ids:
@@ -677,6 +687,8 @@ class account_account(osv.osv):
             self._check_moves(cr, uid, ids, "write", context=context)
         if 'type' in vals.keys():
             self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
+        if 'code' in vals.keys():
+            self._check_allow_code_change(cr, uid, ids, context=context)
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, context=None):
@@ -685,44 +697,6 @@ class account_account(osv.osv):
 
 account_account()
 
-class account_journal_view(osv.osv):
-    _name = "account.journal.view"
-    _description = "Journal View"
-    _columns = {
-        'name': fields.char('Journal View', size=64, required=True, translate=True),
-        'columns_id': fields.one2many('account.journal.column', 'view_id', 'Columns')
-    }
-    _order = "name"
-
-account_journal_view()
-
-
-class account_journal_column(osv.osv):
-
-    def _col_get(self, cr, user, context=None):
-        result = []
-        cols = self.pool.get('account.move.line')._columns
-        for col in cols:
-            if col in ('period_id', 'journal_id'):
-                continue
-            result.append( (col, cols[col].string) )
-        result.sort()
-        return result
-
-    _name = "account.journal.column"
-    _description = "Journal Column"
-    _columns = {
-        'name': fields.char('Column Name', size=64, required=True),
-        'field': fields.selection(_col_get, 'Field Name', required=True, size=32),
-        'view_id': fields.many2one('account.journal.view', 'Journal View', select=True),
-        'sequence': fields.integer('Sequence', help="Gives the sequence order to journal column.", readonly=True),
-        'required': fields.boolean('Required'),
-        'readonly': fields.boolean('Readonly'),
-    }
-    _order = "view_id, sequence"
-
-account_journal_column()
-
 class account_journal(osv.osv):
     _name = "account.journal"
     _description = "Journal"
@@ -738,7 +712,6 @@ class account_journal(osv.osv):
                                  " Select 'Opening/Closing Situation' for entries generated for new fiscal years."),
         'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
-        'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
         'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"),
         'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
         'centralisation': fields.boolean('Centralised Counterpart', help="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."),
@@ -874,37 +847,6 @@ class account_journal(osv.osv):
 
         return self.name_get(cr, user, ids, context=context)
 
-    def onchange_type(self, cr, uid, ids, type, currency, context=None):
-        obj_data = self.pool.get('ir.model.data')
-        user_pool = self.pool.get('res.users')
-
-        type_map = {
-            'sale':'account_sp_journal_view',
-            'sale_refund':'account_sp_refund_journal_view',
-            'purchase':'account_sp_journal_view',
-            'purchase_refund':'account_sp_refund_journal_view',
-            'cash':'account_journal_bank_view',
-            'bank':'account_journal_bank_view',
-            'general':'account_journal_view',
-            'situation':'account_journal_view'
-        }
-
-        res = {}
-        view_id = type_map.get(type, 'account_journal_view')
-        user = user_pool.browse(cr, uid, uid)
-        if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
-            view_id = 'account_journal_bank_view_multi'
-        data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
-        data = obj_data.browse(cr, uid, data_id[0], context=context)
-
-        res.update({
-            'centralisation':type == 'situation',
-            'view_id':data.res_id,
-        })
-        return {
-            'value':res
-        }
-
 account_journal()
 
 class account_fiscalyear(osv.osv):
@@ -1384,13 +1326,6 @@ class account_move(osv.osv):
                        'WHERE id IN %s', ('draft', tuple(ids),))
         return True
 
-    def onchange_line_id(self, cr, uid, ids, line_ids, context=None):
-        balance = 0.0
-        for line in line_ids:
-            if line[2]:
-                balance += (line[2].get('debit',0.00)- (line[2].get('credit',0.00)))
-        return {'value': {'balance': balance}}
-
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
@@ -1470,6 +1405,11 @@ class account_move(osv.osv):
                 raise osv.except_osv(_('User Error!'),
                         _('You cannot delete a posted journal entry "%s".') % \
                                 move['name'])
+            for line in move.line_id:
+                if line.invoice:
+                    raise osv.except_osv(_('User Error!'),
+                            _("Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)") % \
+                                    (line.invoice.number,move.name))
             line_ids = map(lambda x: x.id, move.line_id)
             context['journal_id'] = move.journal_id.id
             context['period_id'] = move.period_id.id
@@ -1678,11 +1618,41 @@ class account_move_reconcile(osv.osv):
         'line_id': fields.one2many('account.move.line', 'reconcile_id', 'Entry Lines'),
         'line_partial_ids': fields.one2many('account.move.line', 'reconcile_partial_id', 'Partial Entry lines'),
         'create_date': fields.date('Creation date', readonly=True),
+        'opening_reconciliation': fields.boolean('Opening Entries Reconciliation', help="Is this reconciliation produced by the opening of a new fiscal year ?."),
     }
     _defaults = {
         'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/',
     }
+    
+    # You cannot unlink a reconciliation if it is a opening_reconciliation one,
+    # you should use the generate opening entries wizard for that
+    def unlink(self, cr, uid, ids, context=None):
+        for move_rec in self.browse(cr, uid, ids, context=context):
+            if move_rec.opening_reconciliation:
+                raise osv.except_osv(_('Error!'), _('You cannot unreconcile journal items if they has been generated by the \
+                                                        opening/closing fiscal year process.'))
+        return super(account_move_reconcile, self).unlink(cr, uid, ids, context=context)
+    
+    # Look in the line_id and line_partial_ids to ensure the partner is the same or empty
+    # on all lines. We allow that only for opening/closing period
+    def _check_same_partner(self, cr, uid, ids, context=None):
+        for reconcile in self.browse(cr, uid, ids, context=context):
+            move_lines = []
+            if not reconcile.opening_reconciliation:
+                if reconcile.line_id:
+                    first_partner = reconcile.line_id[0].partner_id.id
+                    move_lines = reconcile.line_id
+                elif reconcile.line_partial_ids:
+                    first_partner = reconcile.line_partial_ids[0].partner_id.id
+                    move_lines = reconcile.line_partial_ids
+                if any([line.partner_id.id != first_partner for line in move_lines]):
+                    return False
+        return True
 
+    _constraints = [
+        (_check_same_partner, 'You can only reconcile journal items with the same partner.', ['line_id']),
+    ]
+    
     def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
         total = 0.0
         for rec in self.browse(cr, uid, ids, context=context):
@@ -3161,16 +3131,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     default_account = acc_template_ref.get(template.property_account_income_opening.id)
             return default_account
 
-        def _get_view_id(journal_type):
-            # Get the journal views
-            if journal_type in ('general', 'situation'):
-                data = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_view')
-            elif journal_type in ('sale_refund', 'purchase_refund'):
-                data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_refund_journal_view')
-            else:
-                data = obj_data.get_object_reference(cr, uid, 'account', 'account_sp_journal_view')
-            return data and data[1] or False
-
         journal_names = {
             'sale': _('Sales Journal'),
             'purchase': _('Purchase Journal'),
@@ -3200,7 +3160,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'code': journal_codes[journal_type],
                 'company_id': company_id,
                 'centralisation': journal_type == 'situation',
-                'view_id': _get_view_id(journal_type),
                 'analytic_journal_id': _get_analytic_journal(journal_type),
                 'default_credit_account_id': _get_default_account(journal_type, 'credit'),
                 'default_debit_account_id': _get_default_account(journal_type, 'debit'),
@@ -3417,11 +3376,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         '''
         obj_data = self.pool.get('ir.model.data')
         obj_journal = self.pool.get('account.journal')
-        # Get the id of journal views
-        tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view_multi')
-        view_id_cur = tmp and tmp[1] or False
-        tmp = obj_data.get_object_reference(cr, uid, 'account', 'account_journal_bank_view')
-        view_id_cash = tmp and tmp[1] or False
+        
 
         # we need to loop again to find next number for journal code
         # because we can't rely on the value current_num as,
@@ -3447,10 +3402,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'default_debit_account_id': default_account_id,
         }
         if line['currency_id']:
-            vals['view_id'] = view_id_cur
             vals['currency'] = line['currency_id']
-        else:
-            vals['view_id'] = view_id_cash
+        
         return vals
 
     def _prepare_bank_account(self, cr, uid, line, new_code, acc_template_ref, ref_acc_bank, company_id, context=None):
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index c836600d866..f0da630ec1d 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -89,11 +89,6 @@ class bank(osv.osv):
                 }
                 acc_bank_id  = obj_acc.create(cr,uid,acc,context=context)
 
-                # Get the journal view id
-                data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
-                data = obj_data.browse(cr, uid, data_id[0], context=context)
-                view_id_cash = data.res_id
-
                 jour_obj = self.pool.get('account.journal')
                 new_code = 1
                 while True:
@@ -112,7 +107,6 @@ class bank(osv.osv):
                     'analytic_journal_id': False,
                     'default_credit_account_id': acc_bank_id,
                     'default_debit_account_id': acc_bank_id,
-                    'view_id': view_id_cash
                 }
                 journal_id = jour_obj.create(cr, uid, vals_journal, context=context)
 
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 4422537007f..e7e3f740067 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -311,7 +311,7 @@ class account_bank_statement(osv.osv):
             'statement_id': st_line.statement_id.id,
             'journal_id': st_line.statement_id.journal_id.id,
             'period_id': st_line.statement_id.period_id.id,
-            'currency_id': cur_id,
+            'currency_id': amount_currency and cur_id,
             'amount_currency': amount_currency,
             'analytic_account_id': analytic_id,
         }
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 80a406bb0b7..8d13ec9dc8f 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1073,8 +1073,9 @@ class account_invoice(osv.osv):
                 self.message_post(cr, uid, [inv_id], body=message, context=context)
         return True
 
-    def action_cancel(self, cr, uid, ids, *args):
-        context = {} # TODO: Use context from arguments
+    def action_cancel(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         account_move_obj = self.pool.get('account.move')
         invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
         move_ids = [] # ones that we will need to remove
@@ -1244,12 +1245,15 @@ class account_invoice(osv.osv):
             ref = invoice.reference
         else:
             ref = self._convert_ref(cr, uid, invoice.number)
+        partner = invoice.partner_id
+        if partner.parent_id and not partner.is_company:
+            partner = partner.parent_id
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * pay_amount>0 and direction * pay_amount,
             'credit': direction * pay_amount<0 and - direction * pay_amount,
             'account_id': src_account_id,
-            'partner_id': invoice.partner_id.id,
+            'partner_id': partner.id,
             'ref':ref,
             'date': date,
             'currency_id':currency_id,
@@ -1260,7 +1264,7 @@ class account_invoice(osv.osv):
             'debit': direction * pay_amount<0 and - direction * pay_amount,
             'credit': direction * pay_amount>0 and direction * pay_amount,
             'account_id': pay_account_id,
-            'partner_id': invoice.partner_id.id,
+            'partner_id': partner.id,
             'ref':ref,
             'date': date,
             'currency_id':currency_id,
@@ -1377,8 +1381,8 @@ class account_invoice_line(osv.osv):
         'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."),
         'sequence': fields.integer('Sequence', help="Gives the sequence of this line when displaying the invoice."),
         'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True),
-        'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
-        'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
+        'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null', select=True),
+        'product_id': fields.many2one('product.product', 'Product', ondelete='set null', select=True),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float",
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 5c5a25880cb..48fec608195 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -435,7 +435,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                 </div>
                 </form>
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 00fad390282..7cc9768f00e 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -220,12 +220,11 @@ class account_move_line(osv.osv):
         return context
 
     def _default_get(self, cr, uid, fields, context=None):
+        #default_get should only do the following:
+        #   -propose the next amount in debit/credit in order to balance the move
+        #   -propose the next account from the journal (default debit/credit account) accordingly
         if context is None:
             context = {}
-        if not context.get('journal_id', False):
-            context['journal_id'] = context.get('search_default_journal_id')
-        if not context.get('period_id', False):
-            context['period_id'] = context.get('search_default_period_id')
         account_obj = self.pool.get('account.account')
         period_obj = self.pool.get('account.period')
         journal_obj = self.pool.get('account.journal')
@@ -234,134 +233,71 @@ class account_move_line(osv.osv):
         fiscal_pos_obj = self.pool.get('account.fiscal.position')
         partner_obj = self.pool.get('res.partner')
         currency_obj = self.pool.get('res.currency')
+
+        if not context.get('journal_id', False):
+            context['journal_id'] = context.get('search_default_journal_id', False)
+        if not context.get('period_id', False):
+            context['period_id'] = context.get('search_default_period_id', False)
         context = self.convert_to_period(cr, uid, context)
-        #pass the right context when search_defaul_journal_id
-        if context.get('search_default_journal_id',False):
-            context['journal_id'] = context.get('search_default_journal_id')
+
         # Compute simple values
         data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
-        # Starts: Manual entry from account.move form
-        if context.get('lines'):
-            total_new = context.get('balance', 0.00)
-            if context['journal']:
-                journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
-                if journal_data.type == 'purchase':
-                    if total_new > 0:
-                        account = journal_data.default_credit_account_id
-                    else:
-                        account = journal_data.default_debit_account_id
-                else:
-                    if total_new > 0:
-                        account = journal_data.default_credit_account_id
-                    else:
-                        account = journal_data.default_debit_account_id
-                if account and ((not fields) or ('debit' in fields) or ('credit' in fields)) and 'partner_id' in data and (data['partner_id']):
-                    part = partner_obj.browse(cr, uid, data['partner_id'], context=context)
-                    account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
-                    account = account_obj.browse(cr, uid, account, context=context)
-                    data['account_id'] =  account.id
-
-            s = -total_new
-            data['debit'] = s > 0 and s or 0.0
-            data['credit'] = s < 0 and -s or 0.0
-            data = self._default_get_move_form_hook(cr, uid, data)
-            return data
-        # Ends: Manual entry from account.move form
-        if not 'move_id' in fields: #we are not in manual entry
-            return data
-        # Compute the current move
-        move_id = False
-        partner_id = False
-        if context.get('journal_id', False) and context.get('period_id', False):
-            if 'move_id' in fields:
-                cr.execute('SELECT move_id \
-                    FROM \
-                        account_move_line \
-                    WHERE \
-                        journal_id = %s and period_id = %s AND create_uid = %s AND state = %s \
-                    ORDER BY id DESC limit 1',
-                    (context['journal_id'], context['period_id'], uid, 'draft'))
+        if context.get('journal_id'):
+            total = 0.0
+            #in account.move form view, it is not possible to compute total debit and credit using
+            #a browse record. So we must use the context to pass the whole one2many field and compute the total
+            if context.get('line_id'):
+                for move_line_dict in move_obj.resolve_2many_commands(cr, uid, 'line_id', context.get('line_id'), context=context):
+                    data['name'] = data.get('name') or move_line_dict.get('name')
+                    data['partner_id'] = data.get('partner_id') or move_line_dict.get('partner_id')
+                    total += move_line_dict.get('debit', 0.0) - move_line_dict.get('credit', 0.0)
+            elif context.get('period_id'):
+                #find the date and the ID of the last unbalanced account.move encoded by the current user in that journal and period
+                move_id = False
+                cr.execute('''SELECT move_id, date FROM account_move_line
+                    WHERE journal_id = %s AND period_id = %s AND create_uid = %s AND state = %s
+                    ORDER BY id DESC limit 1''', (context['journal_id'], context['period_id'], uid, 'draft'))
                 res = cr.fetchone()
-                move_id = (res and res[0]) or False
-                if not move_id:
-                    return data
-                else:
-                    data['move_id'] = move_id
-            if 'date' in fields:
-                cr.execute('SELECT date \
-                    FROM \
-                        account_move_line \
-                    WHERE \
-                        journal_id = %s AND period_id = %s AND create_uid = %s \
-                    ORDER BY id DESC',
-                    (context['journal_id'], context['period_id'], uid))
-                res = cr.fetchone()
-                if res:
-                    data['date'] = res[0]
-                else:
-                    period = period_obj.browse(cr, uid, context['period_id'],
-                            context=context)
-                    data['date'] = period.date_start
-        if not move_id:
-            return data
-        total = 0
-        ref_id = False
-        move = move_obj.browse(cr, uid, move_id, context=context)
-        if 'name' in fields:
-            data.setdefault('name', move.line_id[-1].name)
-        acc1 = False
-        for l in move.line_id:
-            acc1 = l.account_id
-            partner_id = partner_id or l.partner_id.id
-            ref_id = ref_id or l.ref
-            total += (l.debit or 0.0) - (l.credit or 0.0)
-
-        if 'ref' in fields:
-            data['ref'] = ref_id
-        if 'partner_id' in fields:
-            data['partner_id'] = partner_id
-
-        if move.journal_id.type == 'purchase':
-            if total > 0:
-                account = move.journal_id.default_credit_account_id
-            else:
-                account = move.journal_id.default_debit_account_id
-        else:
-            if total > 0:
-                account = move.journal_id.default_credit_account_id
-            else:
-                account = move.journal_id.default_debit_account_id
-        part = partner_id and partner_obj.browse(cr, uid, partner_id) or False
-        # part = False is acceptable for fiscal position.
-        account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
-        if account:
-            account = account_obj.browse(cr, uid, account, context=context)
-
-        if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
-            data['account_id'] = account.id
-            # Propose the price Tax excluded, the Tax will be added when confirming line
-            if account.tax_ids:
-                taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids)
-                tax = tax_obj.browse(cr, uid, taxes)
-                for t in tax_obj.compute_inv(cr, uid, tax, total, 1):
-                    total -= t['amount']
-
-        s = -total
-        data['debit'] = s > 0  and s or 0.0
-        data['credit'] = s < 0  and -s or 0.0
-
-        if account and account.currency_id:
-            data['currency_id'] = account.currency_id.id
-            acc = account
-            if s>0:
-                acc = acc1
-            compute_ctx = context.copy()
-            compute_ctx.update({
-                    'res.currency.compute.account': acc,
-                    'res.currency.compute.account_invert': True,
-                })
-            v = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], s, context=compute_ctx)
-            data['amount_currency'] = v
+                move_id = res and res[0] or False
+                data['date'] = res and res[1] or period_obj.browse(cr, uid, context['period_id'], context=context).date_start
+                data['move_id'] = move_id
+                if move_id:
+                    #if there exist some unbalanced accounting entries that match the journal and the period,
+                    #we propose to continue the same move by copying the ref, the name, the partner...
+                    move = move_obj.browse(cr, uid, move_id, context=context)
+                    data.setdefault('name', move.line_id[-1].name)
+                    for l in move.line_id:
+                        data['partner_id'] = data.get('partner_id') or l.partner_id.id
+                        data['ref'] = data.get('ref') or l.ref
+                        total += (l.debit or 0.0) - (l.credit or 0.0)
+
+            #compute the total of current move
+            data['debit'] = total < 0 and -total or 0.0
+            data['credit'] = total > 0 and total or 0.0
+            #pick the good account on the journal accordingly if the next proposed line will be a debit or a credit
+            journal_data = journal_obj.browse(cr, uid, context['journal_id'], context=context)
+            account = total > 0 and journal_data.default_credit_account_id or journal_data.default_debit_account_id
+            #map the account using the fiscal position of the partner, if needed
+            part = data.get('partner_id') and partner_obj.browse(cr, uid, data['partner_id'], context=context) or False
+            if account and data.get('partner_id'):
+                account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
+                account = account_obj.browse(cr, uid, account, context=context)
+            data['account_id'] =  account and account.id or False
+            #compute the amount in secondary currency of the account, if needed
+            if account and account.currency_id:
+                data['currency_id'] = account.currency_id.id
+                #set the context for the multi currency change
+                compute_ctx = context.copy()
+                compute_ctx.update({
+                        #the following 2 parameters are used to choose the currency rate, in case where the account
+                        #doesn't work with an outgoing currency rate method 'at date' but 'average'
+                        'res.currency.compute.account': account,
+                        'res.currency.compute.account_invert': True,
+                    })
+                if data.get('date'):
+                    compute_ctx.update({'date': data['date']})
+                data['amount_currency'] = currency_obj.compute(cr, uid, account.company_id.currency_id.id, data['currency_id'], -total, context=compute_ctx)
+        data = self._default_get_move_form_hook(cr, uid, data)
         return data
 
     def on_create_write(self, cr, uid, id, context=None):
@@ -484,6 +420,15 @@ class account_move_line(osv.osv):
                 result.append(line.id)
         return result
 
+    def _get_reconcile(self, cr, uid, ids,name, unknow_none, context=None):
+        res = dict.fromkeys(ids, False)
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.reconcile_id:
+                res[line.id] = str(line.reconcile_id.name)
+            elif line.reconcile_partial_id:
+                res[line.id] = str(line.reconcile_partial_id.name)
+        return res
+
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'quantity': fields.float('Quantity', digits=(16,2), help="The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very useful for some reports."),
@@ -498,15 +443,16 @@ class account_move_line(osv.osv):
         'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
         'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2),
         'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2),
+        'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile'),
         'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')),
         'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."),
         'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."),
         'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."),
-        'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True, readonly=True,
+        'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True,
                                 store = {
                                     'account.move': (_get_move_lines, ['journal_id'], 20)
                                 }),
-        'period_id': fields.related('move_id', 'period_id', string='Period', type='many2one', relation='account.period', required=True, select=True, readonly=True,
+        'period_id': fields.related('move_id', 'period_id', string='Period', type='many2one', relation='account.period', required=True, select=True,
                                 store = {
                                     'account.move': (_get_move_lines, ['period_id'], 20)
                                 }),
@@ -537,7 +483,7 @@ class account_move_line(osv.osv):
             context or {}
         period_obj = self.pool.get('account.period')
         dt = time.strftime('%Y-%m-%d')
-        if ('journal_id' in context) and ('period_id' in context):
+        if context.get('journal_id') and context.get('period_id'):
             cr.execute('SELECT date FROM account_move_line ' \
                     'WHERE journal_id = %s AND period_id = %s ' \
                     'ORDER BY id DESC limit 1',
@@ -558,6 +504,38 @@ class account_move_line(osv.osv):
         cur = self.pool.get('account.journal').browse(cr, uid, context['journal_id']).currency
         return cur and cur.id or False
 
+    def _get_period(self, cr, uid, context=None):
+        """
+        Return  default account period value
+        """
+        context = context or {}
+        if context.get('period_id', False):
+            return context['period_id']
+        account_period_obj = self.pool.get('account.period')
+        ids = account_period_obj.find(cr, uid, context=context)
+        period_id = False
+        if ids:
+            period_id = ids[0]
+        return period_id
+
+    def _get_journal(self, cr, uid, context=None):
+        """
+        Return journal based on the journal type
+        """
+        context = context or {}
+        if context.get('journal_id', False):
+            return context['journal_id']
+        journal_id = False
+
+        journal_pool = self.pool.get('account.journal')
+        if context.get('journal_type', False):
+            jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
+            if not jids:
+                raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type'))
+            journal_id = jids[0]
+        return journal_id
+
+
     _defaults = {
         'blocked': False,
         'centralisation': 'normal',
@@ -565,12 +543,12 @@ class account_move_line(osv.osv):
         'date_created': fields.date.context_today,
         'state': 'draft',
         'currency_id': _get_currency,
-        'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
+        'journal_id': _get_journal,
         'credit': 0.0,
         'debit': 0.0,
         'amount_currency': 0.0,
         'account_id': lambda self, cr, uid, c: c.get('account_id', False),
-        'period_id': lambda self, cr, uid, c: c.get('period_id', False),
+        'period_id': _get_period,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
     }
     _order = "date desc, id desc"
@@ -620,12 +598,34 @@ class account_move_line(osv.osv):
                     return False
         return True
 
+    def _check_currency_and_amount(self, cr, uid, ids, context=None):
+        for l in self.browse(cr, uid, ids, context=context):
+            if (l.amount_currency and not l.currency_id):
+                return False
+        return True
+
+    def _check_currency_amount(self, cr, uid, ids, context=None):
+        for l in self.browse(cr, uid, ids, context=context):
+            if l.amount_currency:
+                if (l.amount_currency > 0.0 and l.credit > 0.0) or (l.amount_currency < 0.0 and l.debit > 0.0):
+                    return False
+        return True
+
+    def _check_currency_company(self, cr, uid, ids, context=None):
+        for l in self.browse(cr, uid, ids, context=context):
+            if l.currency_id.id == l.company_id.currency_id.id:
+                return False
+        return True
+
     _constraints = [
         (_check_no_view, 'You cannot create journal items on an account of type view.', ['account_id']),
         (_check_no_closed, 'You cannot create journal items on closed account.', ['account_id']),
         (_check_company_id, 'Account and Period must belong to the same company.', ['company_id']),
         (_check_date, 'The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal.', ['date']),
         (_check_currency, 'The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal.', ['currency_id']),
+        (_check_currency_and_amount, "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field.", ['currency_id','amount_currency']),
+        (_check_currency_amount, 'The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit.', ['amount_currency']),
+        (_check_currency_company, "You cannot provide a secondary currency if it is the same than the company one." , ['currency_id']),
     ]
 
     #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -653,6 +653,12 @@ class account_move_line(osv.osv):
         }
         return result
 
+    def onchange_account_id(self, cr, uid, ids, account_id, context=None):
+        res = {'value': {}}
+        if account_id:
+            res['value']['account_tax_id'] = [x.id for x in self.pool.get('account.account').browse(cr, uid, account_id, context=context).tax_ids]
+        return res
+
     def onchange_partner_id(self, cr, uid, ids, move_id, partner_id, account_id=None, debit=0, credit=0, date=False, journal=False):
         partner_obj = self.pool.get('res.partner')
         payment_term_obj = self.pool.get('account.payment.term')
@@ -977,127 +983,6 @@ class account_move_line(osv.osv):
             'context':context,
         }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        journal_pool = self.pool.get('account.journal')
-        if context is None:
-            context = {}
-        result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
-        if (view_type != 'tree') or view_id:
-            #Remove the toolbar from the form view
-            if view_type == 'form':
-                if result.get('toolbar', False):
-                    result['toolbar']['action'] = []
-            #Restrict the list of journal view in search view
-            if view_type == 'search' and result['fields'].get('journal_id', False):
-                result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
-                ctx = context.copy()
-                #we add the refunds journal in the selection field of journal
-                if context.get('journal_type', False) == 'sale':
-                    ctx.update({'journal_type': 'sale_refund'})
-                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
-                elif context.get('journal_type', False) == 'purchase':
-                    ctx.update({'journal_type': 'purchase_refund'})
-                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
-            return result
-        if context.get('view_mode', False):
-            return result
-        fld = []
-        flds = []
-        title = _("Accounting Entries")  # self.view_header_get(cr, uid, view_id, view_type, context)
-
-        ids = journal_pool.search(cr, uid, [], context=context)
-        journals = journal_pool.browse(cr, uid, ids, context=context)
-        for journal in journals:
-            for field in journal.view_id.columns_id:
-                # sometimes, it's possible that a defined column is not loaded (the module containing
-                # this field is not loaded) when we make an update.
-                if field.field not in self._columns:
-                    continue
-
-                if not field.field in flds:
-                    fld.append((field.field, field.sequence))
-                    flds.append(field.field)
-
-        default_columns = {
-            'period_id': 3,
-            'journal_id': 10,
-            'state': sys.maxint,
-        }
-        for d in default_columns:
-            if d not in flds:
-                fld.append((d, default_columns[d]))
-                flds.append(d)
-
-        fld = sorted(fld, key=itemgetter(1))
-        widths = {
-            'statement_id': 50,
-            'state': 60,
-            'tax_code_id': 50,
-            'move_id': 40,
-        }
-
-        document = etree.Element('tree', string=title, editable="top",
-                                 on_write="on_create_write",
-                                 colors="red:state=='draft';black:state=='valid'")
-        fields_get = self.fields_get(cr, uid, flds, context)
-        for field, _seq in fld:
-            # TODO add string to element
-            f = etree.SubElement(document, 'field', name=field)
-
-            if field == 'debit':
-                f.set('sum', _("Total debit"))
-
-            elif field == 'credit':
-                f.set('sum', _("Total credit"))
-
-            elif field == 'move_id':
-                f.set('required', 'False')
-
-            elif field == 'account_tax_id':
-                f.set('domain', "[('parent_id', '=' ,False)]")
-                f.set('context', "{'journal_id': journal_id}")
-
-            elif field == 'account_id' and journal.id:
-                f.set('domain', "[('journal_id', '=', journal_id),('type','!=','view'), ('type','!=','closed')]")
-                f.set('on_change', 'onchange_account_id(account_id, partner_id)')
-
-            elif field == 'partner_id':
-                f.set('on_change', 'onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)')
-
-            elif field == 'journal_id':
-                f.set('context', "{'journal_id': journal_id}")
-
-            elif field == 'statement_id':
-                f.set('domain', "[('state', '!=', 'confirm'),('journal_id.type', '=', 'bank')]")
-                f.set('invisible', 'True')
-
-            elif field == 'date':
-                f.set('on_change', 'onchange_date(date)')
-
-            elif field == 'analytic_account_id':
-                # Currently it is not working due to being executed by superclass's fields_view_get
-                # f.set('groups', 'analytic.group_analytic_accounting')
-                pass
-
-            if field in ('amount_currency', 'currency_id'):
-                f.set('on_change', 'onchange_currency(account_id, amount_currency, currency_id, date, journal_id)')
-                f.set('attrs', "{'readonly': [('state', '=', 'valid')]}")
-
-            if field in widths:
-                f.set('width', str(widths[field]))
-
-            if field in ('journal_id',):
-                f.set("invisible", "context.get('journal_id', False)")
-            elif field in ('period_id',):
-                f.set("invisible", "context.get('period_id', False)")
-
-            orm.setup_modifiers(f, fields_get[field], context=context,
-                                in_tree_view=True)
-
-        result['arch'] = etree.tostring(document, pretty_print=True)
-        result['fields'] = fields_get
-        return result
-
     def _check_moves(self, cr, uid, context=None):
         # use the first move ever created for this journal and period
         if context is None:
@@ -1111,7 +996,7 @@ class account_move_line(osv.osv):
                                 'has been confirmed.') % res[2])
         return res
 
-    def _remove_move_reconcile(self, cr, uid, move_ids=None, context=None):
+    def _remove_move_reconcile(self, cr, uid, move_ids=None, opening_reconciliation=False, context=None):
         # Function remove move rencocile ids related with moves
         obj_move_line = self.pool.get('account.move.line')
         obj_move_rec = self.pool.get('account.move.reconcile')
@@ -1126,6 +1011,8 @@ class account_move_line(osv.osv):
         unlink_ids += rec_ids
         unlink_ids += part_rec_ids
         if unlink_ids:
+            if opening_reconciliation:
+                obj_move_rec.write(cr, uid, unlink_ids, {'opening_reconciliation': False})
             obj_move_rec.unlink(cr, uid, unlink_ids)
         return True
 
@@ -1390,6 +1277,19 @@ class account_move_line(osv.osv):
                 move_obj.button_validate(cr,uid, [vals['move_id']], context)
         return result
 
+    def list_periods(self, cr, uid, context=None):
+        ids = self.pool.get('account.period').search(cr,uid,[])
+        return self.pool.get('account.period').name_get(cr, uid, ids, context=context)
+
+    def list_journals(self, cr, uid, context=None):
+        ng = dict(self.pool.get('account.journal').name_search(cr,uid,'',[]))
+        ids = ng.keys()
+        result = []
+        for journal in self.pool.get('account.journal').browse(cr, uid, ids, context=context):
+            result.append((journal.id,ng[journal.id],journal.type,
+                bool(journal.currency),bool(journal.analytic_journal_id)))
+        return result
+
 account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 7732d8d8cb0..e2c45af8cba 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2,10 +2,7 @@
 <openerp>
     <data>
 
-        <!--
-            Fiscal Year
-        -->
-
+        <!-- Fiscal Year -->
         <record id="view_account_fiscalyear_form" model="ir.ui.view">
             <field name="name">account.fiscalyear.form</field>
             <field name="model">account.fiscalyear</field>
@@ -70,7 +67,7 @@
                 </search>
             </field>
         </record>
-        <record id="action_account_fiscalyear_form" model="ir.actions.act_window">
+        <record id="action_account_fiscalyear" model="ir.actions.act_window">
             <field name="name">Fiscal Years</field>
             <field name="res_model">account.fiscalyear</field>
             <field name="view_type">form</field>
@@ -90,12 +87,9 @@
             </field>
         </record>
         <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_configuration" sequence="5" />
-        <menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
-
-        <!--
-            Period
-        -->
+        <menuitem id="menu_action_account_fiscalyear" action="action_account_fiscalyear" parent="next_id_23"/>
 
+        <!-- Period -->
         <record id="view_account_period_form" model="ir.ui.view">
             <field name="name">account.period.form</field>
             <field name="model">account.period</field>
@@ -142,7 +136,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_account_period_search" model="ir.ui.view">
             <field name="name">account.period.search</field>
             <field name="model">account.period</field>
@@ -153,8 +146,7 @@
                 </search>
             </field>
         </record>
-
-        <record id="action_account_period_form" model="ir.actions.act_window">
+        <record id="action_account_period" model="ir.actions.act_window">
             <field name="name">Periods</field>
             <field name="res_model">account.period</field>
             <field name="view_type">form</field>
@@ -169,12 +161,9 @@
               </p>
             </field>
         </record>
-        <menuitem action="action_account_period_form" id="menu_action_account_period_form" parent="account.next_id_23" groups="base.group_no_one"/>
+        <menuitem id="menu_action_account_period" action="action_account_period" parent="account.next_id_23" groups="base.group_no_one"/>
 
-
-        <!--
-            Accounts
-        -->
+        <!-- Accounts -->
         <record id="view_account_form" model="ir.ui.view">
             <field name="name">account.account.form</field>
             <field name="model">account.account</field>
@@ -215,25 +204,6 @@
                 </form>
             </field>
         </record>
-
-        <record id="view_account_search" model="ir.ui.view">
-            <field name="name">account.account.search</field>
-            <field name="model">account.account</field>
-            <field name="arch" type="xml">
-                <search string="Accounts">
-                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
-                    <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
-                    <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
-                    <field name="user_type"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
-                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
-                        <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
         <record id="view_account_list" model="ir.ui.view">
             <field name="name">account.account.list</field>
             <field name="model">account.account</field>
@@ -253,6 +223,23 @@
                 </tree>
             </field>
         </record>
+        <record id="view_account_search" model="ir.ui.view">
+            <field name="name">account.account.search</field>
+            <field name="model">account.account</field>
+            <field name="arch" type="xml">
+                <search string="Accounts">
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Account"/>
+                    <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
+                    <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                    <field name="user_type"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
+                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'user_type'}"/>
+                        <filter string="Internal Type" icon="terp-stock_symbol-selection" domain="" context="{'group_by':'type'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
@@ -276,6 +263,13 @@
         <menuitem id="account_account_menu" name="Accounts" parent="account.menu_finance_configuration" sequence="15"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
 
+        <act_window
+            id="act_account_acount_move_line_open_unreconciled"
+            name="Unreconciled Entries"
+            res_model="account.move.line"
+            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
+            src_model="account.account"/>
+
         <record id="view_account_tree" model="ir.ui.view">
             <field name="name">account.account.tree</field>
             <field name="model">account.account</field>
@@ -301,7 +295,6 @@
             <field name="view_id" ref="view_account_tree"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-
         <record id="view_account_gain_loss_tree" model="ir.ui.view">
            <field name="name">Unrealized Gain or Loss</field>
             <field name="model">account.account</field>
@@ -321,7 +314,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="action_account_gain_loss" model="ir.actions.act_window">
             <field name="name">Unrealized Gain or Loss</field>
             <field name="res_model">account.account</field>
@@ -341,7 +333,6 @@
               </p>
             </field>
         </record>
-
         <menuitem
             name="Unrealized Gain or Loss"
             action="action_account_gain_loss"
@@ -349,88 +340,14 @@
             id="menu_unrealized_gains_losses"
             parent="account.menu_multi_currency"/>
 
-        <!--
-        Journal
-
-        Account Journal Columns
-        -->
-
-        <record id="view_journal_column_form" model="ir.ui.view">
-            <field name="name">account.journal.column.form</field>
-            <field name="model">account.journal.column</field>
-            <field name="arch" type="xml">
-                <form string="Journal Column" version="7.0">
-                    <field name="name"/>
-                    <field name="field"/>
-                    <field name="sequence"/>
-                </form>
-            </field>
-        </record>
-        <record id="view_journal_column_tree" model="ir.ui.view">
-            <field name="name">account.journal.column.tree</field>
-            <field name="model">account.journal.column</field>
-            <field name="arch" type="xml">
-                <tree string="Journal Column">
-                    <field name="sequence"/>
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_account_journal_view_search" model="ir.ui.view">
-            <field name="name">account.journal.view.search</field>
-            <field name="model">account.journal.view</field>
-            <field name="arch" type="xml">
-                <search string="Journal View">
-                    <field name="name" string="Journal View"/>
-                </search>
-            </field>
-        </record>
-        <record id="view_account_journal_view_tree" model="ir.ui.view">
-            <field name="name">account.journal.view.tree</field>
-            <field name="model">account.journal.view</field>
-            <field name="arch" type="xml">
-                <tree string="Journal View">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-        <record id="view_account_journal_view_form" model="ir.ui.view">
-            <field name="name">account.journal.view.form</field>
-            <field name="model">account.journal.view</field>
-            <field name="arch" type="xml">
-                <form string="Journal View" version="7.0">
-                    <field name="name"/>
-                    <field name="columns_id"/>
-                </form>
-            </field>
-        </record>
-        <record id="action_account_journal_view" model="ir.actions.act_window">
-            <field name="name">Journal Views</field>
-            <field name="res_model">account.journal.view</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_account_journal_view_search"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to specify lists of columns to display for a type of journal.
-              </p><p>
-                Journal views determine the way you can record entries in
-                your journal. Select the fields you want to appear in a journal
-                and determine the sequence in which they will appear.
-              </p><p>
-                On the journal definition form, you can select the view you
-                want to use to display journal items related to this journal.
-              </p>
-            </field>
-        </record>
-
-        <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_journals" sequence="20"/>
-
-        <!--
-    # Account Journal
-    -->
+        <act_window
+            id="action_move_line_select"
+            name="Journal Items"
+            context="{'search_default_account_id': [active_id]}"
+            res_model="account.move.line"
+            src_model="account.account"/>
 
+        <!-- Account Journal -->
         <record id="view_account_journal_tree" model="ir.ui.view">
             <field name="name">account.journal.tree</field>
             <field name="model">account.journal</field>
@@ -462,7 +379,6 @@
                 </search>
             </field>
         </record>
-
         <record id="view_account_journal_form" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
@@ -475,7 +391,7 @@
                     <group>
                         <group>
                             <field name="code"/>
-                            <field name="type" on_change="onchange_type(type, currency, context)"/>
+                            <field name="type"/>
                         </group>
                         <group>
                             <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
@@ -489,7 +405,6 @@
                             <group>
                                 <group>
                                     <field name="user_id"/>
-                                    <field name="view_id" widget="selection"/>
                                     <field name="sequence_id" required="0"/>
                                 </group>
                                 <group>
@@ -529,7 +444,6 @@
                 </form>
             </field>
         </record>
-
         <record id="action_account_journal_form" model="ir.actions.act_window">
             <field name="name">Journals</field>
             <field name="res_model">account.journal</field>
@@ -550,6 +464,21 @@
         </record>
         <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="menu_journals"/>
 
+        <act_window
+           id="act_account_journal_2_account_bank_statement"
+           name="Bank statements"
+           context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
+           res_model="account.bank.statement"
+           src_model="account.journal"/>
+
+        <act_window
+           id="act_account_journal_2_account_move_line"
+           name="Journal Items"
+           context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
+           res_model="account.move.line"
+           src_model="account.journal"/>
+
+        <!-- Bank statement -->
         <record id="view_account_bank_statement_filter" model="ir.ui.view">
             <field name="name">account.cash.statement.select</field>
             <field name="model">account.bank.statement</field>
@@ -735,9 +664,7 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <!--
-    Account Types
-    -->
+        <!-- Account Types -->
         <record id="view_account_type_search" model="ir.ui.view">
             <field name="name">account.account.type.search</field>
             <field name="model">account.account.type</field>
@@ -747,7 +674,6 @@
                 </search>
             </field>
         </record>
-
         <record id="view_account_type_tree" model="ir.ui.view">
             <field name="name">account.account.type.tree</field>
             <field name="model">account.account.type</field>
@@ -758,7 +684,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_account_type_form" model="ir.ui.view">
             <field name="name">account.account.type.form</field>
             <field name="model">account.account.type</field>
@@ -798,9 +723,8 @@
             </field>
         </record>
         <menuitem action="action_account_type_form" sequence="20" id="menu_action_account_type_form" parent="account_account_menu" groups="base.group_no_one"/>
-        <!--
-    Entries
-    -->
+
+        <!-- Entries -->
         <record id="view_account_move_tree" model="ir.ui.view">
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
@@ -818,10 +742,7 @@
             </field>
         </record>
 
-        <!--
-    Reconcile
-    -->
-
+        <!-- Reconcile -->
         <record id="view_move_reconcile_form" model="ir.ui.view">
             <field name="name">account.move.reconcile.form</field>
             <field name="model">account.move.reconcile</field>
@@ -840,9 +761,7 @@
             </field>
         </record>
 
-        <!--
-    Tax Codes
-    -->
+        <!-- Tax Codes -->
         <record id="view_tax_code_search" model="ir.ui.view">
             <field name="name">account.tax.code.search</field>
             <field name="model">account.tax.code</field>
@@ -913,13 +832,17 @@
               </p>
             </field>
         </record>
-       <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="20"/>
-       <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12" groups="base.group_no_one"/>
+        <menuitem id="next_id_27" name="Taxes" parent="account.menu_finance_configuration" sequence="20"/>
+        <menuitem action="action_tax_code_list" id="menu_action_tax_code_list" parent="next_id_27" sequence="12" groups="base.group_no_one"/>
 
+        <act_window
+            id="action_tax_code_line_open"
+            name="Journal Items"
+            domain="[('tax_code_id','child_of',active_id),('state','&lt;&gt;','draft')]"
+            res_model="account.move.line"
+            src_model="account.tax.code"/>
 
-        <!--
-    Tax
-    -->
+        <!-- Tax -->
         <record id="view_tax_tree" model="ir.ui.view">
             <field name="name">account.tax.tree</field>
             <field name="model">account.tax</field>
@@ -1041,57 +964,7 @@
             <field name="view_id" ref="view_tax_code_tree"/>
         </record>
 
-        <!--
-    Entries lines
-    -->
-
-        <record id="view_move_line_tree_reconcile" model="ir.ui.view">
-            <field name="model">account.move.line</field>
-            <field eval="24" name="priority"/>
-            <field name="arch" type="xml">
-                <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
-                    <field name="date"/>
-                    <field name="move_id"/>
-                    <field name="ref"/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="account_id"/>
-                    <field name="reconcile_partial_id"/>
-                    <field name="state" invisible="1"/>
-                    <field name="debit" sum="Total debit"/>
-                    <field name="credit" sum="Total credit"/>
-                </tree_account_reconciliation>
-            </field>
-        </record>
-
-        <record id="view_move_line_tree" model="ir.ui.view">
-            <field name="name">account.move.line.tree</field>
-            <field name="model">account.move.line</field>
-            <field eval="4" name="priority"/>
-            <field name="arch" type="xml">
-                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" editable="top" on_write="on_create_write">
-                    <field name="date"/>
-                    <field name="period_id"/>
-                    <field name="move_id"/>
-                    <field name="ref"/>
-                    <field name="invoice"/>
-                    <field name="name"/>
-                    <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
-                    <field name="account_id" domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]"/>
-                    <field name="journal_id"/>
-                    <field name="debit" sum="Total debit"/>
-                    <field name="credit" sum="Total credit"/>
-                    <field name="account_tax_id"/>
-                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
-                    <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/>
-                    <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
-                    <field name="reconcile_partial_id"/>
-                    <field name="reconcile_id"/>
-                    <field name="state" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
+        <!-- Journal Items -->
         <record id="view_move_line_form" model="ir.ui.view">
             <field name="name">account.move.line.form</field>
             <field name="model">account.move.line</field>
@@ -1161,7 +1034,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_move_line_form2" model="ir.ui.view">
             <field name="name">account.move.line.form2</field>
             <field name="model">account.move.line</field>
@@ -1209,7 +1081,35 @@
                 </form>
             </field>
         </record>
-
+        <record id="view_move_line_tree" model="ir.ui.view">
+            <field name="name">account.move.line.tree</field>
+            <field name="model">account.move.line</field>
+            <field eval="1" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items" create="true" on_write="on_create_write" version="7.0" editable="top">
+                    <field name="journal_id" options='{"no_open":True}' invisible="context.get('journal_id',False)"/>
+                    <field name="period_id" options='{"no_open":True}' invisible="context.get('period_id',False)"/>
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="ref"/>
+                    <field name="statement_id" invisible="1"/>
+                    <field name="partner_id" on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"/>
+                    <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',journal_id), ('company_id', '=', company_id)]" on_change="onchange_account_id(account_id)"/>
+                    <field name="account_tax_id" options='{"no_open":True}' invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund','general']"/>
+                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type','not in',['view','template'])]" invisible="not context.get('analytic_journal_id',False)"/>
+                    <field name="move_id" required="0"/>
+                    <field name="debit" sum="Total Debit"/>
+                    <field name="credit" sum="Total Credit"/>
+                    <field name="date_maturity" invisible="context.get('journal_type', False) not in ['sale','sale_refund','purchase','purchase_refund']"/>
+                    <field name="reconcile"/>
+                    <field name="invoice" invisible="1"/>
+                    <field name="amount_currency" readonly="True" invisible="not context.get('currency',False)"/>
+                    <field name="currency_id" readonly="True" invisible="not context.get('currency',False)" />
+                    <field name="state" />
+                    <field name="company_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
         <record id="account_move_line_graph" model="ir.ui.view">
             <field name="name">account.move.line.graph</field>
             <field name="model">account.move.line</field>
@@ -1221,7 +1121,6 @@
                 </graph>
             </field>
         </record>
-
         <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Journal Items</field>
             <field name="model">account.move.line</field>
@@ -1238,7 +1137,7 @@
                     <separator/>
                     <filter string="Next Partner to Reconcile" help="Next Partner Entries to reconcile" name="next_partner" context="{'next_partner_only': 1}" icon="terp-gtk-jump-to-ltr" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                     <field name="move_id" string="Number (Move)"/>
-                    <field name="account_id"/>
+                    <field name="account_id" filter_domain="['|', ('name', 'ilike', self), ('code', 'ilike', self)]"/>
                     <field name="partner_id"/>
                     <field name="journal_id" context="{'journal_id':self}" widget="selection"/> <!-- it's important to keep widget='selection' in this filter viewbecause without that the value passed in the context is not the ID but the textual value (name) of the selected journal -->
                     <field name="period_id" context="{'period_id':self}" widget="selection"/> <!-- it's important to keep the widget='selection' in this field, for the same reason as explained above -->
@@ -1251,17 +1150,15 @@
                 </search>
             </field>
         </record>
-
         <record id="action_account_moves_all_a" model="ir.actions.act_window">
+            <field name="context">{'journal_type':'general'}</field>
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{}</field>
-            <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="view_mode">tree_account_move_line_quickadd</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to register a new journal item.
+                Select the period and the journal you want to fill.
               </p><p>
                 This view can be used by accountants in order to quickly record
                 entries in OpenERP. If you want to record a supplier invoice,
@@ -1271,7 +1168,6 @@
               </p>
             </field>
         </record>
-
         <menuitem
             action="action_account_moves_all_a"
             icon="STOCK_JUSTIFY_FILL"
@@ -1281,37 +1177,49 @@
             groups="group_account_user"
         />
 
-        <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>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <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"/>
+        <record id="view_move_line_tree_reconcile" model="ir.ui.view">
+            <field name="model">account.move.line</field>
+            <field eval="24" name="priority"/>
+            <field name="arch" type="xml">
+                <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
+                    <field name="date"/>
+                    <field name="move_id"/>
+                    <field name="ref"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="account_id"/>
+                    <field name="reconcile_partial_id"/>
+                    <field name="state" invisible="1"/>
+                    <field name="debit" sum="Total debit"/>
+                    <field name="credit" sum="Total credit"/>
+                </tree_account_reconciliation>
+            </field>
         </record>
-
-        <record id="action_move_line_select" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
+        <record id="action_account_manual_reconcile" model="ir.actions.act_window">
+            <field name="context">{'search_default_unreconciled': 1,'view_mode':True}</field>
+            <field name="name">Journal Items to Reconcile</field>
             <field name="res_model">account.move.line</field>
-            <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="context">{'search_default_account_id': [active_id]}</field>
-        </record>
-
-        <record id="ir_account_move_line_select" model="ir.values">
-            <field name="key2">tree_but_open</field>
-            <field name="model">account.account</field>
-            <field name="name">Open Journal Items</field>
-            <field eval="'ir.actions.act_window,%d'%action_move_line_select" name="value"/>
+            <field name="view_id" ref="view_move_line_tree_reconcile"/>
+            <field name="view_mode">tree_account_reconciliation</field>
+            <field name="help" type="html">
+                <p>
+                    No journal items found.
+                </p>
+            </field>
         </record>
-        <!--
-    Account.Entry Edition
-    -->
+        <menuitem
+             name="Journal Items to Reconcile"
+             action="action_account_manual_reconcile"
+             id="menu_manual_reconcile_bank"
+             sequence="20"
+             parent="account.menu_finance_bank_and_cash"/>
+        <menuitem
+             name="Manual Reconciliation"
+             action="action_account_manual_reconcile"
+             id="menu_manual_reconcile"
+             parent="account.periodical_processing_reconciliation"/>
 
+        <!-- Account.Entry Edition -->
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
@@ -1360,10 +1268,8 @@
                     </group>
                     <notebook>
                         <page string="Journal Items">
-                            <field name="balance" invisible="1"/>
                             <field name="line_id" widget="one2many_list"
-                              on_change="onchange_line_id(line_id)"
-                              context="{'balance': balance , 'journal': journal_id }">
+                              context="{'line_id': line_id , 'journal_id': journal_id }">
                                 <form string="Journal Item" version="7.0">
                                     <group col="6" colspan="4">
                                         <field name="name"/>
@@ -1430,7 +1336,6 @@
                                     </notebook>
                                 </form>
                                 <tree colors="blue:state == 'draft';black:state == 'posted'" editable="top" string="Journal Items">
-                                    <field name="ref"/>
                                     <field name="invoice"/>
                                     <field name="name"/>
                                     <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
@@ -1455,7 +1360,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_account_move_filter" model="ir.ui.view">
             <field name="name">account.move.select</field>
             <field name="model">account.move</field>
@@ -1480,7 +1384,6 @@
                 </search>
             </field>
         </record>
-
         <record id="action_move_journal_line" model="ir.actions.act_window">
             <field name="name">Journal Entries</field>
             <field name="res_model">account.move</field>
@@ -1502,7 +1405,6 @@
               </p>
             </field>
         </record>
-
         <menuitem
             icon="STOCK_JUSTIFY_FILL"
             action="action_move_journal_line"
@@ -1523,70 +1425,9 @@
         <act_window
             id="act_account_move_to_account_move_line_open"
             name="Journal Items"
-            context="{'search_default_move_id':[active_id], 'default_move_id': active_id}"
+            context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
             res_model="account.move.line"
             src_model="account.move"/>
-
-        <record id="action_move_line_search" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.line</field>
-            <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"/>
-        </record>
-        <record id="action_move_line_search_view1" model="ir.actions.act_window.view">
-            <field eval="10" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_move_line_tree"/>
-            <field name="act_window_id" ref="action_move_line_search"/>
-        </record>
-        <record id="action_move_line_search_view2" model="ir.actions.act_window.view">
-            <field eval="11" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="act_window_id" ref="action_move_line_search"/>
-        </record>
-
-        <record id="action_account_manual_reconcile" model="ir.actions.act_window">
-            <field name="context">{'search_default_unreconciled': 1,'view_mode':True}</field>
-            <field name="name">Journal Items to Reconcile</field>
-            <field name="res_model">account.move.line</field>
-            <field name="view_id" ref="view_move_line_tree_reconcile"/>
-            <field name="view_mode">tree_account_reconciliation</field>
-            <field name="help" type="html">
-                <p>
-                    No journal items found.
-                </p>
-            </field>
-        </record>
-        <menuitem
-             name="Journal Items to Reconcile"
-             action="action_account_manual_reconcile"
-             id="menu_manual_reconcile_bank"
-             sequence="20"
-             parent="account.menu_finance_bank_and_cash"/>
-
-        <menuitem
-             name="Manual Reconciliation"
-             action="action_account_manual_reconcile"
-             id="menu_manual_reconcile"
-             parent="account.periodical_processing_reconciliation"/>
-
-
-        <act_window
-            id="act_account_acount_move_line_open"
-            name="Entries"
-            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':0, 'default_account_id': active_id}"
-            res_model="account.move.line"
-            src_model="account.account"/>
-
-        <act_window
-            id="act_account_acount_move_line_open_unreconciled"
-            name="Unreconciled Entries"
-            res_model="account.move.line"
-            context="{'search_default_account_id':[active_id], 'search_default_unreconciled':1, 'default_account_id': active_id}"
-            src_model="account.account"/>
-
         <act_window
             domain="[('reconcile_id', '=', active_id)]"
             id="act_account_acount_move_line_reconcile_open"
@@ -1594,13 +1435,7 @@
             res_model="account.move.line"
             src_model="account.move.reconcile"/>
 
-
-        <!--
-    TODO:
-        Print Journal (and change state)
-        Close Journal (and verify that there is no draft Entry Lines)
--->
-
+        <!-- TODO: Print Journal (and change state), Close Journal (and verify that there is no draft Entry Lines) -->
         <record id="view_journal_period_tree" model="ir.ui.view">
             <field name="name">account.journal.period.tree</field>
             <field name="model">account.journal.period</field>
@@ -1620,10 +1455,7 @@
             <field name="view_type">tree</field>
         </record>
 
-        <!--
-        # Account Models
-        -->
-
+        <!-- Account Models -->
         <record id="view_model_line_tree" model="ir.ui.view">
             <field name="name">account.model.line.tree</field>
             <field name="model">account.model.line</field>
@@ -1640,8 +1472,6 @@
                 </tree>
             </field>
         </record>
-
-
         <record id="view_model_line_form" model="ir.ui.view">
             <field name="name">account.model.line.form</field>
             <field name="model">account.model.line</field>
@@ -1661,7 +1491,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_model_form" model="ir.ui.view">
             <field name="name">account.model.form</field>
             <field name="model">account.model</field>
@@ -1680,7 +1509,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_model_tree" model="ir.ui.view">
             <field name="name">account.model.tree</field>
             <field name="model">account.model</field>
@@ -1692,7 +1520,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_model_search" model="ir.ui.view">
             <field name="name">account.model.search</field>
             <field name="model">account.model</field>
@@ -1721,10 +1548,7 @@
             action="action_model_form" name="Models" id="menu_action_model_form" sequence="5"
             parent="account.menu_finance_recurrent_entries"/>
 
-        <!--
-            # Payment Terms
-        -->
-
+        <!-- Payment Terms -->
         <record id="view_payment_term_line_tree" model="ir.ui.view">
             <field name="name">account.payment.term.line.tree</field>
             <field name="model">account.payment.term.line</field>
@@ -1739,8 +1563,6 @@
                 </tree>
             </field>
         </record>
-
-
         <record id="view_payment_term_line_form" model="ir.ui.view">
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
@@ -1780,7 +1602,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_payment_term_search" model="ir.ui.view">
             <field name="name">account.payment.term.search</field>
             <field name="model">account.payment.term</field>
@@ -1791,7 +1612,6 @@
                 </search>
             </field>
         </record>
-
         <record id="view_payment_term_form" model="ir.ui.view">
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
@@ -1807,7 +1627,6 @@
                 </form>
             </field>
         </record>
-
         <record id="action_payment_term_form" model="ir.actions.act_window">
             <field name="name">Payment Terms</field>
             <field name="res_model">account.payment.term</field>
@@ -1818,10 +1637,7 @@
         <menuitem action="action_payment_term_form"
             id="menu_action_payment_term_form" parent="menu_configuration_misc"/>
 
-        <!--
-        # Account Subscriptions
-        -->
-
+        <!-- Account Subscriptions -->
         <record id="view_subscription_line_form" model="ir.ui.view">
             <field name="name">account.subscription.line.form</field>
             <field name="model">account.subscription.line</field>
@@ -1834,7 +1650,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_subscription_line_tree" model="ir.ui.view">
             <field name="name">account.subscription.line.tree</field>
             <field name="model">account.subscription.line</field>
@@ -1845,7 +1660,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_subscription_tree" model="ir.ui.view">
             <field name="name">account.subscription.tree</field>
             <field name="model">account.subscription</field>
@@ -1859,7 +1673,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_subscription_search" model="ir.ui.view">
             <field name="name">account.subscription.search</field>
             <field name="model">account.subscription</field>
@@ -1877,7 +1690,6 @@
                 </search>
             </field>
         </record>
-
         <record id="view_subscription_form" model="ir.ui.view">
             <field name="name">account.subscription.form</field>
             <field name="model">account.subscription</field>
@@ -1963,72 +1775,7 @@
             </field>
         </record>
 
-        <record id="action_move_line_tree1" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('account_id','child_of', [active_id]),('state','&lt;&gt;','draft')]</field>
-            <field name="context">{'account_id':active_id}</field>
-        </record>
-
-        <record id="view_move_line_tax_tree" model="ir.ui.view">
-            <field name="name">account.move.line.tax.tree</field>
-            <field name="model">account.move.line</field>
-            <field eval="4" name="priority"/>
-            <field name="arch" type="xml">
-                <tree colors="red:state == 'draft';black:state == 'valid'" string="Journal Items">
-                    <field name="date"/>
-                    <field name="move_id"/>
-                    <field name="statement_id" string="St."/>
-                    <field name="name"/>
-                    <field name="partner_id"/>
-                    <field name="account_id"/>
-                    <field name="tax_code_id"/>
-                    <field name="tax_amount"/>
-                    <field name="debit" sum="Total debit"/>
-                    <field name="credit" sum="Total credit"/>
-                    <field name="account_tax_id"/>
-                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                    <field name="state" invisible="1"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_tax_code_line_open" model="ir.actions.act_window">
-            <field name="name">Journal Items</field>
-            <field name="res_model">account.move.line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_move_line_tax_tree"/>
-            <field name="domain">[('tax_code_id','child_of',active_id),('state','&lt;&gt;','draft')]</field>
-        </record>
-        <record id="ir_open_tax_move_line" model="ir.values">
-            <field name="key2">tree_but_open</field>
-            <field name="model">account.tax.code</field>
-            <field name="name">Tax Details</field>
-            <field eval="'ir.actions.act_window,%d'%action_tax_code_line_open" name="value"/>
-        </record>
-
-
-        <!--
-    # Admin config
-    -->
-
-        <act_window
-           id="act_account_journal_2_account_bank_statement"
-           name="Bank statements"
-           context="{'search_default_journal_id': active_id, 'default_journal_id': active_id}"
-           res_model="account.bank.statement"
-           src_model="account.journal"/>
-
-        <act_window
-           id="act_account_journal_2_account_move_line"
-           name="Journal Items"
-           context="{'search_default_journal_id':active_id, 'default_journal_id': active_id}"
-           res_model="account.move.line"
-           src_model="account.journal"/>
-
+        <!-- res.partner links -->
         <act_window
             context="{'search_default_unreconciled':True, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
@@ -2037,29 +1784,13 @@
             res_model="account.move.line"
             src_model="res.partner"/>
 
-        <act_window context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner" groups="account.group_account_user"/>
-
-        <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
-            <field name="name">Create Account</field>
-            <field name="model">account.addtmpl.wizard</field>
-            <field name="arch" type="xml">
-                <form string="Create Account" version="7.0">
-                    <header>
-                        <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight"  />
-                    </header>
-                    <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
-                    <field name="cparent_id"/>
-                </form>
-            </field>
-        </record>
-
-        <act_window domain="[]" id="action_account_addtmpl_wizard_form"
-            name="Create Account"
-            target="new"
-            res_model="account.addtmpl.wizard"
-            context="{'tmpl_ids': active_id}"
-            src_model="account.account.template"
-            view_type="form" view_mode="form"/>
+        <act_window 
+            context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
+            id="act_account_partner_account_move"
+            name="Journal Items"
+            res_model="account.move.line"
+            src_model="res.partner"
+            groups="account.group_account_user"/>
 
         <!-- Account Templates -->
         <menuitem
@@ -2078,7 +1809,6 @@
             parent="account_template_folder"
             sequence="1"/>
 
-
         <record id="view_account_template_form" model="ir.ui.view">
             <field name="name">account.account.template.form</field>
             <field name="model">account.account.template</field>
@@ -2104,7 +1834,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_account_template_tree" model="ir.ui.view">
             <field name="name">account.account.template.tree</field>
             <field name="model">account.account.template</field>
@@ -2117,7 +1846,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_account_template_search" model="ir.ui.view">
             <field name="name">account.account.template.search</field>
             <field name="model">account.account.template</field>
@@ -2136,7 +1864,6 @@
                 </search>
             </field>
         </record>
-
         <record id="action_account_template_form" model="ir.actions.act_window">
             <field name="name">Account Templates</field>
             <field name="res_model">account.account.template</field>
@@ -2144,11 +1871,32 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_template_search"/>
         </record>
-
         <menuitem action="action_account_template_form" id="menu_action_account_template_form" parent="account_template_accounts"/>
 
-        <!-- Chart of Accounts Templates -->
+        <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
+            <field name="name">Create Account</field>
+            <field name="model">account.addtmpl.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Create Account" version="7.0">
+                    <header>
+                        <button icon="gtk-ok" name="action_create" string="Add" type="object" class="oe_highlight"  />
+                    </header>
+                    <separator col="4" colspan="4" string="Create an Account Based on this Template"/>
+                    <field name="cparent_id"/>
+                </form>
+            </field>
+        </record>
 
+        <act_window domain="[]" id="action_account_addtmpl_wizard_form"
+            name="Create Account"
+            target="new"
+            res_model="account.addtmpl.wizard"
+            context="{'tmpl_ids': active_id}"
+            src_model="account.account.template"
+            view_type="form" view_mode="form"/>
+
+
+        <!-- Chart of Accounts Templates -->
         <record id="view_account_chart_template_form" model="ir.ui.view">
             <field name="name">account.chart.template.form</field>
             <field name="model">account.chart.template</field>
@@ -2221,11 +1969,9 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-
         <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts" sequence="1"/>
 
         <!-- Account Tax Templates -->
-
         <record id="view_account_tax_template_form" model="ir.ui.view">
             <field name="name">account.tax.template.form</field>
             <field name="model">account.tax.template</field>
@@ -2304,7 +2050,6 @@
                 </search>
             </field>
         </record>
-
         <record id="action_account_tax_template_form" model="ir.actions.act_window">
             <field name="name">Tax Templates</field>
             <field name="res_model">account.tax.template</field>
@@ -2312,7 +2057,6 @@
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_account_tax_template_search"/>
         </record>
-
         <menuitem action="action_account_tax_template_form" id="menu_action_account_tax_template_form" parent="account_template_taxes" sequence="13"/>
 
         <!-- Account Tax Code Templates -->
@@ -2328,7 +2072,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_tax_code_template_search" model="ir.ui.view">
             <field name="name">account.tax.code.template.search</field>
             <field name="model">account.tax.code.template</field>
@@ -2342,7 +2085,6 @@
                 </search>
             </field>
         </record>
-
         <record id="view_tax_code_template_form" model="ir.ui.view">
             <field name="name">account.tax.code.template.form</field>
             <field name="model">account.tax.code.template</field>
@@ -2359,7 +2101,6 @@
                 </form>
             </field>
         </record>
-
         <record id="action_account_tax_code_template_form" model="ir.actions.act_window">
             <field name="name">Tax Code Templates</field>
             <field name="res_model">account.tax.code.template</field>
@@ -2371,7 +2112,6 @@
 
 
         <!--  Wizard for Multi Charts of Accounts -->
-
         <record id="view_wizard_multi_chart" model="ir.ui.view">
             <field name="name">Set Your Accounting Options</field>
             <field name="model">wizard.multi.charts.accounts</field>
@@ -2410,7 +2150,6 @@
                 </group>
             </field>
         </record>
-
         <record id="action_wizard_multi_chart" model="ir.actions.act_window">
             <field name="name">Set Your Accounting Options</field>
             <field name="type">ir.actions.act_window</field>
@@ -2516,7 +2255,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_bank_statement_form2" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
@@ -2649,6 +2387,7 @@
               </p>
             </field>
         </record>
+
         <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
@@ -2678,10 +2417,7 @@
             parent="menu_finance_payables"
             action="base.action_partner_supplier_form" sequence="100"/>
 
-        <!--
-            Account Reports
-        -->
-
+        <!-- Account Reports -->
         <record id="view_account_financial_report_form" model="ir.ui.view">
             <field name="name">account.financial.report.form</field>
             <field name="model">account.financial.report</field>
@@ -2708,7 +2444,6 @@
                 </form>
             </field>
         </record>
-
         <record id="view_account_financial_report_tree" model="ir.ui.view">
             <field name="name">account.financial.report.tree</field>
             <field name="model">account.financial.report</field>
@@ -2721,7 +2456,6 @@
                 </tree>
             </field>
         </record>
-
         <record id="view_account_financial_report_search" model="ir.ui.view">
             <field name="name">account.financial.report.search</field>
             <field name="model">account.financial.report</field>
@@ -2737,7 +2471,6 @@
                 </search>
             </field>
         </record>
-
         <record id="action_account_financial_report_tree" model="ir.actions.act_window">
             <field name="name">Financial Reports</field>
             <field name="type">ir.actions.act_window</field>
@@ -2747,7 +2480,6 @@
             <field name="search_view_id" ref="view_account_financial_report_search"/>
             <field name="view_id" ref="view_account_financial_report_tree"/>
         </record>
-
         <menuitem id="menu_account_financial_reports_tree" name="Account Reports" parent="menu_account_reports" action="action_account_financial_report_tree"/>
 
         <record id="view_account_report_tree_hierarchy" model="ir.ui.view">
@@ -2770,7 +2502,6 @@
             <field name="view_id" ref="view_account_report_tree_hierarchy"/>
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
-
         <menuitem id="menu_account_report_tree_hierarchy" name="Account Reports Hierarchy"
                   parent="menu_account_reports" action="action_account_report_tree_hierarchy"/>
 
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index dd27cfbab4e..97bea14c1f2 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -60,412 +60,6 @@
         </record>
 
         <!--
-        Account Journal View
-        -->
-        <record id="account_journal_bank_view" model="account.journal.view">
-            <field name="name">Bank/Cash Journal View</field>
-        </record>
-        <record id="bank_col1" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="bank_col2" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="bank_col7" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="bank_col4" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Statement</field>
-            <field name="field">statement_id</field>
-            <field eval="4" name="sequence"/>
-        </record>
-        <record id="bank_col6" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="bank_col5" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="bank_col9" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="bank_col10" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="bank_col3" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="bank_col23" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Status</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-        <record id="bank_col20" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Reconcile</field>
-            <field name="field">reconcile_id</field>
-            <field eval="20" name="sequence"/>
-        </record>
-
-
-        <record id="account_journal_bank_view_multi" model="account.journal.view">
-            <field name="name">Bank/Cash Journal (Multi-Currency) View</field>
-        </record>
-        <record id="bank_col1_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="bank_col2_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="bank_col7_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="bank_col4_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Statement</field>
-            <field name="field">statement_id</field>
-            <field eval="4" name="sequence"/>
-        </record>
-        <record id="bank_col6_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="bank_col5_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="bank_col17_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Currency Amt.</field>
-            <field name="field">amount_currency</field>
-            <field eval="9" name="sequence"/>
-        </record>
-        <record id="bank_col18_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Currency</field>
-            <field name="field">currency_id</field>
-            <field eval="10" name="sequence"/>
-        </record>
-        <record id="bank_col9_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="bank_col10_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="bank_col3_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="bank_col23_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Status</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-        <record id="bank_col20_multi" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view_multi"/>
-            <field name="name">Reconcile</field>
-            <field name="field">reconcile_id</field>
-            <field eval="20" name="sequence"/>
-        </record>
-
-
-        <record id="account_journal_view" model="account.journal.view">
-            <field name="name">Journal View</field>
-        </record>
-        <record id="journal_col1" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="journal_col2" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="journal_col3" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="journal_col5" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="journal_col4" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="journal_col6" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="journal_col8" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="journal_col9" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="journal_col11" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Analytic Account</field>
-            <field name="field">analytic_account_id</field>
-            <field eval="14" name="sequence"/>
-        </record>
-        <record id="journal_col24" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Status</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-
-
-        <record id="account_sp_journal_view" model="account.journal.view">
-            <field name="name">Sale/Purchase Journal View</field>
-        </record>
-        <record id="sp_journal_col1" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="sp_journal_col2" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="sp_journal_col3" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="sp_journal_col4" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="sp_journal_col5" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="sp_journal_col6" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="sp_journal_col7" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Due Date</field>
-            <field name="field">date_maturity</field>
-            <field eval="8" name="sequence"/>
-        </record>
-        <record id="sp_journal_col8" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="sp_journal_col9" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="sp_journal_col10" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Tax</field>
-            <field name="field">account_tax_id</field>
-            <field eval="13" name="sequence"/>
-        </record>
-        <record id="sp_journal_col11" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Analytic Account</field>
-            <field name="field">analytic_account_id</field>
-            <field eval="14" name="sequence"/>
-        </record>
-        <record id="sp_journal_col24" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Status</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-        <record id="sp_journal_col20" model="account.journal.column">
-            <field name="view_id" ref="account_sp_journal_view"/>
-            <field name="name">Reconcile</field>
-            <field name="field">reconcile_id</field>
-            <field eval="20" name="sequence"/>
-        </record>
-
-        <record id="account_sp_refund_journal_view" model="account.journal.view">
-            <field name="name">Sale/Purchase Refund Journal View</field>
-        </record>
-        <record id="sp_refund_journal_col1" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Date</field>
-            <field name="field">date</field>
-            <field eval="True" name="required"/>
-            <field eval="3" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col2" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Journal Entry</field>
-            <field name="field">move_id</field>
-            <field eval="False" name="required"/>
-            <field eval="1" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col3" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Ref</field>
-            <field name="field">ref</field>
-            <field eval="2" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col4" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Account</field>
-            <field name="field">account_id</field>
-            <field eval="True" name="required"/>
-            <field eval="6" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col5" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="5" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col6" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Name</field>
-            <field name="field">name</field>
-            <field eval="7" name="sequence"/>
-            <field eval="True" name="required"/>
-        </record>
-        <record id="sp_refund_journal_col7" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Due Date</field>
-            <field name="field">date_maturity</field>
-            <field eval="8" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col8" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Debit</field>
-            <field name="field">debit</field>
-            <field eval="11" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col9" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Credit</field>
-            <field name="field">credit</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col10" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Tax</field>
-            <field name="field">account_tax_id</field>
-            <field eval="13" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col11" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Analytic Account</field>
-            <field name="field">analytic_account_id</field>
-            <field eval="14" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col24" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Status</field>
-            <field name="field">state</field>
-            <field eval="19" name="sequence"/>
-        </record>
-        <record id="sp_refund_journal_col20" model="account.journal.column">
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
-            <field name="name">Reconcile</field>
-            <field name="field">reconcile_id</field>
-            <field eval="20" name="sequence"/>
-        </record>
-
-        <!--
         Account Journal Sequences
         -->
 
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 984711eceef..ce9a09def08 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -312,7 +312,6 @@
             <field name="name">Sales Journal - (test)</field>
             <field name="code">TSAJ</field>
             <field name="type">sale</field>
-            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
@@ -323,7 +322,6 @@
             <field name="name">Sales Credit Note Journal - (test)</field>
             <field name="code">TSCNJ</field>
             <field name="type">sale_refund</field>
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
@@ -335,7 +333,6 @@
             <field name="name">Expenses Journal - (test)</field>
             <field name="code">TEXJ</field>
             <field name="type">purchase</field>
-            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
@@ -346,7 +343,6 @@
             <field name="name">Expenses Credit Notes Journal - (test)</field>
             <field name="code">TECNJ</field>
             <field name="type">purchase_refund</field>
-            <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
@@ -358,7 +354,6 @@
             <field name="name">Bank Journal - (test)</field>
             <field name="code">TBNK</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_bank_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="bnk"/>
             <field model="account.account" name="default_credit_account_id" ref="bnk"/>
@@ -369,7 +364,6 @@
             <field name="name">Checks Journal - (test)</field>
             <field name="code">TCHK</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_check_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
             <field model="account.account" name="default_credit_account_id" ref="cash"/>
@@ -390,7 +384,6 @@
                  that test OpenERP arrive directly in the touchscreen UI.
             -->
             <field name="cash_control" eval="False"/>
-            <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
             <field model="account.account" name="default_credit_account_id" ref="cash"/>
@@ -401,7 +394,6 @@
             <field name="name">Miscellaneous Journal - (test)</field>
             <field name="code">TMIS</field>
             <field name="type">general</field>
-            <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_miscellaneous_journal"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
@@ -410,7 +402,6 @@
             <field name="name">Opening Entries Journal - (test)</field>
             <field name="code">TOEJ</field>
             <field name="type">situation</field>
-            <field name="view_id" ref="account_journal_view"/>
             <field name="sequence_id" ref="sequence_opening_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="o_income"/>
             <field model="account.account" name="default_credit_account_id" ref="o_expense"/>
@@ -422,7 +413,6 @@
             <field name="name">USD Bank Journal - (test)</field>
             <field name="code">TUBK</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account_journal_bank_view"/>
             <field model="account.account" name="default_debit_account_id" ref="usd_bnk"/>
             <field model="account.account" name="default_credit_account_id" ref="usd_bnk"/>
             <field name="currency" ref="base.USD"/>
diff --git a/addons/account/i18n/es_DO.po b/addons/account/i18n/es_DO.po
index d83e259ca9d..d7f826f9459 100644
--- a/addons/account/i18n/es_DO.po
+++ b/addons/account/i18n/es_DO.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-02 15:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-29 20:54+0000\n"
+"Last-Translator: Jose Ernesto Mendez <tecnologia@obsdr.com>\n"
 "Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:00+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -3736,7 +3736,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "VAT:"
-msgstr ""
+msgstr "ITBIS:"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -3979,7 +3979,7 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "ITBIS:"
 
 #. module: account
 #: report:account.central.journal:0
@@ -5349,7 +5349,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
 msgid "Account Vat Declaration"
-msgstr ""
+msgstr "Cuenta Declaración de ITBIS"
 
 #. module: account
 #: help:account.config.settings,module_account_accountant:0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index 66a866c2e40..82b0d21bae0 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-26 11:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:44+0000\n"
 "Last-Translator: Numérigraphe <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: 2012-11-27 05:23+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
@@ -2428,7 +2428,7 @@ msgstr "Impression de journal comptable"
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "Catégorie de produits"
+msgstr "Catégorie d'articles"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
@@ -2719,12 +2719,12 @@ msgstr "Changer en"
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr "Qté de produits "
+msgstr "Nb de qté. d'articles "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr "Modèle de produit"
+msgstr "Modèle d'article"
 
 #. module: account
 #: report:account.account.balance:0
@@ -4096,7 +4096,7 @@ msgstr "Continuer"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr "Catégorie de produits"
+msgstr "Catégorie d'article"
 
 #. module: account
 #: code:addons/account/account.py:987
@@ -4142,7 +4142,7 @@ msgstr "Détail"
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
 msgstr ""
-"Cette taxe d'achat sera attribuée par défaut à tous les nouveaux produits."
+"Cette taxe d'achat sera attribuée par défaut à tous les nouveaux articles."
 
 #. module: account
 #: report:account.invoice:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 449810103b2..f2ab301b7a8 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-25 23:52+0000\n"
+"PO-Revision-Date: 2012-11-29 23:20+0000\n"
 "Last-Translator: Sergio Corato <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: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -26,6 +26,7 @@ msgstr "Sistema di pagamento"
 msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
+"Una posizione fiscale può essere definita una sola volta per lo stesso conto."
 
 #. module: account
 #: view:account.unreconcile:0
@@ -85,7 +86,7 @@ msgstr "Importa da fatture o pagamenti"
 #: code:addons/account/account_move_line.py:1303
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "Conto Errato!"
 
 #. module: account
 #: view:account.move:0
@@ -242,7 +243,7 @@ msgstr "Sezionale: %s"
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "N. di cifre da usare per il codice conto"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -262,6 +263,9 @@ msgid ""
 "lines for invoices. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Imposta il conto analitico che sarà usato di default sulle righe imposta "
+"delle fatture. Lasciare vuoto per non usare un conto analitico sulle righe "
+"imposta delle fatture per default."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -297,7 +301,7 @@ msgstr "Reports belgi"
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
-msgstr ""
+msgstr "Vista Ricavi"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -394,7 +398,7 @@ msgstr "Annulla Riconciliazione"
 #. module: account
 #: field:account.config.settings,module_account_budget:0
 msgid "Budget management"
-msgstr ""
+msgstr "Gestione Budget"
 
 #. module: account
 #: view:product.template:0
@@ -416,7 +420,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_multi_currency:0
 msgid "Allow multi currencies"
-msgstr ""
+msgstr "Consenti valute multiple"
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
@@ -437,12 +441,12 @@ msgstr "Giugno"
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "E' necessario selezionare i conti da riconciliare."
 
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "Abilita la contabilità analitica."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -462,7 +466,7 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Commerciale"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -685,12 +689,12 @@ msgstr "Il contabile conferma la registrazione"
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
 #, python-format
 msgid "Nothing to reconcile"
-msgstr ""
+msgstr "Nulla da riconciliare"
 
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Accuratezza decimale nelle registrazioni sezionale"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -725,6 +729,8 @@ msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
 msgstr ""
+"Il sezionale specificato non ha registrazioni in stato bozza per questo "
+"periodo."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1671,6 +1677,9 @@ msgid ""
 "There is nothing to reconcile. All invoices and payments\n"
 "                    have been reconciled, your partner balance is clean."
 msgstr ""
+"Non c'è nulla da riconciliare. Tutte le fatture e i pagamenti\n"
+"                    sono stati riconciliati, il saldo dei clienti/fornitori "
+"è a zero."
 
 #. module: account
 #: field:account.chart.template,code_digits:0
@@ -2106,7 +2115,7 @@ msgstr ""
 #: view:account.bank.statement:0
 #: field:account.bank.statement,last_closing_balance:0
 msgid "Last Closing Balance"
-msgstr ""
+msgstr "Ultima Chiusura di Bilancio"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -3474,7 +3483,7 @@ msgstr "Bilancino"
 #: code:addons/account/account.py:430
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
-msgstr ""
+msgstr "Non è possibile adattare il saldo iniziale (importo negativo)."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -4881,7 +4890,7 @@ msgstr "Modalità di visualizzazione"
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "Saldato"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -5731,14 +5740,14 @@ msgstr "Conto imposta"
 #: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr "Bilancio"
+msgstr "Stato Patrimoniale"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:187
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr "Utili & Perdite (Conto di Ricavo)"
+msgstr "Conto economico"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -5983,6 +5992,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be treated."
 msgstr ""
+"Selezionare qui il tipo di riga del pagamento. Notare che l'ultima riga "
+"dovrebbe essere di tipo 'Saldo' per assicurarsi che l'intero importo sia "
+"saldato."
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
@@ -6327,7 +6339,7 @@ msgstr "Totale debito"
 #: model:account.account.type,name:account.data_account_type_income
 #: model:account.financial.report,name:account.account_financial_report_income0
 msgid "Income"
-msgstr "Entrata"
+msgstr "Ricavi"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -6569,7 +6581,7 @@ msgstr "Note di Credito"
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr "Salso valuta estera"
+msgstr "Saldo valuta estera"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -6988,6 +7000,8 @@ msgid ""
 "There is no opening/closing period defined, please create one to set the "
 "initial balance."
 msgstr ""
+"Non ci sono periodi di apertura/chiusura definiti, crearne uno per impostare "
+"il saldo iniziale."
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -7208,7 +7222,7 @@ msgstr "Nome Modello"
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr "Conto categoria spesa"
+msgstr "Conto Categoria Costi"
 
 #. module: account
 #: sql_constraint:account.tax:0
@@ -7666,6 +7680,11 @@ msgid ""
 "Make sure you have configured payment terms properly.\n"
 "The latest payment term line should be of the \"Balance\" type."
 msgstr ""
+"Non è possibile validare una voce senza saldo.\n"
+"Assicurarsi che siano stati configurati correttamente i termini di "
+"pagamento.\n"
+"L'ultima riga della condizione di pagamento dovrebbe essere di tipo "
+"\"Saldo\"."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -8107,7 +8126,7 @@ msgstr "Pro-Forma"
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr "Squadrato"
+msgstr "Zoppe"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -8844,7 +8863,7 @@ msgstr ""
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr "Income Category Account"
+msgstr "Conto Categoria Ricavi"
 
 #. module: account
 #: field:account.account,adjusted_balance:0
@@ -8885,6 +8904,8 @@ msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
 msgstr ""
+"Errore: L'unità di misura di default e l'unità di misura di acquisto devono "
+"essere nella stessa categoria."
 
 #. module: account
 #: report:account.invoice:0
@@ -9831,7 +9852,7 @@ msgstr "Documento: Scheda Conto Cliente"
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr "Categoria Utili & Perdite / Bilancio"
+msgstr "Categoria CE / SP"
 
 #. module: account
 #: view:account.account.template:0
@@ -11099,6 +11120,7 @@ msgstr "Raggruppa per mese Data Fattura"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Non c'è un conto di ricavo definito per questo prodotto: \"%s\" (id:%d)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 9671fce77c3..6552391bd16 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:52+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 13:22+0000\n"
+"Last-Translator: Andrius Preimantas <andrius.preimantas@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: 2012-11-25 05:56+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1750,7 +1750,7 @@ msgstr "Kreditorių sąskaita"
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Grąžintino mokesčio sąskaita"
+msgstr "Grąžinimų mokesčio sąskaita"
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -5832,7 +5832,7 @@ msgstr ""
 #: field:account.bank.statement.line,name:0
 #: field:account.invoice,reference:0
 msgid "Communication"
-msgstr ""
+msgstr "Komunikacija"
 
 #. module: account
 #: view:account.config.settings:0
@@ -6356,7 +6356,7 @@ msgstr ""
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Mokėtino mokesčio sąskaita"
+msgstr "Sąsk. fakt. mokesčių sąskaitą"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_journal
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 73b1e82e244..0a8b6e23ad5 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-27 20:06+0000\n"
+"PO-Revision-Date: 2012-11-28 13:31+0000\n"
 "Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:40+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -5220,7 +5220,7 @@ msgstr "Fakturaer"
 #. module: account
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
-msgstr ""
+msgstr "Kryss av denne boksen hvis dette selskapet er en juridisk enhet."
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_chk
@@ -5453,7 +5453,7 @@ msgstr ""
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Finansiell ledelse."
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5469,7 +5469,7 @@ msgstr "Bevegelser"
 #: field:account.bank.statement,details_ids:0
 #: view:account.journal:0
 msgid "CashBox Lines"
-msgstr ""
+msgstr "Kontontboks linjer."
 
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
@@ -5515,6 +5515,8 @@ msgid ""
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
+"Det er ingen periode definert for denne datoen:% s.\n"
+"Vennligst opprette en."
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -5616,7 +5618,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:1326
 #, python-format
 msgid "%s <b>paid</b>."
-msgstr ""
+msgstr "%s <b>Betalt</b>."
 
 #. module: account
 #: view:account.financial.report:0
@@ -5759,7 +5761,7 @@ msgstr "Beregningskode (dersom type=kode)"
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
-msgstr ""
+msgstr "Kan ikke finne en kontoplan for dette selskapet, du bør opprette en."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5894,7 +5896,7 @@ msgstr "Inkludert i basisbeløpet"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Leverandør faktura nummer."
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5915,6 +5917,8 @@ msgstr "Beregning"
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
+"Du kan ikke legge til / endre oppføringer i en lukket periode% s av "
+"tidsskriftet% s."
 
 #. module: account
 #: view:account.journal:0
@@ -5939,7 +5943,7 @@ msgstr "Periodestart"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Eiendel Vis."
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -6012,12 +6016,12 @@ msgstr "Årsavslutningsjournal"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Utkast refusjon. "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Fyll ut dette skjemaet hvis du setter penger i kasse apparatet:"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -6094,7 +6098,7 @@ msgstr "Kundefakturaer og kreditnotaer"
 #: code:addons/account/wizard/account_move_journal.py:161
 #, python-format
 msgid "This period is already closed."
-msgstr ""
+msgstr "Denne perioden er allerede lukket."
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -6107,7 +6111,7 @@ msgstr "Valutabeløp"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Runde per. linje."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@@ -6168,7 +6172,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "Du må angi en periode lengde større enn 0."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -6179,7 +6183,7 @@ msgstr "Regnskapsstatus Mal"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Utkast refusjon."
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -6216,7 +6220,7 @@ msgstr "Avstem med nedskriving"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "Du kan ikke opprette journal elementer på en konto av typen visning."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -6291,7 +6295,7 @@ msgstr "Flytt navn (id): %s (%s)"
 #. module: account
 #: view:account.move.journal:0
 msgid "Standard Entries"
-msgstr ""
+msgstr "Standard oppføringer."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6364,7 +6368,7 @@ msgstr "Avgiftskartlegging"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Velg Firma."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6438,7 +6442,7 @@ msgstr "Antall linjer"
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(Oppdatering)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6480,7 +6484,7 @@ msgstr ""
 #. module: account
 #: field:account.journal,loss_account_id:0
 msgid "Loss Account"
-msgstr ""
+msgstr "Tap konto."
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -6742,7 +6746,7 @@ msgstr ""
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Bank og kontant."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6828,7 +6832,7 @@ msgstr "Fordring"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Du kan ikke opprette journal enmer i en lukker konto."
 
 #. module: account
 #: code:addons/account/account_invoice.py:594
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 51633c9e660..eed659d7d18 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-25 13:43+0000\n"
+"PO-Revision-Date: 2012-11-29 15:05+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-11-26 04:41+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #, python-format
 #~ msgid "Integrity Error !"
@@ -114,6 +114,7 @@ msgid ""
 "Error!\n"
 "You cannot create recursive account templates."
 msgstr ""
+"Fout! Het is niet toegestaan on een recursief grootboekschema aan te maken."
 
 #. module: account
 #. openerp-web
@@ -155,6 +156,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik om de zichtbare kolommen van een dagboek te "
+"specificeren.\n"
+"              </p><p>\n"
+"                Dagboekweergaves bepalen de manier waarop boekingen \n"
+"                ingevoerd kunnen worden. Selecteer de velden welke zichtbaar "
+"\n"
+"                moeten zijn en bepaald de volgorde daarvan.\n"
+"              </p><p>\n"
+"                In de dagboekinstellingen kan bepaald worden welke gegevens\n"
+"                zichtbaar zijn bij boekingen in het betreffende dagboek.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -205,6 +219,8 @@ msgid ""
 "which is set after generating opening entries from 'Generate Opening "
 "Entries'."
 msgstr ""
+"U dient het 'Jaarafsluiting dagboek' te definiëren voor het fiscale jaar, "
+"nadat u een openingsbalans heeft gemaakt"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -223,6 +239,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                klik hier om een fiscale periode toe te voegen.\n"
+"              </p><p>\n"
+"                Een fiscale periode is vaak een maand of een kwartaal. "
+"Normaal\n"
+"                zal dit gelijk zijn met de periode van uw Belasting "
+"aangifte.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
@@ -243,7 +268,7 @@ msgstr "Dagboek: %s"
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "Aantal cijfers voor de rekening code"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -263,6 +288,9 @@ msgid ""
 "lines for invoices. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Geef de kostenplaats welke standaard gebruikt moet worden bij BTW factuur "
+"regels. Als u dit veld niet invuld, wordt er standaard geen kostenplaats "
+"gebruikt."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -298,7 +326,7 @@ msgstr "Belgische overzichten"
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
-msgstr ""
+msgstr "View opbrengsten"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -314,7 +342,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_next:0
 msgid "Next credit note number"
-msgstr ""
+msgstr "Volgend nummer creditnota"
 
 #. module: account
 #: help:account.config.settings,module_account_voucher:0
@@ -323,6 +351,10 @@ msgid ""
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
+"Deze module bevat alle voorzieningen voor registratie van "
+"(bank)afschriften.\n"
+"                                                                          "
+"hiermee installeert u de module 'account_voucher'"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -361,6 +393,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik hier om een creditnota te maken. \n"
+"              </p><p>\n"
+"                Een creditnota is een factuur, waarbij u een bestaande "
+"factuur volledig of gedeeltelijk \n"
+"                crediteert.\n"
+"              </p><p>\n"
+"                In plaats van handmatig kunt u hiermee een creditnota maken "
+"\n"
+"                direct vanaf de originele factuur.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -426,12 +470,12 @@ msgstr "Juni"
 #: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile."
-msgstr ""
+msgstr "Selecteer de grootboekrekeningen die afgeletterd moeten worden."
 
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "stelt u in staat kostenplaatsen te gebruiken"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -531,6 +575,18 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Als u 'afronden per regel' selecteert: voor elke BTW rekening , wordt het "
+"BTW bedrag eerst berekend en afgerond voor elke  factuur regel en vervolgens "
+"worden deze afgeronde bedragen opgeteld, wat leidt tot het totale bedrag "
+"voor deze belasting. \r\n"
+"\r\n"
+"Als u 'afronden globaal' selecteert: voor elke BTW rekening wordt het BTW "
+"bedrag berekend voor elke factuur regel. vervolgens zullen deze bedragen "
+"worden opgeteld en uiteindelijk wordt dit totale BTW bedrag afgerond. \r\n"
+"\r\n"
+"Als u verkoopt met BTW inbegrepen, moet u kiezen voor 'afronden per regel', "
+"omdat U zeker wil zijn dat de subtotalen van \r\n"
+"uw (BTW inbegrepen) regels gelijk zijn aan het totale bedrag met BTW."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -600,7 +656,7 @@ msgstr "Bovenliggend doel"
 #. module: account
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Geeft de volgorde van de factuur regel bij het tonen van de factuur"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
@@ -679,7 +735,7 @@ msgstr "Niets af te letteren"
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Aantal decimalen van journaalposten"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -713,7 +769,7 @@ msgstr "Rapport waarde"
 msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
-msgstr ""
+msgstr "Geselecteerd dagboek heeft geen 'concept'boekingen"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -768,12 +824,16 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Geen journaalposten gevonden.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: code:addons/account/account.py:1606
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "U kunt geen boeking doen met een andere valuta dan ..."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
@@ -807,7 +867,7 @@ msgstr "Dagboek periode"
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
-msgstr ""
+msgstr "U kunt niet meerdere boekingen doen bij een centraal journaal"
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 55d61f5c611..c95e3919012 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-01 08:44+0000\n"
+"PO-Revision-Date: 2012-11-28 07:22+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:01+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -776,7 +776,7 @@ msgstr "账簿的会计期间"
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
-msgstr ""
+msgstr "在每个会计期间，你不可以创建1个以上的总分类凭证"
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -784,7 +784,7 @@ msgid ""
 "Set the analytic account that will be used by default on the invoice tax "
 "lines for refunds. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
-msgstr ""
+msgstr "设置辅助核算项，用于退款时发票上默认税科目。如果默认不要在发票的税上 使用辅助核算项，留空。"
 
 #. module: account
 #: view:account.account:0
@@ -6098,7 +6098,7 @@ msgstr "固定金额"
 #: code:addons/account/account_move_line.py:1151
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
-msgstr ""
+msgstr "你不能修改税，你需要删去并且重建这一行"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index 68eaedb20a6..a001b6b4f52 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -98,150 +98,124 @@ class account_invoice_report(osv.osv):
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual': fields.float('Total Residual', readonly=True),
         'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
-        'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
-        'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg"),
     }
     _order = 'date desc'
 
-
     def _select(self):
         select_str = """
-            SELECT min(ail.id) as id,
-                    ai.date_invoice as date,
-                    to_char(ai.date_invoice, 'YYYY') as year,
-                    to_char(ai.date_invoice, 'MM') as month,
-                    to_char(ai.date_invoice, 'YYYY-MM-DD') as day,
-                    ail.product_id,
-                    ai.partner_id as partner_id,
-                    ai.payment_term as payment_term,
-                    ai.period_id as period_id,
-                    (case when u.uom_type not in ('reference') then
-                        (select name from product_uom where uom_type='reference' and active and category_id=u.category_id LIMIT 1)
-                    else
-                        u.name
-                    end) as uom_name,
-                    ai.currency_id as currency_id,
-                    ai.journal_id as journal_id,
-                    ai.fiscal_position as fiscal_position,
-                    ai.user_id as user_id,
-                    ai.company_id as company_id,
-                    count(ail.*) as nbr,
-                    ai.type as type,
-                    ai.state,
-                    pt.categ_id,
-                    ai.date_due as date_due,
-                    ai.account_id as account_id,
-                    ail.account_id as account_line_id,
-                    ai.partner_bank_id as partner_bank_id,
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         -ail.quantity / u.factor
-                        else
-                         ail.quantity / u.factor
-                        end) as product_qty,
-
-                    sum(case when ai.type in ('out_refund','in_invoice') then
-                         -ail.price_subtotal
-                        else
-                          ail.price_subtotal
-                        end) / cr.rate as price_total,
-
-                    (case when ai.type in ('out_refund','in_invoice') then
-                      sum(-ail.price_subtotal)
-                    else
-                      sum(ail.price_subtotal)
-                    end) / (CASE WHEN sum(ail.quantity/u.factor) <> 0
-                       THEN
-                         (case when ai.type in ('out_refund','in_invoice')
-                          then sum(-ail.quantity/u.factor)
-                          else sum(ail.quantity/u.factor) end)
-                       ELSE 1
-                       END)
-                     / cr.rate as price_average,
-
-                    cr.rate as currency_rate,
-                    sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
-                        from account_move_line as aml
-                        left join account_invoice as a ON (a.move_id=aml.move_id)
-                        left join account_invoice_line as l ON (a.id=l.invoice_id)
-                        where a.id=ai.id)) as delay_to_pay,
-                    sum((select extract(epoch from avg(date_trunc('day',a.date_due)-date_trunc('day',a.date_invoice)))/(24*60*60)::decimal(16,2)
-                        from account_move_line as aml
-                        left join account_invoice as a ON (a.move_id=aml.move_id)
-                        left join account_invoice_line as l ON (a.id=l.invoice_id)
-                        where a.id=ai.id)) as due_delay,
-                    (case when ai.type in ('out_refund','in_invoice') then
-                      -ai.residual
-                    else
-                      ai.residual
-                    end)/ (CASE WHEN
-                        (select count(l.id) from account_invoice_line as l
-                         left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id) <> 0
-                       THEN
-                        (select count(l.id) from account_invoice_line as l
-                         left join account_invoice as a ON (a.id=l.invoice_id)
-                         where a.id=ai.id)
-                       ELSE 1
-                       END) / cr.rate as residual
+            SELECT sub.id, sub.date, sub.year, sub.month, sub.day, sub.product_id, sub.partner_id,
+                sub.payment_term, sub.period_id, sub.uom_name, sub.currency_id, sub.journal_id,
+                sub.fiscal_position, sub.user_id, sub.company_id, sub.nbr, sub.type, sub.state,
+                sub.categ_id, sub.date_due, sub.account_id, sub.account_line_id, sub.partner_bank_id,
+                sub.product_qty, sub.price_total / cr.rate as price_total, sub.price_average /cr.rate as price_average,
+                cr.rate as currency_rate, sub.residual / cr.rate as residual
         """
         return select_str
 
-    def _where(self):
-        where_str = """
-            WHERE cr.id in (select id from res_currency_rate cr2  where (cr2.currency_id = ai.currency_id)
-                and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
+    def _sub_select(self):
+        select_str = """
+                SELECT min(ail.id) AS id,
+                    ai.date_invoice AS date,
+                    to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text) AS year,
+                    to_char(ai.date_invoice::timestamp with time zone, 'MM'::text) AS month,
+                    to_char(ai.date_invoice::timestamp with time zone, 'YYYY-MM-DD'::text) AS day,
+                    ail.product_id, ai.partner_id, ai.payment_term, ai.period_id,
+                    CASE
+                     WHEN u.uom_type::text <> 'reference'::text
+                        THEN ( SELECT product_uom.name
+                               FROM product_uom
+                               WHERE product_uom.uom_type::text = 'reference'::text
+                                AND product_uom.active
+                                AND product_uom.category_id = u.category_id LIMIT 1)
+                        ELSE u.name
+                    END AS uom_name,
+                    ai.currency_id, ai.journal_id, ai.fiscal_position, ai.user_id, ai.company_id,
+                    count(ail.*) AS nbr,
+                    ai.type, ai.state, pt.categ_id, ai.date_due, ai.account_id, ail.account_id AS account_line_id,
+                    ai.partner_bank_id,
+                    SUM(CASE
+                         WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                            THEN (- ail.quantity) / u.factor
+                            ELSE ail.quantity / u.factor
+                        END) AS product_qty,
+                    SUM(CASE
+                         WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                            THEN - ail.price_subtotal
+                            ELSE ail.price_subtotal
+                        END) AS price_total,
+                    CASE
+                     WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                        THEN SUM(- ail.price_subtotal)
+                        ELSE SUM(ail.price_subtotal)
+                    END / CASE
+                           WHEN SUM(ail.quantity / u.factor) <> 0::numeric
+                               THEN CASE
+                                     WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                                        THEN SUM((- ail.quantity) / u.factor)
+                                        ELSE SUM(ail.quantity / u.factor)
+                                    END
+                               ELSE 1::numeric
+                          END AS price_average,
+                    CASE
+                     WHEN ai.type::text = ANY (ARRAY['out_refund'::character varying::text, 'in_invoice'::character varying::text])
+                        THEN - ai.residual
+                        ELSE ai.residual
+                    END / CASE
+                           WHEN (( SELECT count(l.id) AS count
+                                   FROM account_invoice_line l
+                                   LEFT JOIN account_invoice a ON a.id = l.invoice_id
+                                   WHERE a.id = ai.id)) <> 0
+                               THEN ( SELECT count(l.id) AS count
+                                      FROM account_invoice_line l
+                                      LEFT JOIN account_invoice a ON a.id = l.invoice_id
+                                      WHERE a.id = ai.id)
+                               ELSE 1::bigint
+                          END::numeric AS residual
         """
-        return where_str
+        return select_str
 
     def _from(self):
         from_str = """
-            FROM account_invoice_line as ail
-                left join account_invoice as ai ON (ai.id=ail.invoice_id)
-                left join product_product pr on (pr.id=ail.product_id)
-                left join product_template pt on (pt.id=pr.product_tmpl_id)
-                left join product_uom u on (u.id=ail.uos_id),
-                res_currency_rate cr
+                FROM account_invoice_line ail
+                JOIN account_invoice ai ON ai.id = ail.invoice_id
+                LEFT JOIN product_product pr ON pr.id = ail.product_id
+                left JOIN product_template pt ON pt.id = pr.product_tmpl_id
+                LEFT JOIN product_uom u ON u.id = ail.uos_id
         """
         return from_str
 
     def _group_by(self):
         group_by_str = """
-            GROUP BY ail.product_id,
-                    ai.date_invoice,
-                    ai.id,
-                    cr.rate,
-                    to_char(ai.date_invoice, 'YYYY'),
-                    to_char(ai.date_invoice, 'MM'),
-                    to_char(ai.date_invoice, 'YYYY-MM-DD'),
-                    ai.partner_id,
-                    ai.payment_term,
-                    ai.period_id,
-                    u.name,
-                    ai.currency_id,
-                    ai.journal_id,
-                    ai.fiscal_position,
-                    ai.user_id,
-                    ai.company_id,
-                    ai.type,
-                    ai.state,
-                    pt.categ_id,
-                    ai.date_due,
-                    ai.account_id,
-                    ail.account_id,
-                    ai.partner_bank_id,
-                    ai.residual,
-                    ai.amount_total,
-                    u.uom_type,
-                    u.category_id
+                GROUP BY ail.product_id, ai.date_invoice, ai.id,
+                    to_char(ai.date_invoice::timestamp with time zone, 'YYYY'::text),
+                    to_char(ai.date_invoice::timestamp with time zone, 'MM'::text),
+                    to_char(ai.date_invoice::timestamp with time zone, 'YYYY-MM-DD'::text),
+                    ai.partner_id, ai.payment_term, ai.period_id, u.name, ai.currency_id, ai.journal_id,
+                    ai.fiscal_position, ai.user_id, ai.company_id, ai.type, ai.state, pt.categ_id,
+                    ai.date_due, ai.account_id, ail.account_id, ai.partner_bank_id, ai.residual,
+                    ai.amount_total, u.uom_type, u.category_id
         """
         return group_by_str
 
     def init(self, cr):
         # self._table = account_invoice_report
         tools.drop_view_if_exists(cr, self._table)
-        cr.execute("CREATE or REPLACE VIEW %s as (%s %s %s %s)" % (
+        cr.execute("""CREATE or REPLACE VIEW %s as (
+            %s
+            FROM (
+                %s %s %s
+            ) AS sub
+            JOIN res_currency_rate cr ON (cr.currency_id = sub.currency_id)
+            WHERE
+                cr.id IN (SELECT id
+                          FROM res_currency_rate cr2
+                          WHERE (cr2.currency_id = sub.currency_id)
+                              AND ((sub.date IS NOT NULL AND cr.name <= sub.date)
+                                    OR (sub.date IS NULL AND cr.name <= NOW()))
+                          ORDER BY name DESC LIMIT 1)
+        )""" % (
                     self._table, 
-                    self._select(), self._from(), self._where(), self._group_by()))
+                    self._select(), self._sub_select(), self._from(), self._group_by()))
 
 account_invoice_report()
 
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index 289db376e5d..66e17560bde 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -30,8 +30,6 @@
                 <!-- <field name="reconciled"  sum="# Reconciled"/> -->
                 <field name="user_currency_price_total" sum="Total Without Tax"/>
                 <field name="user_currency_residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
-                <field name="due_delay"  sum="Avg. Due Delay" invisible="context.get('residual_invisible',False)"/>
-                <field name="delay_to_pay"  sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>
             </tree>
         </field>
     </record>
@@ -93,7 +91,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_period':1,'search_default_current':1, 'search_default_year': 1, 'search_default_category_product':1, 'search_default_customer':1, 'group_by':[], 'group_by_no_leaf':1,}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
-        <field name="help">From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
+        <field name="help">From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs.</field>
 
     </record>
 
diff --git a/addons/account/res_currency.py b/addons/account/res_currency.py
index ce781a1e11a..60bb6152a9b 100644
--- a/addons/account/res_currency.py
+++ b/addons/account/res_currency.py
@@ -29,6 +29,7 @@ class res_currency_account(osv.osv):
         if context is None:
             context = {}
         rate = super(res_currency_account, self)._get_conversion_rate(cr, uid, from_currency, to_currency, context=context)
+        #process the case where the account doesn't work with an outgoing currency rate method 'at date' but 'average'
         account = context.get('res.currency.compute.account')
         account_invert = context.get('res.currency.compute.account_invert')
         if account and account.currency_mode == 'average' and account.currency_id:
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 28bedbf65a1..d1f0bbab6b5 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -7,8 +7,6 @@ access_account_tax_internal_user,account.tax internal user,model_account_tax,bas
 access_account_account,account.account,model_account_account,account.group_account_user,1,0,0,0

 access_account_account_user,account.account user,model_account_account,base.group_user,1,0,0,0

 access_account_account_partner_manager,account.account partner manager,model_account_account,base.group_partner_manager,1,0,0,0

-access_account_journal_view,account.journal.view,model_account_journal_view,account.group_account_user,1,0,0,0

-access_account_journal_column,account.journal.column,model_account_journal_column,account.group_account_user,1,0,0,0

 access_account_journal_period_manager,account.journal.period manager,model_account_journal_period,account.group_account_manager,1,0,0,0

 access_account_tax_code,account.tax.code,model_account_tax_code,account.group_account_invoice,1,0,0,0

 access_account_tax,account.tax,model_account_tax,account.group_account_invoice,1,0,0,0

@@ -83,8 +81,6 @@ access_account_entries_report_employee,account.entries.report employee,model_acc
 access_analytic_entries_report_manager,analytic.entries.report,model_analytic_entries_report,account.group_account_manager,1,0,0,0

 access_account_cashbox_line,account.cashbox.line,model_account_cashbox_line,account.group_account_user,1,1,1,1

 access_account_journal_cashbox_line,account.journal.cashbox.line,model_account_journal_cashbox_line,account.group_account_user,1,1,1,0

-access_account_journal_view_invoice,account.journal.view invoice,model_account_journal_view,account.group_account_invoice,1,1,1,1

-access_account_journal_column_invoice,account.journal.column invoice,model_account_journal_column,account.group_account_invoice,1,1,1,1

 access_account_invoice_tax_accountant,account.invoice.tax accountant,model_account_invoice_tax,account.group_account_user,1,0,0,0

 access_account_move_reconcile_manager,account.move.reconcile manager,model_account_move_reconcile,account.group_account_manager,1,0,0,0

 access_account_analytic_line_invoice,account.analytic.line invoice,model_account_analytic_line,account.group_account_invoice,1,1,1,1

diff --git a/addons/account/static/src/js/account_move_line_quickadd.js b/addons/account/static/src/js/account_move_line_quickadd.js
new file mode 100644
index 00000000000..997b2b03bb6
--- /dev/null
+++ b/addons/account/static/src/js/account_move_line_quickadd.js
@@ -0,0 +1,99 @@
+openerp.account.quickadd = function (instance) {
+    var _t = instance.web._t,
+        _lt = instance.web._lt;
+    var QWeb = instance.web.qweb;
+    
+    instance.web.account = instance.web.account || {};
+
+    instance.web.views.add('tree_account_move_line_quickadd', 'instance.web.account.QuickAddListView');
+    instance.web.account.QuickAddListView = instance.web.ListView.extend({
+        init: function() {
+            this._super.apply(this, arguments);
+            this.journals = [];
+            this.periods = [];
+            this.current_journal = null;
+            this.current_period = null;
+            this.default_period = null;
+            this.default_journal = null;
+            this.current_journal_type = null;
+            this.current_journal_currency = null;
+            this.current_journal_analytic = null;
+        },
+        start:function(){
+            var tmp = this._super.apply(this, arguments);
+            var self = this;
+            this.$el.parent().prepend(QWeb.render("AccountMoveLineQuickAdd", {widget: this}));
+            
+            this.$el.parent().find('.oe_account_select_journal').change(function() {
+                    self.current_journal = this.value === '' ? null : parseInt(this.value);
+                    self.do_search(self.last_domain, self.last_context, self.last_group_by);
+                });
+            this.$el.parent().find('.oe_account_select_period').change(function() {
+                    self.current_period = this.value === '' ? null : parseInt(this.value);
+                    self.do_search(self.last_domain, self.last_context, self.last_group_by);
+                });
+            this.on('edit:after', this, function () {
+                self.$el.parent().find('.oe_account_select_journal').attr('disabled', 'disabled');
+                self.$el.parent().find('.oe_account_select_period').attr('disabled', 'disabled');
+            });
+            this.on('save:after cancel:after', this, function () {
+                self.$el.parent().find('.oe_account_select_journal').removeAttr('disabled');
+                self.$el.parent().find('.oe_account_select_period').removeAttr('disabled');
+            });
+            var mod = new instance.web.Model("account.move.line", self.dataset.context, self.dataset.domain);
+            mod.call("default_get", [['journal_id','period_id'],self.dataset.context]).then(function(result) {
+                self.current_period = result['period_id'];
+                self.current_journal = result['journal_id'];
+            });
+            return tmp;
+        },
+        do_search: function(domain, context, group_by) {
+            var self = this;
+            this.last_domain = domain;
+            this.last_context = context;
+            this.last_group_by = group_by;
+            this.old_search = _.bind(this._super, this);
+            var mod = new instance.web.Model("account.move.line", context, domain);
+            return $.when(mod.call("list_journals", []).then(function(result) {
+                self.journals = result;
+            }),mod.call("list_periods", []).then(function(result) {
+                self.periods = result;
+            })).then(function () {
+                var o;
+                self.$el.parent().find('.oe_account_select_journal').children().remove().end();
+                self.$el.parent().find('.oe_account_select_journal').append(new Option('', ''));
+                for (var i = 0;i < self.journals.length;i++){
+                    o = new Option(self.journals[i][1], self.journals[i][0]);
+                    if (self.journals[i][0] === self.current_journal){
+                        self.current_journal_type = self.journals[i][2];
+                        self.current_journal_currency = self.journals[i][3];
+                        self.current_journal_analytic = self.journals[i][4];
+                        $(o).attr('selected',true);
+                    }
+                    self.$el.parent().find('.oe_account_select_journal').append(o);
+                }
+                self.$el.parent().find('.oe_account_select_period').children().remove().end();
+                self.$el.parent().find('.oe_account_select_period').append(new Option('', ''));
+                for (var i = 0;i < self.periods.length;i++){
+                    o = new Option(self.periods[i][1], self.periods[i][0]);
+                    self.$el.parent().find('.oe_account_select_period').append(o);
+                }    
+                self.$el.parent().find('.oe_account_select_period').val(self.current_period).attr('selected',true);
+                return self.search_by_journal_period();
+            });
+        },
+        search_by_journal_period: function() {
+            var self = this;
+            var domain = [];
+            if (self.current_journal !== null) domain.push(["journal_id", "=", self.current_journal]);
+            if (self.current_period !== null) domain.push(["period_id", "=", self.current_period]);
+            self.last_context["journal_id"] = self.current_journal === null ? false : self.current_journal;
+            if (self.current_period === null) delete self.last_context["period_id"];
+            else self.last_context["period_id"] =  self.current_period;
+            self.last_context["journal_type"] = self.current_journal_type;
+            self.last_context["currency"] = self.current_journal_currency;
+            self.last_context["analytic_journal_id"] = self.current_journal_analytic;
+            return self.old_search(new instance.web.CompoundDomain(self.last_domain, domain), self.last_context, self.last_group_by);
+        },
+    });
+};
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index 22fe9b7b392..19c194166e2 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -1,9 +1,10 @@
 openerp.account = function (instance) {
+    openerp.account.quickadd(instance);
     var _t = instance.web._t,
         _lt = instance.web._lt;
     var QWeb = instance.web.qweb;
     
-    instance.web.account = {};
+    instance.web.account = instance.web.account || {};
     
     instance.web.views.add('tree_account_reconciliation', 'instance.web.account.ReconciliationListView');
     instance.web.account.ReconciliationListView = instance.web.ListView.extend({
diff --git a/addons/account/static/src/xml/account_move_line_quickadd.xml b/addons/account/static/src/xml/account_move_line_quickadd.xml
new file mode 100644
index 00000000000..3ed66eec917
--- /dev/null
+++ b/addons/account/static/src/xml/account_move_line_quickadd.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates id="template" xml:space="preserve">
+    
+    <t t-name="AccountMoveLineQuickAdd">
+        <div class="oe_account_quickadd ui-toolbar" style="margin-bottom:0px;">
+            <div class="oe_form_dropdown_section">
+                <h4>Period :</h4> 
+                <select class="oe_account_select_period">
+                    
+                </select>
+            </div>
+            <div class="oe_form_dropdown_section">
+                <h4>Journal :</h4> 
+                <select class="oe_account_select_journal" >
+                    
+                </select>
+            </div>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml
index 1e24d2ca0e7..1c3547ccefd 100644
--- a/addons/account/test/account_fiscalyear_close.yml
+++ b/addons/account/test/account_fiscalyear_close.yml
@@ -29,7 +29,6 @@
     default_debit_account_id: cash
     default_credit_account_id: cash
     company_id: base.main_company
-    view_id: account_journal_bank_view
     centralisation: 1
 -
   I called the Generate Fiscalyear Opening Entries wizard
@@ -47,47 +46,4 @@
   !python {model: account.fiscalyear.close}: |
     self.data_save(cr, uid, [ref("account_fiscalyear_close_0")], {"lang": 'en_US',
       "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close")],
-      "tz": False, "active_id": ref("account.menu_wizard_fy_close"), })
-
--
-  I check the opening entries By using "Entries by Line wizard"
--
-  !record {model: account.move.journal, id: account_move_journal_0}:
-   {}
--
-  I clicked on Open Journal Button to check the entries
-
--
-  !python {model: account.move.journal}: |
-    self.action_open_window(cr, uid, [ref("account_move_journal_0")], {"lang": 'en_US',
-      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
-      "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
-      })
-
-#-
-#  In order to test Cancel Opening Entries I cancelled the opening entries created for "Fiscal Year 2011"
-#-
-#  !record {model: account.open.closed.fiscalyear, id: account_open_closed_fiscalyear_1}:
-#    fyear_id: account.data_fiscalyear
-#-
-#  I clicked on Open button
-#-
-#  !python {model: account.open.closed.fiscalyear}: |
-#    self.remove_entries(cr, uid, [ref("account_open_closed_fiscalyear_1")], {"lang":
-#      'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_open_closed_fy")],
-#      "tz": False, "active_id": ref("account.menu_wizard_open_closed_fy"), })
-#-
-#  I check the opening entries By using "Entries by Line wizard"
-#-
-#  !record {model: account.move.journal, id: account_move_journal_2}:
-#    journal_id: account.sales_journal
-#    period_id: account_period_jan11
-#
-#-
-#  I checked the Opening entries are cancelled successfully
-#-
-#  !python {model: account.move.journal}: |
-#    self.action_open_window(cr, uid, [ref("account_move_journal_2")], {"lang": 'en_US',
-#      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
-#      "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
-#      })
+      "tz": False, "active_id": ref("account.menu_wizard_fy_close"), })
\ No newline at end of file
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index 188df14c234..d47ee564019 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -30,10 +30,9 @@
 -
   !python {model: account.move.line}: |
     import time
-    date = self._get_date(cr, uid, {'lang': u'en_US', 'normal_view': False, 'active_model': 'ir.ui.menu',
-      'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'journal_id': 1, 'view_mode': False,
-      'visible_id': 1, 'period_id': 6, 'tz': False, 'active_ids': [ref('menu_action_account_moves_all')],
-      'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
+    date = self._get_date(cr, uid, {
+      'journal_id': 1, 
+      'period_id': 6,}) 
     partner = self.onchange_partner_id(cr, uid, [], False, ref('base.res_partner_12'), ref('account.cash'), debit=0, credit=2000, date=date, journal=False)
     account = self.onchange_account_id(cr, uid, [], account_id=ref('account.a_recv'), partner_id= ref('base.res_partner_12'))
     vals = {
@@ -62,11 +61,10 @@
   !python {model: account.move.line}: |
     ids = self._balance_search(cr, uid, self, 'balance', [('balance', '=', 2000.0)], None, {'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
     'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False, 'visible_id': 1,
-    'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0, 'active_id': ref('menu_action_account_moves_all')})
+    'search_default_posted': 0})
     bal = self._balance(cr, uid, ids[0][2], 'balance', None,{'lang': u'en_US', 'tz': False, 'active_model': 'ir.ui.menu',
       'search_default_journal_id': 1, 'journal_type': 'sale', 'search_default_period_id': 6, 'view_mode': False,
-      'visible_id': 1, 'active_ids': [ref('menu_action_account_moves_all')], 'search_default_posted': 0,
-      'active_id': ref('menu_action_account_moves_all')})
+      'visible_id': 1, 'search_default_posted': 0})
     assert bal, 'Balance has not been computed correctly'
 -
   I check that Initially account move state is "Draft"
diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py
index 87a053d558c..839e490ca66 100644
--- a/addons/account/wizard/__init__.py
+++ b/addons/account/wizard/__init__.py
@@ -31,7 +31,6 @@ import account_reconcile_partner_process
 import account_reconcile
 import account_unreconcile
 import account_invoice_refund
-import account_move_journal
 import account_journal_select
 import account_move_bank_reconcile
 import account_subscription_generate
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index dbf815d5218..e11b4dcd34b 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -60,7 +60,7 @@ class account_fiscalyear_close(osv.osv_memory):
             cr.execute('select distinct(company_id) from account_move_line where id in %s',(tuple(ids),))
             if len(cr.fetchall()) > 1:
                 raise osv.except_osv(_('Warning!'), _('The entries to reconcile should belong to the same company.'))
-            r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto'})
+            r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto', 'opening_reconciliation': True})
             cr.execute('update account_move_line set reconcile_id = %s where id in %s',(r_id, tuple(ids),))
             return r_id
 
@@ -107,7 +107,7 @@ class account_fiscalyear_close(osv.osv_memory):
             ('journal_id', '=', new_journal.id), ('period_id', '=', period.id)])
         if move_ids:
             move_line_ids = obj_acc_move_line.search(cr, uid, [('move_id', 'in', move_ids)])
-            obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, context=context)
+            obj_acc_move_line._remove_move_reconcile(cr, uid, move_line_ids, opening_reconciliation=True, context=context)
             obj_acc_move_line.unlink(cr, uid, move_line_ids, context=context)
             obj_acc_move.unlink(cr, uid, move_ids, context=context)
 
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
deleted file mode 100644
index 246532d38d7..00000000000
--- a/addons/account/wizard/account_move_journal.py
+++ /dev/null
@@ -1,194 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from lxml import etree
-
-from osv import osv, fields
-from tools.translate import _
-import tools
-
-class account_move_journal(osv.osv_memory):
-    _name = "account.move.journal"
-    _description = "Move journal"
-
-    _columns = {
-       'target_move': fields.selection([('posted', 'All Posted Entries'),
-                                        ('all', 'All Entries'),
-                                        ], 'Target Moves', required=True),
-    }
-
-    _defaults = {
-        'target_move': 'all'
-    }
-    def _get_period(self, cr, uid, context=None):
-        """
-        Return  default account period value
-        """
-        account_period_obj = self.pool.get('account.period')
-        ids = account_period_obj.find(cr, uid, context=context)
-        period_id = False
-        if ids:
-            period_id = ids[0]
-        return period_id
-
-    def _get_journal(self, cr, uid, context=None):
-        """
-        Return journal based on the journal type
-        """
-
-        journal_id = False
-
-        journal_pool = self.pool.get('account.journal')
-        if context.get('journal_type', False):
-            jids = journal_pool.search(cr, uid, [('type','=', context.get('journal_type'))])
-            if not jids:
-                raise osv.except_osv(_('Configuration Error!'), _('Cannot find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration/Journals/Journals.') % context.get('journal_type'))
-            journal_id = jids[0]
-
-        return journal_id
-
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-        """
-        Returns views and fields for current model where view will depend on {view_type}.
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
-        @param view_id: list of fields, which required to read signatures
-        @param view_type: defines a view type. it can be one of (form, tree, graph, calender, gantt, search, mdx)
-        @param context: context arguments, like lang, time zone
-        @param toolbar: contains a list of reports, wizards, and links related to current model
-
-        @return: Returns a dict that contains definition for fields, views, and toolbars
-        """
-        if context is None:context = {}
-        res = super(account_move_journal, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
-
-        if context:
-            if not view_id:
-                return res
-
-            period_pool = self.pool.get('account.period')
-            journal_pool = self.pool.get('account.journal')
-
-            journal_id = self._get_journal(cr, uid, context)
-            period_id = self._get_period(cr, uid, context)
-
-            journal = False
-            if journal_id:
-                journal = journal_pool.read(cr, uid, journal_id, ['name'], context=context).get('name',False)
-                journal_string = _("Journal: %s") % tools.ustr(journal)
-            else:
-                journal_string = _("Journal: All")
-
-            period = False
-            if period_id:
-                period = period_pool.browse(cr, uid, period_id, context=context).name
-                period_string = _("Period: %s") % tools.ustr(period)
-
-            open_string = _("Open")
-            view = """<?xml version="1.0" encoding="utf-8"?>
-            <form string="Standard entries" version="7.0">
-                <group>
-                    <field name="target_move"/>
-                </group>
-                %s: <label string="%s"/>
-                %s: <label string="%s"/>
-                <footer>
-                    <button string="%s" name="action_open_window" default_focus="1" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel"/>
-                </footer>
-            </form>""" % (_('Journal'), journal_string, _('Period'), period_string, open_string)
-
-            view = etree.fromstring(view.encode('utf8'))
-            xarch, xfields = self._view_look_dom_arch(cr, uid, view, view_id, context=context)
-            view = xarch
-            res.update({
-                'arch': view
-            })
-        return res
-
-    def action_open_window(self, cr, uid, ids, context=None):
-        """
-        This function Open action move line window on given period and  Journal/Payment Mode
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: account move journal’s ID or list of IDs
-        @return: dictionary of Open action move line window on given period and  Journal/Payment Mode
-        """
-
-        period_pool = self.pool.get('account.journal.period')
-        data_pool = self.pool.get('ir.model.data')
-        journal_pool = self.pool.get('account.journal')
-        account_period_obj = self.pool.get('account.period')
-
-        if context is None:
-            context = {}
-
-        journal_id = self._get_journal(cr, uid, context)
-        period_id = self._get_period(cr, uid, context)
-        target_move = self.read(cr, uid, ids, ['target_move'], context=context)[0]['target_move']
-
-        name = _("Journal Items")
-        if journal_id:
-            ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
-
-            if not ids:
-                journal = journal_pool.browse(cr, uid, journal_id, context=context)
-                period = account_period_obj.browse(cr, uid, period_id, context=context)
-
-                name = journal.name
-                state = period.state
-
-                if state == 'done':
-                    raise osv.except_osv(_('User Error!'), _('This period is already closed.'))
-
-                company = period.company_id.id
-                res = {
-                    'name': name,
-                    'period_id': period_id,
-                    'journal_id': journal_id,
-                    'company_id': company
-                }
-                period_pool.create(cr, uid, res,context=context)
-
-            ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
-            period = period_pool.browse(cr, uid, ids[0], context=context)
-            name = (period.journal_id.code or '') + ':' + (period.period_id.code or '')
-
-        result = data_pool.get_object_reference(cr, uid, 'account', 'view_account_move_line_filter')
-        res_id = result and result[1] or False
-        move = 0
-        if target_move == 'posted':
-            move = 1
-        return {
-            'name': name,
-            'view_type': 'form',
-            'view_mode': 'tree,graph,form',
-            'res_model': 'account.move.line',
-            'view_id': False,
-            'context': "{'search_default_posted': %d, 'search_default_journal_id':%d, 'search_default_period_id':%d}" % (move, journal_id, period_id),
-            'type': 'ir.actions.act_window',
-            'search_view_id': res_id
-        }
-
-account_move_journal()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
deleted file mode 100644
index 5d80cf319c5..00000000000
--- a/addons/account/wizard/account_move_journal_view.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_account_move_journal_form" model="ir.ui.view">
-            <field name="name">account.move.journal.form</field>
-            <field name="model">account.move.journal</field>
-            <field name="arch" type="xml">
-                <form string="Standard Entries">
-                    <field name="target_move"/>
-               </form>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/account_accountant/i18n/es_DO.po b/addons/account_accountant/i18n/es_DO.po
new file mode 100644
index 00000000000..bfe70bac2ab
--- /dev/null
+++ b/addons/account_accountant/i18n/es_DO.po
@@ -0,0 +1,23 @@
+# Spanish (Dominican Republic) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"PO-Revision-Date: 2012-11-29 20:23+0000\n"
+"Last-Translator: Jose Ernesto Mendez <tecnologia@obsdr.com>\n"
+"Language-Team: Spanish (Dominican Republic) <es_DO@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: account_accountant
+#: model:ir.actions.client,name:account_accountant.action_client_account_menu
+msgid "Open Accounting Menu"
+msgstr "Abrir Menú de Contabilidad"
diff --git a/addons/account_accountant/i18n/it.po b/addons/account_accountant/i18n/it.po
index db12ba122d0..2436e754e50 100644
--- a/addons/account_accountant/i18n/it.po
+++ b/addons/account_accountant/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2011-01-17 07:34+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 19:50+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
-msgstr ""
+msgstr "Apri Menù Contabilità"
 
 #~ msgid "Accountant"
 #~ msgstr "Contabile"
diff --git a/addons/account_analytic_analysis/__init__.py b/addons/account_analytic_analysis/__init__.py
index 429aa011f31..9aae723c5cf 100644
--- a/addons/account_analytic_analysis/__init__.py
+++ b/addons/account_analytic_analysis/__init__.py
@@ -21,6 +21,7 @@
 
 import account_analytic_analysis
 import cron_account_analytic_account
+import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index 7675ef9f38e..53ebf225de1 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -40,6 +40,7 @@ Adds menu to show relevant information to each manager.You can also view the rep
         'account_analytic_analysis_view.xml',
         'account_analytic_analysis_menu.xml',
         'account_analytic_analysis_cron.xml',
+        'res_config_view.xml',
     ],
     'css': [
         'static/src/css/analytic.css'
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 06e2fd2bb18..466db63e61e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -75,15 +75,21 @@ class account_analytic_account(osv.osv):
                     res[id][f] = 0.0
                 res2 = {}
                 for account in accounts:
-                    cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
-                            "FROM account_analytic_line as line " \
-                            "WHERE account_id = %s " \
-                                "AND invoice_id is NULL AND to_invoice IS NOT NULL " \
-                            "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id,))
+                    cr.execute("""
+                        SELECT product_id, sum(amount), user_id, to_invoice, sum(unit_amount), product_uom_id, line.name
+                        FROM account_analytic_line line
+                            LEFT JOIN account_analytic_journal journal ON (journal.id = line.journal_id)
+                        WHERE account_id = %s
+                            AND journal.type != 'purchase'
+                            AND invoice_id IS NULL
+                            AND to_invoice IS NOT NULL
+                        GROUP BY product_id, user_id, to_invoice, product_uom_id, line.name""", (account.id,))
 
                     res[account.id][f] = 0.0
-                    for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
-                        price = self.pool.get('account.analytic.line')._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
+                    for product_id, price, user_id, factor_id, qty, uom, line_name in cr.fetchall():
+                        price = -price
+                        if product_id:
+                            price = self.pool.get('account.analytic.line')._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
                         factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context)
                         res[account.id][f] += price * qty * (100-factor.factor or 0.0) / 100.0
 
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index be2a504658f..2ece3a38652 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -147,6 +147,18 @@
             </field>
         </record>
 
+        <record id="view_account_analytic_account_template_required" model="ir.ui.view">
+            <field name="name">account.analytic.account.form.template.required</field>
+            <field name="model">account.analytic.account</field>
+            <field name="groups_id" eval="[(6, 0, [ref('group_template_required')])]"/>
+            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+            <field name="arch" type="xml">
+                <field name="template_id" position="attributes">
+                    <attribute name="attrs">{'required': [('type','=','contract')], 'invisible': [('type','in',['view', 'normal','template'])]}</attribute>
+                </field>
+            </field>
+        </record>
+
         <record id="template_of_contract_action" model="ir.actions.act_window">
             <field name="name">Template of Contract</field>
             <field name="type">ir.actions.act_window</field>
diff --git a/addons/account_analytic_analysis/i18n/es_MX.po b/addons/account_analytic_analysis/i18n/es_MX.po
index bf7c124bb91..4c6bde2bcf6 100644
--- a/addons/account_analytic_analysis/i18n/es_MX.po
+++ b/addons/account_analytic_analysis/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index fef85e92608..4a446cf3fb7 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-08-23 11:12+0000\n"
-"Last-Translator: Rolv Råen <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 13:42+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:06+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "No order to invoice, create"
-msgstr ""
+msgstr "Ingen ordre til å fakturere, opprett."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -30,12 +30,12 @@ msgstr "Grupper etter ..."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Å fakturere."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Remaining"
-msgstr ""
+msgstr "Gjenstår."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -74,7 +74,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "⇒ Invoice"
-msgstr ""
+msgstr "⇒ Faktura."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -109,12 +109,12 @@ msgstr "Beregnet ved hjelp av formelen: Fakturert beløp / Total tid"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts not assigned"
-msgstr ""
+msgstr "Kontrakter som ikke er tilordnet."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -162,7 +162,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expected"
-msgstr ""
+msgstr "Forventet."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -185,7 +185,7 @@ msgstr "Fakturert tid"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -209,18 +209,18 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "Ikke noe å fakturere, opprett."
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
 msgid "Template of Contract"
-msgstr ""
+msgstr "Mal av kontrakt."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "Totalt arbeids tid."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -240,7 +240,7 @@ msgstr "Beregnet etter formelen: (Virkelig margin / Totale kostnader) * 100"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "or view"
-msgstr ""
+msgstr "Eller vis."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -257,7 +257,7 @@ msgstr "Måned"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "Tid og materialer til å fakturere."
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -268,7 +268,7 @@ msgstr "Kontrakter"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdato."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -296,13 +296,13 @@ msgstr "Ventende kontrakter til å fornye med dine kunder"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Timelister."
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:452
 #, python-format
 msgid "Sale Order Lines of %s"
-msgstr ""
+msgstr "Salgs ordre linjer av %s."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -317,7 +317,7 @@ msgstr "Forfalt Antall"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "Status."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -339,7 +339,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Salgsordre."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -391,7 +391,7 @@ msgstr "Kontrakt"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturert."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -426,12 +426,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
 msgid "Total to Invoice"
-msgstr ""
+msgstr "Totalt å fakturere."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Sale Orders"
-msgstr ""
+msgstr "Salgs ordre."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -441,7 +441,7 @@ msgstr "Åpen"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoiced_total:0
 msgid "Total Invoiced"
-msgstr ""
+msgstr "Totalt fakturert."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -451,7 +451,7 @@ msgstr "Beregnet med formelen: Maks. fakturapris - fakturert beløp"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarlig."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -504,7 +504,7 @@ msgstr "Kontrakter til å fornye"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,toinvoice_total:0
 msgid " Sum of everything that could be invoiced for this contract."
-msgstr ""
+msgstr " Summen av alt som kunne blitt fakturert for denne kontrakten."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -514,7 +514,7 @@ msgstr "Teoretisk margin"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_total:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Totalt gjenværende."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
@@ -529,7 +529,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_invoices:0
 msgid "Fixed Price"
-msgstr ""
+msgstr "Fikset pris."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index a331655d94c..136ec39ec05 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 02:53+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 10:29+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:06+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "No order to invoice, create"
-msgstr ""
+msgstr "没有订单被开票，创建"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -29,12 +29,12 @@ msgstr "分组..."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr ""
+msgstr "开票"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Remaining"
-msgstr ""
+msgstr "剩余"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -71,7 +71,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "⇒ Invoice"
-msgstr ""
+msgstr "=> 开票"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -86,7 +86,7 @@ msgstr "最近的已发票日期"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,fix_price_to_invoice:0
 msgid "Sum of quotations for this contract."
-msgstr ""
+msgstr "合同的报价单汇总"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
@@ -96,7 +96,7 @@ msgstr "这科目的客户发票合计"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,timesheet_ca_invoiced:0
 msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
+msgstr "合同已开票的计工单行的汇总"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -106,12 +106,12 @@ msgstr "计算公式：已开票金额 / 总时数"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts not assigned"
-msgstr ""
+msgstr "合同没指定"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -157,7 +157,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expected"
-msgstr ""
+msgstr "预期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -170,7 +170,7 @@ msgstr "辅助核算项"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "用此公式计算：理论收入 - 总成本"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
@@ -180,7 +180,7 @@ msgstr "已开票的工时"
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "错误！你不能循环创建辅助核算项"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -190,7 +190,7 @@ msgstr "实际利润(%)"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "用下列公式计算：最大工时 - 总工作时间"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
@@ -202,7 +202,7 @@ msgstr "你在这个成本科目上花费的时间总数（数据来自计工单
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "尚未开票，创建"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
@@ -213,7 +213,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "总工作时间"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -233,7 +233,7 @@ msgstr "计算公式为:(实际利润/总成本×100)"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "or view"
-msgstr ""
+msgstr "或 视图"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -250,7 +250,7 @@ msgstr "月"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "要开票的工时和材料"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -261,7 +261,7 @@ msgstr "合同"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Start Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -285,13 +285,13 @@ msgstr "需要与客户续签的合同"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
+msgstr "计工单"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:452
 #, python-format
 msgid "Sale Order Lines of %s"
-msgstr ""
+msgstr "销售单行 %s"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -306,7 +306,7 @@ msgstr "超期数量"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -327,7 +327,7 @@ msgstr "OpenERP中的合同是指一个被指定了业务伙伴的成本科目�
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "销售订单"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -375,7 +375,7 @@ msgstr "合同"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoiced"
-msgstr ""
+msgstr "已开票"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -413,7 +413,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Sale Orders"
-msgstr ""
+msgstr "销售订单"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -423,7 +423,7 @@ msgstr "使用中"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoiced_total:0
 msgid "Total Invoiced"
-msgstr ""
+msgstr "已开发票数量"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -433,7 +433,7 @@ msgstr "计算公式为:最大发票价格 -  已开票金额"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Responsible"
-msgstr ""
+msgstr "负责人"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -511,7 +511,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_invoices:0
 msgid "Fixed Price"
-msgstr ""
+msgstr "固定价格"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@@ -526,7 +526,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,est_total:0
 msgid "Total Estimation"
-msgstr ""
+msgstr "总的估值"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -549,7 +549,7 @@ msgstr "总时间"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
 msgid "On Timesheets"
-msgstr ""
+msgstr "在计工单上"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_to_invoice:0
@@ -562,7 +562,7 @@ msgstr "剩余时间"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "在动作定义中输入的对象名称错误"
diff --git a/addons/portal_crm/wizard/__init__.py b/addons/account_analytic_analysis/res_config.py
index 92b3ac62321..94fe769fdd4 100644
--- a/addons/portal_crm/wizard/__init__.py
+++ b/addons/account_analytic_analysis/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,4 +19,13 @@
 #
 ##############################################################################
 
-import contact
+from osv import fields, osv
+
+class sale_configuration(osv.osv_memory):
+    _inherit = 'sale.config.settings'
+
+    _columns = {
+        'group_template_required': fields.boolean("Mandatory use of templates.",
+            implied_group='account_analytic_analysis.group_template_required',
+            help="Allows you to set the template field as required when creating an analytic account or a contract."),
+    }
diff --git a/addons/account_analytic_analysis/res_config_view.xml b/addons/account_analytic_analysis/res_config_view.xml
new file mode 100644
index 00000000000..9c7881f2a9e
--- /dev/null
+++ b/addons/account_analytic_analysis/res_config_view.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_sales_config" model="ir.ui.view">
+            <field name="name">sale settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="inherit_id" ref="sale.view_sales_config"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='module_analytic_user_function']" position="inside">
+                    <div>
+                        <field name="group_template_required" class="oe_inline"/>
+                        <label for="group_template_required"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
+
diff --git a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
index 8bcc7f2d7f0..948c390e039 100644
--- a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
+++ b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
@@ -6,5 +6,12 @@
         <field eval="[(4,ref('sale.group_analytic_accounting'))]" name="groups_id"/>
     </record>
 
+    <record id="group_template_required" model="res.groups">
+        <field name="name">Mandatory use of templates in contracts</field>
+        <field name="category_id" ref="base.module_category_sales_management"/>
+        <field name="comment">the field template of the analytic accounts and contracts will be required.</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/account_analytic_default/i18n/es_MX.po b/addons/account_analytic_default/i18n/es_MX.po
index b49ba52c5ec..3e6c5ce6837 100644
--- a/addons/account_analytic_default/i18n/es_MX.po
+++ b/addons/account_analytic_default/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index d698e526fa1..1244c61a3b3 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-18 23:16+0000\n"
-"Last-Translator: Pierre Burnier <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 15:09+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:10+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -55,7 +55,7 @@ msgstr ""
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index e5c02c8640e..3dcbcda6952 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -29,15 +29,6 @@
        </field>
     </record>
 
-    <record id="journal_col11" model="account.journal.column">
-        <field eval="&quot;&quot;&quot;Analytic Distribution&quot;&quot;&quot;" name="name"/>
-        <field eval="15" name="sequence"/>
-        <field name="view_id" ref="account.account_journal_view"/>
-        <field eval="0" name="required"/>
-        <field eval="&quot;&quot;&quot;analytics_id&quot;&quot;&quot;" name="field"/>
-        <field eval="0" name="readonly"/>
-    </record>
-
     <record model="ir.ui.view" id="view_move_line_form_inherit">
         <field name="name">account.move.line.form.inherit</field>
         <field name="model">account.move.line</field>
diff --git a/addons/account_analytic_plans/i18n/es_MX.po b/addons/account_analytic_plans/i18n/es_MX.po
index e2f05df843c..0e6ac25281b 100644
--- a/addons/account_analytic_plans/i18n/es_MX.po
+++ b/addons/account_analytic_plans/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index 3b59a5409be..80ab2d4a4c8 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 04:10+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:38+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:07+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -95,7 +95,7 @@ msgstr "项 ID"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -136,7 +136,7 @@ msgstr "BBA传输结构有误！"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "没有辅助核算计划定义"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
@@ -187,7 +187,7 @@ msgstr "百分比"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "There are no analytic lines related to account %s."
-msgstr ""
+msgstr "没有辅助核算行关联到科目%s."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -229,7 +229,7 @@ msgstr "辅助核算方案明细"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "科目和会计周期必须属于同一个公司"
 
 #. module: account_analytic_plans
 #: constraint:account.bank.statement:0
@@ -257,7 +257,7 @@ msgstr "币别"
 #. module: account_analytic_plans
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能视图科目上面创建辅助核算行。"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -272,7 +272,7 @@ msgstr "项5 ID"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "你不能在关闭的科目创建账目项目"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
@@ -294,7 +294,7 @@ msgstr "日期到"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal."
-msgstr ""
+msgstr "你必须在'%s' 分类账定义一个辅助核算分类账"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
@@ -408,7 +408,7 @@ msgstr "项4 ID"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "总计在  %s 和 %s 之间。"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -461,7 +461,7 @@ msgstr "账簿"
 msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
-msgstr ""
+msgstr "配置错误"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
@@ -481,19 +481,19 @@ msgstr "分摊模型"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "你不能在视图类型的科目创建账目项目"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "用户错误！"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model."
-msgstr ""
+msgstr "保存模型前请输入名称和代码"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date1:0
@@ -505,7 +505,7 @@ msgstr "开始日期"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line."
-msgstr ""
+msgstr "单据的金额必须跟对账单其中一行金额相同。"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
@@ -521,13 +521,13 @@ msgstr "每个公司的账簿名称必须唯一！"
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "这个名称和代码的模型已经存在。"
 
 #~ msgid "Select Information"
 #~ msgstr "选择信息"
diff --git a/addons/account_anglo_saxon/i18n/es_MX.po b/addons/account_anglo_saxon/i18n/es_MX.po
index ae8e2eb2dee..48ca0408128 100644
--- a/addons/account_anglo_saxon/i18n/es_MX.po
+++ b/addons/account_anglo_saxon/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/fr.po b/addons/account_anglo_saxon/i18n/fr.po
index 43acf7f7da8..e675aff8bcb 100644
--- a/addons/account_anglo_saxon/i18n/fr.po
+++ b/addons/account_anglo_saxon/i18n/fr.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-13 19:32+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2012-11-29 15:33+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
@@ -31,7 +30,7 @@ msgstr "Le numéro de facture doit être unique par société !"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr "Catégorie de produit"
+msgstr "Catégorie d'articles"
 
 #. module: account_anglo_saxon
 #: sql_constraint:stock.picking:0
@@ -68,7 +67,7 @@ msgstr "Bon de commande"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
-msgstr "Modèle de produit"
+msgstr "Modèle d'article"
 
 #. module: account_anglo_saxon
 #: field:product.category,property_account_creditor_price_difference_categ:0
diff --git a/addons/account_asset/i18n/es_MX.po b/addons/account_asset/i18n/es_MX.po
index 7684caf86dc..5caeb5db1b1 100644
--- a/addons/account_asset/i18n/es_MX.po
+++ b/addons/account_asset/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/it.po b/addons/account_asset/i18n/it.po
new file mode 100644
index 00000000000..2f1fe108905
--- /dev/null
+++ b/addons/account_asset/i18n/it.po
@@ -0,0 +1,781 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-30 00:08+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Immobili in stato bozza e aperto"
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0
+#: field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Data finale"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "Valore residuo"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Conto Ammortamento"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Calcola Ammortamenti"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "Valore Iniziale"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0
+#: field:account.move.line,asset_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "Immobilizzazione"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0
+#: help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+"Indica che il primo ammortamento di questo immobile sarà calcolato dalla "
+"data di acquisto invece che dal primo Gennaio."
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Costante"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Azienda"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "In esecuzione"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "Importo Ammortamento"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "Analisi Immobilizzazioni"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "Tasso Degressivo"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Categorie Immobilizzazioni"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "Registrazioni"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Righe Ammortamento"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "E' l'ammontare che si prevede di non poter ammortizzare."
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Data Ammortamento"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You cannot create recursive assets."
+msgstr "Errore ! Non è possibile creare immobilizzazioni ricorsive."
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Importo Contabilizzato"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "Immobilizzazioni"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "F.do Ammortamento"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:account.asset.category:0
+#: view:account.asset.history:0
+#: view:asset.modify:0
+#: field:asset.modify,note:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Valore di credito o debito errato nella registrazione contabile !"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "# di Righe Ammortamento"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+msgid "Number of Months in a Period"
+msgstr "Numero di Mesi in un Periodo"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Immobilizzazioni in stato \"bozza\""
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Data finale"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Riferimento"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Comunicazione strutturata BBA non valida !"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "Calcola Ammortamenti"
+
+#. module: account_asset
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Durata del Periodo"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Bozza"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Data di acquisto dell'immobilizzazione"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Calcola l'Ammortamento all'interno del periodo indicato"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Attivo"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Modifica Durata"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr "Informazioni Analitiche"
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Conto analitico"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0
+#: field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Metodo di calcolo"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Indicare l'intervallo tra 2 ammortamenti, in mesi"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tempo in mesi tra due ammortamenti"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Modifica Immobilizzazione"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Valore di Realizzo"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0
+#: view:account.asset.category:0
+#: field:account.invoice.line,asset_category_id:0
+#: view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "Categoria Immobilizzazione"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Immobilizzazioni in stato \"chiuso\""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Account and Period must belong to the same company."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Storico immobilizzazione"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Ricerca Categoria Immobilizzazioni"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Riga fattura"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "or"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on closed account."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,note:0
+#: field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that status."
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,state:0
+#: field:asset.asset.report,state:0
+msgid "Status"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.history:0
+msgid "Asset History"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.asset.report,name:0
+msgid "Year"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0
+#: field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+#: view:asset.modify:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0
+#: selection:asset.asset.report,state:0
+msgid "Close"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr ""
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,name:0
+msgid "Asset Name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Depreciation Dates"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0
+#: field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"<p>\n"
+"            From this report, you can have an overview on all depreciation. "
+"The\n"
+"            tool search can also be used to personalise your Assets reports "
+"and\n"
+"            so, match this analysis to your needs;\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross Value"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You cannot create journal items on an account of type view."
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr ""
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr ""
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index adc2963c803..d64eb68bc99 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -43,10 +43,10 @@
       <field name="arch" type="xml">
         <data>
           <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='date']" position="after">
-            <field name="val_date"/>
-          </xpath>
+            <field name="val_date" invisible="1"/>
+          </xpath> 
           <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-            <field name="globalisation_id" string="Glob. Id"/>
+            <field name="globalisation_id" string="Glob. Id" invisible="1"/>
             <field name="state" invisible="1"/>
           </xpath>
           <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='date']" position="after">
diff --git a/addons/account_bank_statement_extensions/i18n/es_MX.po b/addons/account_bank_statement_extensions/i18n/es_MX.po
index 2abefb1cd5d..20e10de3af1 100644
--- a/addons/account_bank_statement_extensions/i18n/es_MX.po
+++ b/addons/account_bank_statement_extensions/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/zh_CN.po b/addons/account_bank_statement_extensions/i18n/zh_CN.po
index cff59afe339..9ff4a317ead 100644
--- a/addons/account_bank_statement_extensions/i18n/zh_CN.po
+++ b/addons/account_bank_statement_extensions/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 14:55+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 06:46+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -59,7 +59,7 @@ msgstr "取消所选的表行"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Value Date"
-msgstr ""
+msgstr "起息日"
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
@@ -109,7 +109,7 @@ msgstr "批量付款信息"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
@@ -117,12 +117,12 @@ msgstr ""
 msgid ""
 "Delete operation not allowed.             Please go to the associated bank "
 "statement in order to delete and/or modify bank statement line."
-msgstr ""
+msgstr "不允许删除。为了删除和(或)修改银行对账单行，请到关联的银行对账单操作。"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -234,7 +234,7 @@ msgstr "手工"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Bank Transaction"
-msgstr ""
+msgstr "银行交易"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -303,7 +303,7 @@ msgstr "编号"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line."
-msgstr ""
+msgstr "单据的金额必须跟对账单其中一行金额相同。"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_name:0
@@ -351,7 +351,7 @@ msgstr "银行单据行"
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
diff --git a/addons/account_budget/i18n/es_MX.po b/addons/account_budget/i18n/es_MX.po
index 556834afe50..a8db4b573ea 100644
--- a/addons/account_budget/i18n/es_MX.po
+++ b/addons/account_budget/i18n/es_MX.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index add3f9c12a9..4deed11bc39 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-13 21:08+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 16:58+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -141,7 +141,7 @@ msgstr "Total :"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Erreur! Vous ne pouvez pas créer de comptes analytiques récursifs."
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
@@ -239,7 +239,7 @@ msgstr "Budgets à approuver"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "Durée"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -337,7 +337,7 @@ msgstr "Montant Théorique"
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index a3a3d2c11fc..3b90c1fdf50 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2010-09-09 07:05+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-28 16:01+0000\n"
+"Last-Translator: Andrius Preimantas <andrius.preimantas@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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -27,7 +27,7 @@ msgstr ""
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Atsakingas naudotojas"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -38,12 +38,12 @@ msgstr "Patvirtinta"
 #: model:ir.actions.act_window,name:account_budget.open_budget_post_form
 #: model:ir.ui.menu,name:account_budget.menu_budget_post_form
 msgid "Budgetary Positions"
-msgstr ""
+msgstr "Biudžeto pozicija"
 
 #. module: account_budget
 #: report:account.budget:0
 msgid "Printed at:"
-msgstr ""
+msgstr "Atspausdinta:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -53,17 +53,17 @@ msgstr "Patvirtinti"
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "Patvirtinti vartotoją"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr ""
+msgstr "Spausdinti suvestinę"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr ""
+msgstr "Apmokėjimo data"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_to:0
@@ -82,7 +82,7 @@ msgstr "Juodraštis"
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr ""
+msgstr "ties"
 
 #. module: account_budget
 #: view:account.budget.report:0
@@ -104,12 +104,12 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Patvirtintas"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr ""
+msgstr "Procentai"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
@@ -120,7 +120,7 @@ msgstr "Būsena"
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The Budget '%s' has no accounts!"
-msgstr ""
+msgstr "Biudžetui '%s' nepriskirtos sąskaitos!"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -131,24 +131,24 @@ msgstr "Aprašas"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Valiuta"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Total :"
-msgstr ""
+msgstr "Iš viso:"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Klaida! Negalima kurti rekursivių analitinių sąskaitų"
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Įmonė"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -158,20 +158,20 @@ msgstr "iki"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Atstatyti į juodraštį"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 msgid "Planned Amount"
-msgstr ""
+msgstr "Suplanuota suma"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Procentai (%)"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -183,7 +183,7 @@ msgstr "Atlikta"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Praktinė suma"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -191,7 +191,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "Praktinė suma"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
@@ -203,12 +203,12 @@ msgstr "Pabaigos data"
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
 msgid "Account Budget report for analytic account"
-msgstr ""
+msgstr "Biudžeto ataskaita analitinei sąskaitai"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "Teorinė suma"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -219,7 +219,7 @@ msgstr "Pavadinimas"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr ""
+msgstr "Biudžeto eilutė"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -234,12 +234,12 @@ msgstr "Biudžetas"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve Budgets"
-msgstr ""
+msgstr "Patvirtinti biudžetą"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "Trukmė"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -251,7 +251,7 @@ msgstr "Kodas"
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 msgid "This wizard is used to print budget"
-msgstr ""
+msgstr "Šis vedlys naudojamas atspausdinti biudžetui"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -267,7 +267,7 @@ msgstr "Biudžetai"
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
 msgid "This wizard is used to print summary of budgets"
-msgstr ""
+msgstr "Šis vedlys naudojamas atspausdinti biudžetų suvestinei"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -277,19 +277,19 @@ msgstr "Nutrauktas"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr ""
+msgstr "Biudžeto pozicija"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_from:0
@@ -308,13 +308,13 @@ msgstr ""
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "Teorinė suma"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Klaida!"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -329,7 +329,7 @@ msgstr "Spausdinti"
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "Teorinė suma"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -337,7 +337,7 @@ msgstr ""
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "arba"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
@@ -348,7 +348,7 @@ msgstr "Analitinė sąskaita"
 #. module: account_budget
 #: report:account.budget:0
 msgid "Budget :"
-msgstr ""
+msgstr "Biudžetas:"
 
 #. module: account_budget
 #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
@@ -377,7 +377,7 @@ msgstr ""
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "Planuojama suma"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -397,7 +397,7 @@ msgstr "Sąskaitos"
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_lines_view
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
-msgstr ""
+msgstr "Biudžeto eilutės"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -418,12 +418,12 @@ msgstr "Pradžios data"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "Analizė nuo"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Draft Budgets"
-msgstr ""
+msgstr "Nepatvirtinti biudžetai"
 
 #~ msgid "% performance"
 #~ msgstr "% vykdymas"
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index 34c4352185f..e8c99e31e4c 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:50+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 06:47+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -141,7 +141,7 @@ msgstr "合计:"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "错误！你不能递归创建辅助核算项"
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
@@ -239,7 +239,7 @@ msgstr "待审核的预算"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Duration"
-msgstr ""
+msgstr "持续时间"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
@@ -337,7 +337,7 @@ msgstr "理论金额"
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
diff --git a/addons/account_cancel/i18n/it.po b/addons/account_cancel/i18n/it.po
index 153dc063447..fcd3aecdb5b 100644
--- a/addons/account_cancel/i18n/it.po
+++ b/addons/account_cancel/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2010-11-21 07:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 19:46+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:24+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
-msgstr "Cancella"
+msgstr "Annulla"
 
 #~ msgid "Account Cancel"
 #~ msgstr "Account Cancel"
diff --git a/addons/account_check_writing/account_view.xml b/addons/account_check_writing/account_view.xml
index 53dd1cb1c93..df8d1461a3f 100644
--- a/addons/account_check_writing/account_view.xml
+++ b/addons/account_check_writing/account_view.xml
@@ -11,7 +11,7 @@
             <field name="model">account.journal</field>
             <field name="inherit_id" ref="account.view_account_journal_form" />
             <field name="arch" type="xml">
-                <field name="type" on_change="onchange_type(type, currency)" />
+                <field name="type" />
                 <field name="entry_posted" position="after">
                     <field name="allow_check_writing" attrs="{'readonly':[('type','!=','bank')]}" />
                     <field name="use_preprint_check" attrs="{'readonly':[('type','!=','bank')]}" />
diff --git a/addons/account_check_writing/i18n/es_MX.po b/addons/account_check_writing/i18n/es_MX.po
new file mode 100644
index 00000000000..14a5a17f279
--- /dev/null
+++ b/addons/account_check_writing/i18n/es_MX.po
@@ -0,0 +1,228 @@
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 18:20+0000\n"
+"Last-Translator: OscarAlca <oscarolar@hotmail.com>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Cheque en la parte de arriba"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+msgid "Print Check"
+msgstr "Imprimir cheque"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Cheque en el centro"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"Cheque en la parte de arriba es compatible con Quicken, Quickbooks y "
+"Microsoft Money. Cheque en el medio es compatible con PeachTree, ACCPAC y "
+"DacEasy. Cheque en la parte de abajo es compatible con Peachtree, ACCPAC y "
+"DacEasy exclusivamente"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Cheque en la parte de abajo"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "Revise si el diario es usado para registrar cheques."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permitir escribir cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Escribir cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Descuento"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Importe original"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new check. \n"
+"              </p><p>\n"
+"                The check payment form allows you to track the payment you "
+"do\n"
+"                to your suppliers using checks. When you select a supplier, "
+"the\n"
+"                payment method and an amount for the payment, OpenERP will\n"
+"                propose to reconcile your payment with the open supplier\n"
+"                invoices or bills.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click para crear un nuevo cheque.\n"
+"              </p><p>\n"
+"                El formulario de pago de cheques le permite dar seguimiento "
+"al pago que \n"
+"                emite a sus proveedores usando cheques. Cuando selecciona un "
+"proveedor, el\n"
+"                metodo de pago y un monto para el pago, OpenERP propondrá \n"
+"                conciliar  su pago con las facturas abiertas o cuentas "
+"abiertas del proveedor.\n"
+"              </p>\n"
+"            "
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permitir escribir cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pago"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheque preimpreso"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+msgid "Print Check (Bottom)"
+msgstr "Imprimir cheque (Abajo)"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Fecha de vencimiento"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+msgid "Print Check (Middle)"
+msgstr "Imprimir Cheque (Al Centro)"
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error!\n"
+"The currency chosen should be shared by the default accounts too."
+msgstr ""
+"¡Error de confuguración!\n"
+"La moneda seleccionada también tiene que ser la que está en las cuentas por "
+"defecto."
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo pendiente"
+
+#. module: account_check_writing
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check (Top)"
+msgstr "Imprimir Cheque (Arriba)"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Importe del cheque"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprobante contable"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "¡El nombre del diaro debe ser único por compañía!"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "¡El código del diario debe ser único por compañía!"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Cantidad en letra"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo Inicial"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Elija el formato del cheque."
diff --git a/addons/account_check_writing/i18n/zh_CN.po b/addons/account_check_writing/i18n/zh_CN.po
index b91e5204fbc..9f0ab53eca6 100644
--- a/addons/account_check_writing/i18n/zh_CN.po
+++ b/addons/account_check_writing/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 06:58+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -110,6 +110,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 创建一个新的支票。\n"
+"              </p><p>\n"
+"                支票支付表单允许跟踪用支票支付给供应商的过程。\n"
+"                当年选择了一个供应商，Openerp 将自动提供 支付\n"
+"                方法和支付金额，用于核销待支付的供应商发票和\n"
+"               单据。\n"
+"              </p>\n"
+"            "
 
 #. module: account_check_writing
 #: field:account.voucher,allow_check:0
@@ -131,7 +140,7 @@ msgstr "用预先打印的支票"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
 msgid "Print Check (Bottom)"
-msgstr ""
+msgstr "打印支票（底部）"
 
 #. module: account_check_writing
 #: sql_constraint:res.company:0
@@ -148,14 +157,14 @@ msgstr "到期日期"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
 msgid "Print Check (Middle)"
-msgstr ""
+msgstr "打印支票（中间）"
 
 #. module: account_check_writing
 #: constraint:account.journal:0
 msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
-msgstr ""
+msgstr "配置错误！"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_res_company
@@ -171,7 +180,7 @@ msgstr "截止余额"
 #. module: account_check_writing
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
 msgid "Print Check (Top)"
-msgstr ""
+msgstr "打印支票（顶部）"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index b26458a73af..0617a95c2f0 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -127,7 +127,7 @@
             </field>
         </record>
 
-        <record id="view_move_line_tree" model="ir.ui.view">
+        <!-- <record id="view_move_line_tree" model="ir.ui.view">
             <field name="name">account.move.line.tree.followup</field>
             <field name="model">account.move.line</field>
             <field name="inherit_id" ref="account.view_move_line_tree"/>
@@ -137,7 +137,7 @@
                     <field name="followup_line_id"/>
                 </field>
             </field>
-        </record>
+        </record> -->
 
         <act_window domain="[('reconcile_id', '=', False),('account_id.type','=','receivable')]" id="act_account_partner_account_move_all" name="Receivable Items" res_model="account.move.line" src_model="" view_id="account_move_line_partner_tree"/>
 
diff --git a/addons/account_followup/i18n/nb.po b/addons/account_followup/i18n/nb.po
index d83b7cb334d..05bddbdd8e6 100644
--- a/addons/account_followup/i18n/nb.po
+++ b/addons/account_followup/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-11-11 15:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-29 13:37+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -97,7 +97,7 @@ msgstr "E-post Emne"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-up Steps"
-msgstr ""
+msgstr "Oppfølging trinn."
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
@@ -113,7 +113,7 @@ msgstr "Forklaring"
 #. module: account_followup
 #: field:account.followup.print.all,email_body:0
 msgid "Email Body"
-msgstr ""
+msgstr "E-post kropp."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -121,7 +121,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Follow-Ups"
-msgstr ""
+msgstr "Send oppfølgninger."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -214,7 +214,7 @@ msgstr "%(user_signature)s: Brukernavn"
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Follow-up Report"
-msgstr ""
+msgstr "Oppfølging rapport."
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -224,12 +224,12 @@ msgstr "Debet"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Follow-up Statistics"
-msgstr ""
+msgstr "Oppfølging statistikk."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-up Criteria"
-msgstr ""
+msgstr "Oppfølging kriterier."
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
@@ -239,7 +239,7 @@ msgstr "Gir rekkefølgen av når du viser en liste over oppfølging linjer."
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "Du kan ikke opprette journal elementer på en konto av typen visning."
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -256,7 +256,7 @@ msgstr "Siste oppfølging"
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
-msgstr ""
+msgstr "Skriv ut oppfølging og send e-post til kundene."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:292
@@ -268,6 +268,11 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"E-post sendt til følgende partnere er vellykket. !\n"
+"\n"
+"% s"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -277,12 +282,12 @@ msgstr "Li."
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send Email Confirmation"
-msgstr ""
+msgstr "Send e-post Bekreftelse."
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest follow-up"
-msgstr ""
+msgstr "Siste oppfølging."
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
@@ -336,7 +341,7 @@ msgstr "Partner til Påminnelse"
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Konto og periode må tilhøre samme selskap."
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -347,7 +352,7 @@ msgstr "Oppfølginger"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow-up"
-msgstr ""
+msgstr "Oppfølgings konto"
 
 #. module: account_followup
 #: constraint:account_followup.followup.line:0
@@ -377,7 +382,7 @@ msgstr "Send E-poster"
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Follow-up"
-msgstr ""
+msgstr "Søk oppfølging."
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -388,7 +393,7 @@ msgstr "Beskjed"
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
 msgid "or"
-msgstr ""
+msgstr "Eller."
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
@@ -398,7 +403,7 @@ msgstr "Blokkert"
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Du kan ikke opprette journal enmer i en lukker konto."
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:291
@@ -408,6 +413,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"E-post er ikke sendt til følgende Partnere, e-post er  ikke tilgjengelig!\n"
+"\n"
+"% s"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
@@ -441,7 +449,7 @@ msgstr "Skriv ut Oppfølginger"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-up Entries with period in current year"
-msgstr ""
+msgstr "Oppfølging oppføringer med perioden i inneværende år."
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -457,7 +465,7 @@ msgstr "%(Brukers_signatur)s: bruker navn"
 #: help:account.followup.print.all,test_print:0
 msgid ""
 "Check if you want to print follow-ups without changing follow-ups level."
-msgstr ""
+msgstr "Sjekk om du vil skrive ut oppfølging uten å endre oppfølginger nivå."
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
@@ -468,7 +476,7 @@ msgstr "Journal Elementer"
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-ups"
-msgstr ""
+msgstr "Oppfølginger."
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -498,6 +506,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Alle e-poster har blitt vellykket sendt til Partnere:.\n"
+"\n"
+"% s"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -517,7 +528,7 @@ msgstr "% (Partner_Navn) s: Partner Navn"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Follow-up Date"
-msgstr ""
+msgstr "Siste Oppfølging Dato."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -627,7 +638,7 @@ msgstr "Partner oppføringer"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-up lines"
-msgstr ""
+msgstr "Oppfølging linjer."
 
 #. module: account_followup
 #: help:account.followup.print.all,partner_lang:0
@@ -670,7 +681,7 @@ msgstr "Første bevegelse"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Follow-up Statistics by Partner"
-msgstr ""
+msgstr "Oppfølging statistikk av partner."
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -696,7 +707,7 @@ msgstr "Dokument: Kundens kontoutskrift"
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Send follow-ups"
-msgstr ""
+msgstr "send oppfølging."
 
 #. module: account_followup
 #: view:account.move.line:0
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index ffa28974e20..fd5cb925557 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 03:49+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 14:16+0000\n"
+"Last-Translator: dquo <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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -91,12 +91,12 @@ msgstr "电子邮件主题"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-up Steps"
-msgstr ""
+msgstr "催款步骤"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr "条件类型"
+msgstr "条款类型"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -107,7 +107,7 @@ msgstr "图表"
 #. module: account_followup
 #: field:account.followup.print.all,email_body:0
 msgid "Email Body"
-msgstr ""
+msgstr "电子邮件正文"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -115,7 +115,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send Follow-Ups"
-msgstr ""
+msgstr "发送催款"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -125,7 +125,7 @@ msgstr "金额"
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "错误的分录"
+msgstr "错误的出纳会计分录"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -206,7 +206,7 @@ msgstr "%(user_signature)s：用户名"
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Follow-up Report"
-msgstr ""
+msgstr "催款报告"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -216,12 +216,12 @@ msgstr "借方"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Follow-up Statistics"
-msgstr ""
+msgstr "催款统计"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-up Criteria"
-msgstr ""
+msgstr "催款准则"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
@@ -231,7 +231,7 @@ msgstr "输入序列用于显示催款列表"
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "你不能在视图类型的科目创建账目项目"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -248,7 +248,7 @@ msgstr "最近的催款"
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Follow-up & Send Mail to Customers"
-msgstr ""
+msgstr "打印催款并发送邮件给客户"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:292
@@ -260,6 +260,11 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"Email 成功发送给下列客户：!\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -269,12 +274,12 @@ msgstr "Li."
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send Email Confirmation"
-msgstr ""
+msgstr "发送邮件确认"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest follow-up"
-msgstr ""
+msgstr "最新的催款"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
@@ -324,7 +329,7 @@ msgstr "提醒合作伙伴"
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "科目和会计周期必须属于同一个公司"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -335,14 +340,14 @@ msgstr "催款"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow-up"
-msgstr ""
+msgstr "催款"
 
 #. module: account_followup
 #: constraint:account_followup.followup.line:0
 msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
-msgstr "描述有无，请使用正确的标识或百分数。"
+msgstr "描述有误，请使用正确的标识或百分数。"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -360,18 +365,18 @@ msgstr "发送邮件"
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Follow-up"
-msgstr ""
+msgstr "搜索催款"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Message"
-msgstr "信息"
+msgstr "消息"
 
 #. module: account_followup
 #: view:account.followup.print:0
 #: view:account.followup.print.all:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
@@ -381,7 +386,7 @@ msgstr "已封锁"
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "你不能在关闭的科目创建分类账条目"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:291
@@ -391,6 +396,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Email 没有发送给下来业务伙伴,Email不可用!\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
@@ -422,7 +430,7 @@ msgstr "打印催款"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-up Entries with period in current year"
-msgstr ""
+msgstr "本年度的催款明细"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -438,7 +446,7 @@ msgstr "%(user_signature)s: 用户名"
 #: help:account.followup.print.all,test_print:0
 msgid ""
 "Check if you want to print follow-ups without changing follow-ups level."
-msgstr ""
+msgstr "选中 如果你要打印催款而不改变催款级别。"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
@@ -449,7 +457,7 @@ msgstr "账簿明细"
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-ups"
-msgstr ""
+msgstr "催款"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -459,7 +467,7 @@ msgstr "合计:"
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "错误！您不能创建递归公司."
+msgstr "错误！您不能创建循环的公司。"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -479,6 +487,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"所有邮件被成功发送给业务伙伴：\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
@@ -498,7 +509,7 @@ msgstr "%(partner_name)s: 业务伙伴名称"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Follow-up Date"
-msgstr ""
+msgstr "最新的催款日期"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -534,7 +545,7 @@ msgstr ""
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
-msgstr "最近"
+msgstr "最近的凭证"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
@@ -556,7 +567,7 @@ msgstr "取消"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr "有争议"
+msgstr "有异议"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
@@ -608,7 +619,7 @@ msgstr "业务伙伴凭证"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-up lines"
-msgstr ""
+msgstr "催款明细"
 
 #. module: account_followup
 #: help:account.followup.print.all,partner_lang:0
@@ -644,12 +655,12 @@ msgstr "名称"
 #: field:account_followup.stat,date_move:0
 #: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
-msgstr "首先"
+msgstr "第一个凭证"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Follow-up Statistics by Partner"
-msgstr ""
+msgstr "按合作伙伴的催款统计"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -675,7 +686,7 @@ msgstr "文档: 客户帐户对帐单"
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Send follow-ups"
-msgstr ""
+msgstr "发送催款"
 
 #. module: account_followup
 #: view:account.move.line:0
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index 7138540fa3b..ec4feca9b81 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -20,12 +20,29 @@
 ##############################################################################
 
 from datetime import datetime
-
+from tools.translate import _
 from osv import fields, osv
 
 class Invoice(osv.osv):
     _inherit = 'account.invoice'
 
+    # Forbid to cancel an invoice if the related move lines have already been
+    # used in a payment order. The risk is that importing the payment line
+    # in the bank statement will result in a crash cause no more move will
+    # be found in the payment line
+    def action_cancel(self, cr, uid, ids, context=None):
+        payment_line_obj = self.pool.get('payment.line')
+        for inv in self.browse(cr, uid, ids, context=context):
+            pl_line_ids = []
+            if inv.move_id and inv.move_id.line_id:
+                inv_mv_lines = [x.id for x in inv.move_id.line_id]
+                pl_line_ids = payment_line_obj.search(cr, uid, [('move_line_id','in',inv_mv_lines)], context=context)
+            if pl_line_ids:
+                pay_line = payment_line_obj.browse(cr, uid, pl_line_ids, context=context)
+                payment_order_name = ','.join(map(lambda x: x.order_id.reference, pay_line))
+                raise osv.except_osv(_('Error!'), _("You cannot cancel an invoice which has already been imported in a payment order. Remove it from the following payment order : %s."%(payment_order_name)))
+        return super(Invoice, self).action_cancel(cr, uid, ids, context=context)
+
     def _amount_to_pay(self, cursor, user, ids, name, args, context=None):
         '''Return the amount still to pay regarding all the payment orders'''
         if not ids:
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 4d69c2d7315..e07043c495a 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -14,28 +14,16 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_move_line_tree_wiz">
+        <!-- <record model="ir.ui.view" id="view_move_line_tree_wiz">
             <field name="name">account.move.line.tree</field>
             <field name="model">account.move.line</field>
-            <field name="priority" eval="1"/>
+            <field name="inherit_id" ref="account.view_move_line_tree"/>
             <field name="arch" type="xml">
-                <tree string="Account Entry Line">
-                    <field name="partner_id"/>
-                    <field name="ref"/>
-                    <field name="name"/>
-                    <field name="journal_id"/>
-                    <field name="account_id"/>
-                    <field name="date_maturity"/>
-                    <field name="date"/>
-                    <field name="debit" sum="Total debit"/>
-                    <field name="credit" sum="Total credit"/>
+                <field name="reconcile" position="after">
                     <field name="amount_to_pay"/>
-                    <field name="amount_currency" groups="base.group_multi_currency"/>
-                    <field name="currency_id" groups="base.group_multi_currency"/>
-                    <field name="period_id" invisible="1"/>
-                </tree>
+                </field>
             </field>
-        </record>
+        </record> -->
 
         <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="7"/>
 
diff --git a/addons/account_sequence/account_sequence_data.xml b/addons/account_sequence/account_sequence_data.xml
index b2d40412d0d..21aaaf2baee 100644
--- a/addons/account_sequence/account_sequence_data.xml
+++ b/addons/account_sequence/account_sequence_data.xml
@@ -3,46 +3,7 @@
     <data>
 
         <!--Account Journal Internal Number of account move line-->
-
-        <record id="sp_journal_col3" model="account.journal.column">
-            <field name="view_id" ref="account.account_sp_journal_view"/>
-            <field name="name">Internal Number</field>
-            <field name="field">internal_sequence_number</field>
-            <field eval="True" name="required"/>
-            <field eval="2" name="sequence"/>
-        </record>
-
-        <record id="journal_col1" model="account.journal.column">
-            <field name="view_id" ref="account.account_journal_view"/>
-            <field name="name">Internal Number</field>
-            <field name="field">internal_sequence_number</field>
-            <field eval="True" name="required"/>
-            <field eval="2" name="sequence"/>
-        </record>
-
-        <record id="bank_col3" model="account.journal.column">
-            <field name="view_id" ref="account.account_journal_bank_view"/>
-            <field name="name">Internal Number</field>
-            <field name="field">internal_sequence_number</field>
-            <field eval="True" name="required"/>
-            <field eval="2" name="sequence"/>
-        </record>
-
-        <record id="bank_col3_multi" model="account.journal.column">
-            <field name="view_id" ref="account.account_journal_bank_view_multi"/>
-            <field name="name">Internal Number</field>
-            <field name="field">internal_sequence_number</field>
-            <field eval="True" name="required"/>
-            <field eval="2" name="sequence"/>
-        </record>
-
-        <record id="sp_refund_journal_col3" model="account.journal.column">
-            <field name="view_id" ref="account.account_sp_refund_journal_view"/>
-            <field name="name">Internal Number</field>
-            <field name="field">internal_sequence_number</field>
-            <field eval="True" name="required"/>
-            <field eval="2" name="sequence"/>
-        </record>
+        
 	<record id="sequence_journal" model="ir.sequence.type">
 	    <field name="name">Account Journal</field>
 	    <field name="code">account.journal</field>
diff --git a/addons/account_sequence/i18n/fr.po b/addons/account_sequence/i18n/fr.po
index 18985d1ecbc..d7e174b9227 100644
--- a/addons/account_sequence/i18n/fr.po
+++ b/addons/account_sequence/i18n/fr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-02-15 15:36+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-11-29 17:04+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Vous ne pouvez pas créer d'entrée de journal dans un compte fermé."
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -116,6 +116,7 @@ msgstr "Nom"
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
 msgstr ""
+"Vous ne pouvez pas créer d'entrée de journal dans un compte de type vue."
 
 #. module: account_sequence
 #: constraint:account.journal:0
@@ -123,6 +124,8 @@ msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
 msgstr ""
+"Erreur de configuration!\n"
+"Le devise choisie doit être aussi partagée par le compte par défaut."
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
@@ -134,6 +137,8 @@ msgstr "Valeur erronée au crédit ou au débit dans l'écriture comptable !"
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
 msgstr ""
+"Vous ne pouvez pas créer plus d'un mouvement par période dans un journal "
+"centralisé."
 
 #. module: account_sequence
 #: field:account.journal,internal_sequence_id:0
@@ -143,7 +148,7 @@ msgstr "Séquence interne"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Le compte et la période doivent appartenir à la même société."
 
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
diff --git a/addons/account_sequence/i18n/zh_CN.po b/addons/account_sequence/i18n/zh_CN.po
index 30711dedc44..e27fb65f3a5 100644
--- a/addons/account_sequence/i18n/zh_CN.po
+++ b/addons/account_sequence/i18n/zh_CN.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-09 04:00+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:24+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "你不能在关闭的科目创建账目项目"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -112,14 +112,14 @@ msgstr "名称"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "你不能在视图类型的科目创建账目项目"
 
 #. module: account_sequence
 #: constraint:account.journal:0
 msgid ""
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
-msgstr ""
+msgstr "配置错误"
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
@@ -130,7 +130,7 @@ msgstr "错误的分录"
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
-msgstr ""
+msgstr "在每个会计期间，你不可以创建1个以上的总分类凭证"
 
 #. module: account_sequence
 #: field:account.journal,internal_sequence_id:0
@@ -140,7 +140,7 @@ msgstr "内部序列"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "科目和会计周期必须属于同一个公司"
 
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 32be8c34929..ffc7cf1769d 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -1549,6 +1549,15 @@ class account_bank_statement(osv.osv):
             return move_line_obj.write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
         return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        # Restrict to modify the journal if we already have some voucher of reconciliation created/generated.
+        # Because the voucher keeps in memory the journal it was created with.
+        for bk_st in self.browse(cr, uid, ids, context=context):
+            if vals.get('journal_id') and bk_st.line_ids:
+                if any([x.voucher_id and True or False for x in bk_st.line_ids]):
+                    raise osv.except_osv(_('Unable to change journal !'), _('You can not change the journal as you already reconciled some statement lines!'))
+        return super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
+
 account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
diff --git a/addons/account_voucher/account_voucher_pay_invoice.xml b/addons/account_voucher/account_voucher_pay_invoice.xml
index 323be77f334..284632b9b5f 100644
--- a/addons/account_voucher/account_voucher_pay_invoice.xml
+++ b/addons/account_voucher/account_voucher_pay_invoice.xml
@@ -8,9 +8,9 @@
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_open'][last()]" position="after">
                     <button name="invoice_pay_customer" type="object" string="Register Payment"
-                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}"/>
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',True)]}" groups="base.group_user"/>
                     <button name="invoice_pay_customer" type="object" string="Register Payment"
-                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight"/>
+                        attrs="{'invisible': ['|', ('state','!=','open'), ('sent','=',False)]}" class="oe_highlight" groups="base.group_user"/>
                 </xpath>
             </field>
         </record>
@@ -20,7 +20,7 @@
             <field name="inherit_id" ref="account.invoice_supplier_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='invoice_open'][last()]" position="after">
-                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" class="oe_highlight"/>
+                    <button name="invoice_pay_customer" type="object" string="Pay" states="open" class="oe_highlight" groups="base.group_user"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 4dc753deedc..1e1481c3f2b 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -213,7 +213,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-                    <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
+                    <field name="voucher_id" string="" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
                 </xpath>
                 <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="before">
                     <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index a550d57b763..784ede6a77e 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2010-12-11 14:36+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-29 13:01+0000\n"
+"Last-Translator: Andrius Preimantas <andrius.preimantas@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: 2012-11-25 06:15+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
@@ -337,7 +337,7 @@ msgstr "Juodraštis"
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "Import Invoices"
-msgstr ""
+msgstr "Įkelti S/F"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0
@@ -495,7 +495,7 @@ msgstr ""
 #: code:addons/account_voucher/invoice.py:33
 #, python-format
 msgid "Pay Invoice"
-msgstr ""
+msgstr "Apmokėti sąskaitą"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1134
@@ -878,7 +878,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Bill Date"
-msgstr ""
+msgstr "Sąskaitos data"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1130,7 +1130,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Ref #"
-msgstr ""
+msgstr "Nuoroda"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/nb.po b/addons/account_voucher/i18n/nb.po
new file mode 100644
index 00000000000..9323df6282c
--- /dev/null
+++ b/addons/account_voucher/i18n/nb.po
@@ -0,0 +1,1262 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:51+0000\n"
+"PO-Revision-Date: 2012-11-29 20:14+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: account_voucher
+#: field:account.bank.statement.line,voucher_id:0
+msgid "Reconciliation"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_config_settings
+msgid "account.config.settings"
+msgstr "Konto.konfigurasjon.innstillinger."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:348
+#, python-format
+msgid "Write-Off"
+msgstr "Nedskrivning."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Ref"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Amount"
+msgstr "Totalt beløp."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Customer Journal Entries"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: account_voucher
+#: help:account.voucher,writeoff_amount:0
+msgid ""
+"Computed as the difference between the amount stated in the voucher and the "
+"sum of allocation on the voucher lines."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "(Update)"
+msgstr "(Oppdatert)"
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1093
+#, python-format
+msgid ""
+"You have to delete the bank statement line which the payment was reconciled "
+"to manually. Please check the payment of the partner %s by the amount of %s."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_pay_bills
+msgid "Bill Payment"
+msgstr "Betal regning ."
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
+msgid "Import Entries"
+msgstr "Import"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Entry"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "March"
+msgstr "Mars."
+
+#. module: account_voucher
+#: field:account.voucher,message_unread:0
+msgid "Unread Messages"
+msgstr "Uleste meldinger."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Pay Bill"
+msgstr "Betal regning."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure you want to cancel this receipt?"
+msgstr "Er du sikker på at du vil avbryte denne kvitteringen?"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Set to Draft"
+msgstr "Sett som utkast."
+
+#. module: account_voucher
+#: help:account.voucher,reference:0
+msgid "Transaction reference number."
+msgstr "Transaksjon referanse nummer."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Group by year of Invoice Date"
+msgstr "Grupper etter år på fakturadato"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,user_id:0
+msgid "Salesperson"
+msgstr "Salgsman."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Statistics"
+msgstr "Kupong statistikker."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a purchase receipt. \n"
+"              </p><p>\n"
+"                When the purchase receipt is confirmed, you can record the\n"
+"                supplier payment related to this purchase receipt.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Search Vouchers"
+msgstr "Søk kuponger."
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Counterpart Account"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,account_id:0
+#: field:account.voucher.line,account_id:0
+#: field:sale.receipt.report,account_id:0
+msgid "Account"
+msgstr "Konto."
+
+#. module: account_voucher
+#: field:account.voucher,line_dr_ids:0
+msgid "Debits"
+msgstr "Debet."
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: account_voucher
+#: field:account.voucher.line,reconcile:0
+msgid "Full Reconcile"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,date_due:0
+#: field:account.voucher.line,date_due:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,date_due:0
+msgid "Due Date"
+msgstr "Utløps Dato."
+
+#. module: account_voucher
+#: field:account.voucher,narration:0
+msgid "Notes"
+msgstr "Notater."
+
+#. module: account_voucher
+#: field:account.voucher,message_ids:0
+msgid "Messages"
+msgstr "Meldinger."
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr "Salg."
+
+#. module: account_voucher
+#: field:account.voucher.line,move_line_id:0
+msgid "Journal Item"
+msgstr "Journal Elementer."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:964
+#, python-format
+msgid "Error!"
+msgstr "Feil!"
+
+#. module: account_voucher
+#: field:account.voucher.line,amount:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Options"
+msgstr "Betalings alternativer."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Other Information"
+msgstr "Annen informasjon."
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: selection:sale.receipt.report,state:0
+msgid "Cancelled"
+msgstr "Kansellert."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1134
+#, python-format
+msgid ""
+"You have to configure account base code and account tax code on the '%s' tax!"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a sale receipt.\n"
+"              </p><p>\n"
+"                When the sale receipt is confirmed, you can record the "
+"customer\n"
+"                payment related to this sales receipt.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskrift linje."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,day:0
+msgid "Day"
+msgstr "Dag."
+
+#. module: account_voucher
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_voucher
+#: field:account.voucher,tax_id:0
+msgid "Tax"
+msgstr "Skatt."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:864
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ugyldig handling!"
+
+#. module: account_voucher
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Tidsskriftet og perioden er valgt å tilhøre samme selskap."
+
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Counterpart Comment"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto."
+
+#. module: account_voucher
+#: help:account.voucher,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Information"
+msgstr "Betalings informasjon."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "(update)"
+msgstr "(Oppdatering)"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Draft"
+msgstr "Kladd."
+
+#. module: account_voucher
+#: view:account.bank.statement:0
+msgid "Import Invoices"
+msgstr "Importer fakturaer."
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Receipt"
+msgstr "Kvittering."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1001
+#, python-format
+msgid ""
+"You should configure the 'Gain Exchange Rate Account' in the accounting "
+"settings, to manage automatically the booking of accounting entries related "
+"to differences between exchange rates."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Lines"
+msgstr "Salgs linjer."
+
+#. module: account_voucher
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,period_id:0
+msgid "Period"
+msgstr "Periode."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier"
+msgstr "Leverandør"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,message_follower_ids:0
+msgid "Followers"
+msgstr "Følgere."
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Debit"
+msgstr "Debet."
+
+#. module: account_voucher
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,nbr:0
+msgid "# of Voucher Lines"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,type:0
+msgid "Type"
+msgstr "Type."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Pro-forma Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
+msgid "Voucher Entries"
+msgstr "Kupong oppføringer."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
+msgid "Vouchers Entries"
+msgstr "Kuponger oppføringer."
+
+#. module: account_voucher
+#: field:account.voucher,name:0
+msgid "Memo"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to unreconcile and cancel this record ?"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipt"
+msgstr "Salgs kvittering."
+
+#. module: account_voucher
+#: field:account.voucher,is_multi_currency:0
+msgid "Multi Currency Voucher"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Information"
+msgstr "Regning informasjon."
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "July"
+msgstr "juli."
+
+#. module: account_voucher
+#: help:account.voucher,state:0
+msgid ""
+" * The 'Draft' status is used when a user is encoding a new and unconfirmed "
+"Voucher.                         \n"
+"* The 'Pro-forma' when voucher is in Pro-forma status,voucher does not have "
+"an voucher number.                         \n"
+"* The 'Posted' status is used when user create voucher,a voucher number is "
+"generated and voucher entries are created in account                         "
+"\n"
+"* The 'Cancelled' status is used when user cancel voucher."
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Difference Amount"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/invoice.py:33
+#, python-format
+msgid "Pay Invoice"
+msgstr "Betal faktura."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1134
+#, python-format
+msgid "No Account Base Code and Account Tax Code!"
+msgstr "Ingen konto base kode og konto skatt kode."
+
+#. module: account_voucher
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
+msgstr "Skatt beløp."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Validated Vouchers"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a new payment. \n"
+"              </p><p>\n"
+"                Enter the customer and the payment method and then, either\n"
+"                create manually a payment record or OpenERP will propose to "
+"you\n"
+"                automatically the reconciliation of this payment with the "
+"open\n"
+"                invoices or sales receipts.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_voucher
+#: field:account.config.settings,expense_currency_exchange_account_id:0
+#: field:res.company,expense_currency_exchange_account_id:0
+msgid "Loss Exchange Rate Account"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Paid Amount"
+msgstr "Betalt beløp."
+
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Difference"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,audit:0
+msgid "To Review"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1008
+#: code:addons/account_voucher/account_voucher.py:1022
+#: code:addons/account_voucher/account_voucher.py:1175
+#, python-format
+msgid "change"
+msgstr "Endre."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:997
+#, python-format
+msgid ""
+"You should configure the 'Loss Exchange Rate Account' in the accounting "
+"settings, to manage automatically the booking of accounting entries related "
+"to differences between exchange rates."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Expense Lines"
+msgstr "Utgift linjer."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sale voucher"
+msgstr "Salg kuponger."
+
+#. module: account_voucher
+#: help:account.voucher,is_multi_currency:0
+msgid ""
+"Fields with internal purpose only that depicts if the voucher is a multi "
+"currency one or not"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.invoice:0
+msgid "Register Payment"
+msgstr "Registrer Betaling."
+
+#. module: account_voucher
+#: field:account.statement.from.invoice.lines,line_ids:0
+msgid "Invoices"
+msgstr "Fakturaer."
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "December"
+msgstr "Desember."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Group by month of Invoice Date"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,month:0
+msgid "Month"
+msgstr "Måned."
+
+#. module: account_voucher
+#: field:account.voucher,currency_id:0
+#: field:account.voucher.line,currency_id:0
+#: field:sale.receipt.report,currency_id:0
+msgid "Currency"
+msgstr "Valuta."
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+msgid "Payable and Receivables"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Payment"
+msgstr "Kupong betaling."
+
+#. module: account_voucher
+#: field:sale.receipt.report,state:0
+msgid "Voucher Status"
+msgstr "Kupong status."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Are you sure to unreconcile this record?"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,company_id:0
+#: field:account.voucher.line,company_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,company_id:0
+msgid "Company"
+msgstr "Firma."
+
+#. module: account_voucher
+#: help:account.voucher,paid:0
+msgid "The Voucher has been totally paid."
+msgstr "Kupongen har blitt fullstendig betalt."
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Reconcile Payment Balance"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:960
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfigurasjons feil!"
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: view:sale.receipt.report:0
+msgid "Draft Vouchers"
+msgstr "Kladd kuponger."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr "Totalt med skatt."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Purchase Voucher"
+msgstr "Betal kupong."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,state:0
+#: view:sale.receipt.report:0
+msgid "Status"
+msgstr "Status."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Allocation"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: view:account.voucher:0
+msgid "or"
+msgstr "Eller."
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "August"
+msgstr "August."
+
+#. module: account_voucher
+#: help:account.voucher,audit:0
+msgid ""
+"Check this box if you are unsure of that journal entry and if you want to "
+"note it as 'to be reviewed' by an accounting expert."
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "October"
+msgstr "Oktober."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:961
+#, python-format
+msgid "Please activate the sequence of selected journal !"
+msgstr "Vennligst aktiver sekvensen av den utvalgte journal!"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "June"
+msgstr "Juni."
+
+#. module: account_voucher
+#: field:account.voucher,payment_rate_currency_id:0
+msgid "Payment Rate Currency"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,paid:0
+msgid "Paid"
+msgstr "Betalt."
+
+#. module: account_voucher
+#: field:account.voucher,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Er en følger."
+
+#. module: account_voucher
+#: field:account.voucher,analytic_id:0
+msgid "Write-Off Analytic Account"
+msgstr "Skriv av analytisk konto."
+
+#. module: account_voucher
+#: field:account.voucher,date:0
+#: field:account.voucher.line,date_original:0
+#: field:sale.receipt.report,date:0
+msgid "Date"
+msgstr "Dato."
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "November"
+msgstr "November."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: account_voucher
+#: field:account.voucher,paid_amount_in_company_currency:0
+msgid "Paid Amount in Company Currency"
+msgstr "Betalt beløp i firmas valuta."
+
+#. module: account_voucher
+#: field:account.bank.statement.line,amount_reconciled:0
+msgid "Amount reconciled"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,message_comment_ids:0
+#: help:account.voucher,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Kommentarer og E-poster."
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new supplier payment.\n"
+"              </p><p>\n"
+"                OpenERP helps you easily track payments you do and remining\n"
+"                balance to pay to your supplier.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: account_voucher
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Directly"
+msgstr "Betal direkte."
+
+#. module: account_voucher
+#: field:account.voucher.line,type:0
+msgid "Dr/Cr"
+msgstr "Dr/Cr."
+
+#. module: account_voucher
+#: field:account.voucher,pre_line:0
+msgid "Previous Payments ?"
+msgstr "Tidligere Betalinger ?"
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "January"
+msgstr "Januar."
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
+#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
+msgid "Journal Vouchers"
+msgstr "Journal kuponger."
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_res_company
+msgid "Companies"
+msgstr "Firmaer."
+
+#. module: account_voucher
+#: field:account.voucher,message_summary:0
+msgid "Summary"
+msgstr "Oppsummering."
+
+#. module: account_voucher
+#: field:account.voucher,active:0
+msgid "Active"
+msgstr "Aktiv."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:965
+#, python-format
+msgid "Please define a sequence on the journal."
+msgstr "Vennligst definere en sekvens på tidsskriftet."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Group by Invoice Date"
+msgstr "Grupper etter fakturadato."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1093
+#, python-format
+msgid "Wrong bank statement line"
+msgstr "Feil kontoutskrift linje."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Post"
+msgstr "Publiser."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Invoices and outstanding transactions"
+msgstr "Fakturaer og enestående transaksjoner."
+
+#. module: account_voucher
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total:0
+msgid "Total Without Tax"
+msgstr "Totalt uten avgift."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Bill Date"
+msgstr "Regning dato."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.model,name:account_voucher.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Regnskapsmessig kupong."
+
+#. module: account_voucher
+#: field:account.voucher,number:0
+msgid "Number"
+msgstr "Nummer."
+
+#. module: account_voucher
+#: selection:account.voucher.line,type:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Kontoutskrift."
+
+#. module: account_voucher
+#: view:account.bank.statement:0
+msgid "onchange_amount(amount)"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "September"
+msgstr "September."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sales Information"
+msgstr "Salgs informasjon."
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipt Analysis"
+msgstr "Salgs kvittering analyse."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher.line,voucher_id:0
+#: model:res.request.link,name:account_voucher.req_link_voucher
+msgid "Voucher"
+msgstr "Kupong."
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Voucher Items"
+msgstr "Kupong elementer."
+
+#. module: account_voucher
+#: view:account.statement.from.invoice.lines:0
+#: view:account.voucher:0
+msgid "Cancel"
+msgstr "Avbryt."
+
+#. module: account_voucher
+#: model:ir.actions.client,name:account_voucher.action_client_invoice_menu
+msgid "Open Invoicing Menu"
+msgstr "Åpne fakturering meny."
+
+#. module: account_voucher
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Pro-forma"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,move_ids:0
+msgid "Journal Items"
+msgstr "Journal Elementer."
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:492
+#, python-format
+msgid "Please define default credit/debit accounts on the journal \"%s\"."
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payment"
+msgstr "Kunde betaling."
+
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Purchase"
+msgstr "Betaling."
+
+#. module: account_voucher
+#: view:account.invoice:0
+#: view:account.voucher:0
+msgid "Pay"
+msgstr "Betal"
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Currency Options"
+msgstr "Valuta muligheter."
+
+#. module: account_voucher
+#: help:account.voucher,payment_option:0
+msgid ""
+"This field helps you to choose what you want to do with the eventual "
+"difference between the paid amount and the sum of allocated amounts. You can "
+"either choose to keep open this difference on the partner's account, or "
+"reconcile it with the payment(s)"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
+msgid ""
+"<p>\n"
+"            From this report, you can have an overview of the amount "
+"invoiced\n"
+"            to your customer as well as payment delays. The tool search can\n"
+"            also be used to personalise your Invoices reports and so, match\n"
+"            this analysis to your needs.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Posted Vouchers"
+msgstr "Lagt ut kuponger."
+
+#. module: account_voucher
+#: field:account.voucher,payment_rate:0
+msgid "Exchange Rate"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Method"
+msgstr "Betalings metode."
+
+#. module: account_voucher
+#: field:account.voucher.line,name:0
+msgid "Description"
+msgstr "Beskrivelse."
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "May"
+msgstr "Mai."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Sale Receipt"
+msgstr "Salgs kvittering."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,journal_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,journal_id:0
+msgid "Journal"
+msgstr "Journal."
+
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payment"
+msgstr "Leverandør betaling."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Internal Notes"
+msgstr "Interne notater."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,line_cr_ids:0
+msgid "Credits"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Original Amount"
+msgstr "Opprinnelig beløp."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipt"
+msgstr "Kjøps kvitteringen."
+
+#. module: account_voucher
+#: help:account.voucher,payment_rate:0
+msgid ""
+"The specific rate that will be used, in this voucher, between the selected "
+"currency (in 'Payment Rate Currency' field)  and the voucher currency."
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,pay_now:0
+#: selection:account.voucher,type:0
+#: field:sale.receipt.report,pay_now:0
+#: selection:sale.receipt.report,type:0
+msgid "Payment"
+msgstr "Betaling."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
+msgid "Posted"
+msgstr "Lagt inn."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Customer"
+msgstr "Kunde."
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "February"
+msgstr "Februar."
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr "Leverandør fakturaer og utestående transaksjoner."
+
+#. module: account_voucher
+#: field:account.voucher,reference:0
+msgid "Ref #"
+msgstr "Referanse #"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,year:0
+msgid "Year"
+msgstr "År."
+
+#. module: account_voucher
+#: field:account.config.settings,income_currency_exchange_account_id:0
+#: field:res.company,income_currency_exchange_account_id:0
+msgid "Gain Exchange Rate Account"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "April"
+msgstr "April."
+
+#. module: account_voucher
+#: help:account.voucher,tax_id:0
+msgid "Only for tax excluded from price"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+msgid "Default Type"
+msgstr "Standard type."
+
+#. module: account_voucher
+#: help:account.voucher,message_ids:0
+msgid "Messages and communication history"
+msgstr "Meldinger og kommunikasjon historie."
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
+msgid "Entries by Statement from Invoices"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,amount:0
+msgid "Total"
+msgstr "Totalt."
+
+#. module: account_voucher
+#: field:account.voucher,move_id:0
+msgid "Account Entry"
+msgstr "Konto Inngang."
+
+#. module: account_voucher
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line."
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:864
+#, python-format
+msgid "Cannot delete voucher(s) which are already opened or paid."
+msgstr "Kan ikke slette kupong(er) som allerede er åpnet eller betalt."
+
+#. module: account_voucher
+#: help:account.voucher,date:0
+msgid "Effective date for accounting entries"
+msgstr ""
+
+#. module: account_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher
+msgid "Status Change"
+msgstr "Statusendring."
+
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Keep Open"
+msgstr "Hold åpen."
+
+#. module: account_voucher
+#: field:account.voucher,line_ids:0
+#: view:account.voucher.line:0
+#: model:ir.model,name:account_voucher.model_account_voucher_line
+msgid "Voucher Lines"
+msgstr "Kupong linjer."
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.line,untax_amount:0
+msgid "Untax Amount"
+msgstr ""
+
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_sale_receipt_report
+msgid "Sales Receipt Statistics"
+msgstr "Salgs kvittering statistikker."
+
+#. module: account_voucher
+#: view:account.voucher:0
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,partner_id:0
+msgid "Partner"
+msgstr "Partner."
+
+#. module: account_voucher
+#: field:account.voucher.line,amount_unreconciled:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1001
+#, python-format
+msgid "Insufficient Configuration!"
+msgstr ""
+
+#. module: account_voucher
+#: help:account.voucher,active:0
+msgid ""
+"By default, reconciliation vouchers made on draft bank statements are set as "
+"inactive, which allow to hide the customer/supplier payment while the bank "
+"statement isn't confirmed."
+msgstr ""
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index 30278b0a5d7..f174f76940c 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-10 17:47+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 10:48+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:15+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
 msgid "Reconciliation"
-msgstr ""
+msgstr "核销"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:348
@@ -63,7 +63,7 @@ msgstr "计算公式 ： 凭证上输入的金额 - 凭证行的金额合计"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(Update)"
-msgstr ""
+msgstr "（更新）"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1093
@@ -98,7 +98,7 @@ msgstr "3月"
 #. module: account_voucher
 #: field:account.voucher,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -108,7 +108,7 @@ msgstr "付款"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure you want to cancel this receipt?"
-msgstr ""
+msgstr "你确信要取消这个收据？"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -129,7 +129,7 @@ msgstr "按发票年度分组"
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "销售员"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -201,7 +201,7 @@ msgstr "备注"
 #. module: account_voucher
 #: field:account.voucher,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -219,7 +219,7 @@ msgstr "会计凭证行"
 #: code:addons/account_voucher/account_voucher.py:964
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -265,7 +265,7 @@ msgstr ""
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@@ -292,7 +292,7 @@ msgstr "税"
 #: code:addons/account_voucher/account_voucher.py:864
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "非法的动作"
 
 #. module: account_voucher
 #: constraint:account.bank.statement:0
@@ -314,7 +314,7 @@ msgstr "辅助核算项"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -324,7 +324,7 @@ msgstr "付款信息"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(update)"
-msgstr ""
+msgstr "（更新）"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -390,7 +390,7 @@ msgstr "供应商手工凭证"
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -533,7 +533,7 @@ msgstr ""
 #: field:account.config.settings,expense_currency_exchange_account_id:0
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Loss Exchange Rate Account"
-msgstr ""
+msgstr "丢失了汇率账目"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -576,7 +576,7 @@ msgstr "费用明细"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sale voucher"
-msgstr ""
+msgstr "销售凭据"
 
 #. module: account_voucher
 #: help:account.voucher,is_multi_currency:0
@@ -588,7 +588,7 @@ msgstr "此字段由系统内部使用，区分该凭证是否涉及外币"
 #. module: account_voucher
 #: view:account.invoice:0
 msgid "Register Payment"
-msgstr ""
+msgstr "登记付款"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice.lines,line_ids:0
@@ -626,17 +626,17 @@ msgstr "应收应付"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Payment"
-msgstr ""
+msgstr "付款收据"
 
 #. module: account_voucher
 #: field:sale.receipt.report,state:0
 msgid "Voucher Status"
-msgstr ""
+msgstr "收据状态"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record?"
-msgstr ""
+msgstr "你确定要反核销这条记录？"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
@@ -660,7 +660,7 @@ msgstr "核销付款余额"
 #: code:addons/account_voucher/account_voucher.py:960
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "设置错误!"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -677,14 +677,14 @@ msgstr "含税总计"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Purchase Voucher"
-msgstr ""
+msgstr "采购凭证"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -695,7 +695,7 @@ msgstr "分配"
 #: view:account.statement.from.invoice.lines:0
 #: view:account.voucher:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -718,7 +718,7 @@ msgstr "10月"
 #: code:addons/account_voucher/account_voucher.py:961
 #, python-format
 msgid "Please activate the sequence of selected journal !"
-msgstr ""
+msgstr "请激活选中分类账的 序列（ sequence  ）。"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -738,7 +738,7 @@ msgstr "已付款"
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
@@ -776,7 +776,7 @@ msgstr "已对账金额"
 #: field:account.voucher,message_comment_ids:0
 #: help:account.voucher,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -825,18 +825,18 @@ msgstr "公司"
 #. module: account_voucher
 #: field:account.voucher,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: account_voucher
 #: field:account.voucher,active:0
 msgid "Active"
-msgstr ""
+msgstr "启用"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:965
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "请在分类账上定义一个序列（ sequence  ）。"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -852,7 +852,7 @@ msgstr "按发票日期分组"
 #: code:addons/account_voucher/account_voucher.py:1093
 #, python-format
 msgid "Wrong bank statement line"
-msgstr ""
+msgstr "错误的银行对账单行"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -909,7 +909,7 @@ msgstr "银行单据"
 #. module: account_voucher
 #: view:account.bank.statement:0
 msgid "onchange_amount(amount)"
-msgstr ""
+msgstr "onchange_amount(amount)"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -954,7 +954,7 @@ msgstr "取消"
 #. module: account_voucher
 #: model:ir.actions.client,name:account_voucher.action_client_invoice_menu
 msgid "Open Invoicing Menu"
-msgstr ""
+msgstr "打开开票菜单"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
@@ -973,7 +973,7 @@ msgstr "账簿明细"
 #: code:addons/account_voucher/account_voucher.py:492
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\"."
-msgstr ""
+msgstr "定义分类账 \"%s\" 的默认借方/贷方科目"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
@@ -1049,7 +1049,7 @@ msgstr "5月"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Sale Receipt"
-msgstr ""
+msgstr "销售收据"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1162,7 +1162,7 @@ msgstr "默认类型"
 #. module: account_voucher
 #: help:account.voucher,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
@@ -1185,13 +1185,13 @@ msgstr "分录"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line."
-msgstr ""
+msgstr "单据的金额必须跟对账单其中一行金额相同。"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:864
 #, python-format
 msgid "Cannot delete voucher(s) which are already opened or paid."
-msgstr ""
+msgstr "不能删除已经开启或者支付的单据。"
 
 #. module: account_voucher
 #: help:account.voucher,date:0
@@ -1201,7 +1201,7 @@ msgstr "会计分录的生效日期"
 #. module: account_voucher
 #: model:mail.message.subtype,name:account_voucher.mt_voucher
 msgid "Status Change"
-msgstr ""
+msgstr "状态更改"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index 300d565f229..0f4c2058fc7 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -66,7 +66,6 @@
     default_credit_account_id: account_cash_usd_id
     currency: base.USD
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 
 -
   I create the first invoice on 1st January  for 200 USD
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index 1a0c250395e..b32228032d3 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -23,7 +23,6 @@
     default_credit_account_id: account.cash
     currency: base.EUR
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create a bank journal with USD as currency
 -
@@ -37,7 +36,6 @@
     default_credit_account_id: account.cash
     currency: base.USD
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create the first invoice on 1st January for 200 USD
 -
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index 91f8a629cbb..275e4c58835 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -59,7 +59,6 @@
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create a bank journal with USD as currency
 -
@@ -73,7 +72,6 @@
     default_credit_account_id: account_cash_usd_id
     currency: base.USD
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create the first invoice on 1st January for 200 USD
 -
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index cc5e819af30..667882e3a32 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -59,7 +59,6 @@
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create a bank journal with USD as currency
 -
@@ -73,7 +72,6 @@
     default_credit_account_id: account_cash_usd_id
     currency: base.USD
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create the first invoice on 1st January for 200 USD
 -
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index 37ea7ea981a..f2f9461c31e 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -27,7 +27,6 @@
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create the first invoice on 1st January for 150 EUR
 -
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index a2b252497cd..bc33e387a85 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -61,7 +61,6 @@
     default_credit_account_id: account_cash_chf_id
     currency: base.CHF
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create the first invoice on 1st January for 200 CAD
 -
diff --git a/addons/account_voucher/test/case5_suppl_usd_usd.yml b/addons/account_voucher/test/case5_suppl_usd_usd.yml
index 3cae9667d84..3ef6d1269b7 100644
--- a/addons/account_voucher/test/case5_suppl_usd_usd.yml
+++ b/addons/account_voucher/test/case5_suppl_usd_usd.yml
@@ -4,10 +4,10 @@
 -
   I create a cash account with currency USD
 -
-  !record {model: account.account, id: account_cash_usd_id}:
+  !record {model: account.account, id: account_cash_usd_id2}:
     currency_id: base.USD
     name: "cash account in usd"
-    code: "Xcash usd"
+    code: "Xcash usd2"
     type: 'liquidity'
     user_type: "account.data_account_type_cash"
 
@@ -46,7 +46,6 @@
     default_debit_account_id: account.cash
     default_credit_account_id: account.cash
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create a bank journal with USD as currency
 -
@@ -56,11 +55,10 @@
     type: bank
     analytic_journal_id: account.sit
     sequence_id: account.sequence_bank_journal
-    default_debit_account_id: account_cash_usd_id
-    default_credit_account_id: account_cash_usd_id
+    default_debit_account_id: account_cash_usd_id2
+    default_credit_account_id: account_cash_usd_id2
     currency: base.USD
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I set the context as would do the action in supplier invoice menuitem
 -
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 125277191cb..94f0c718980 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -40,7 +40,6 @@
     default_credit_account_id: account_eur_usd_id
     currency: base.USD
     company_id: base.main_company
-    view_id: account.account_journal_bank_view
 -
   I create an invoice 
 -
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 708f9b3b196..542acb1e88c 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -20,8 +20,10 @@
 ##############################################################################
 
 import time
+from datetime import datetime
 
 from osv import fields, osv
+import tools
 from tools.translate import _
 import decimal_precision as dp
 
@@ -199,9 +201,14 @@ class account_analytic_account(osv.osv):
             return {}
         res = {'value':{}}
         template = self.browse(cr, uid, template_id, context=context)
-        res['value']['date_start'] = template.date_start
-        res['value']['date'] = template.date
+        if template.date_start and template.date:
+            from_dt = datetime.strptime(template.date_start, tools.DEFAULT_SERVER_DATE_FORMAT)
+            to_dt = datetime.strptime(template.date, tools.DEFAULT_SERVER_DATE_FORMAT)
+            timedelta = to_dt - from_dt
+            res['value']['date'] = datetime.strftime(datetime.now() + timedelta, tools.DEFAULT_SERVER_DATE_FORMAT)
+        res['value']['date_start'] = fields.date.today()
         res['value']['quantity_max'] = template.quantity_max
+        res['value']['parent_id'] = template.parent_id and template.parent_id.id or False
         res['value']['description'] = template.description
         return res
 
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 1277d25de71..0faca841a0f 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -26,10 +26,10 @@
                                 <field name="currency_id" attrs="{'invisible': ['|',('type', '&lt;&gt;', 'view'), ('company_id', '&lt;&gt;', False)]}"/>
                             </group>
                             <group>
-                                <field name="code"/>
                                 <field name="type" invisible="context.get('default_type', False)"/>
-                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
                                 <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                                <field name="code"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract'])]}"/>
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>
                         </group>
diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po
index 7e95607dcd7..57224ea0164 100644
--- a/addons/analytic/i18n/fr.po
+++ b/addons/analytic/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-12 13:04+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 15:37+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -380,7 +380,7 @@ msgid ""
 "Calculated by multiplying the quantity and the price given in the Product's "
 "cost price. Always expressed in the company main currency."
 msgstr ""
-"Calculé en multipliant la quantité par le prix de revient du produit. "
+"Calculé en multipliant la quantité par le prix de revient de l'article. "
 "Toujours exprimé dans la devise principale de la société."
 
 #. module: analytic
diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po
index d5eb3b42d90..0813deb9233 100644
--- a/addons/analytic/i18n/nb.po
+++ b/addons/analytic/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-04-07 06:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-29 13:08+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -25,12 +25,12 @@ msgstr "underordnede kontoer"
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "I arbeid."
 
 #. module: analytic
 #: model:mail.message.subtype,name:analytic.mt_account_status
 msgid "Status Change"
-msgstr ""
+msgstr "Statusendring."
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -40,7 +40,7 @@ msgstr "Mal"
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "End Date"
-msgstr ""
+msgstr "Sluttdato."
 
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
@@ -65,7 +65,7 @@ msgstr ""
 #: code:addons/analytic/analytic.py:215
 #, python-format
 msgid "Contract: "
-msgstr ""
+msgstr "Kontrakt. "
 
 #. module: analytic
 #: field:account.analytic.account,manager_id:0
@@ -75,13 +75,13 @@ msgstr "kontofører"
 #. module: analytic
 #: field:account.analytic.account,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Følgere."
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:312
 #, python-format
 msgid "Contract <b>created</b>."
-msgstr ""
+msgstr "Kontrakt <b> Opprett <b>."
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -101,18 +101,18 @@ msgstr "Ny"
 #. module: analytic
 #: field:account.analytic.account,user_id:0
 msgid "Project Manager"
-msgstr ""
+msgstr "Prosjektleder."
 
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status."
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:254
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopi)"
 
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
@@ -128,17 +128,17 @@ msgstr "Beskrivelse"
 #. module: analytic
 #: field:account.analytic.account,name:0
 msgid "Account/Contract Name"
-msgstr ""
+msgstr "Konto/kontrakt navn."
 
 #. module: analytic
 #: field:account.analytic.account,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Uleste meldinger."
 
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
 
 #. module: analytic
 #: field:account.analytic.account,company_id:0
@@ -154,7 +154,7 @@ msgstr ""
 #. module: analytic
 #: help:account.analytic.account,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Meldinger og kommunikasjon historie."
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
@@ -184,7 +184,7 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Er en følger."
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
@@ -218,12 +218,12 @@ msgstr ""
 #: field:account.analytic.account,message_comment_ids:0
 #: help:account.analytic.account,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Kommentarer og E-poster."
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Customer"
-msgstr ""
+msgstr "Kunde."
 
 #. module: analytic
 #: field:account.analytic.account,child_complete_ids:0
@@ -233,33 +233,33 @@ msgstr "konto hierarkiet"
 #. module: analytic
 #: field:account.analytic.account,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Meldinger."
 
 #. module: analytic
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette en analytisk linje på vis konto."
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Contract Information"
-msgstr ""
+msgstr "Kontrakt informasjon."
 
 #. module: analytic
 #: field:account.analytic.account,template_id:0
 #: selection:account.analytic.account,type:0
 msgid "Template of Contract"
-msgstr ""
+msgstr "Mal av kontrakt."
 
 #. module: analytic
 #: field:account.analytic.account,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Oppsummering."
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Prepaid Service Units"
-msgstr ""
+msgstr "Forhåndsbetalte tjeneste enheter."
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -275,12 +275,12 @@ msgstr "Beløp"
 #: code:addons/analytic/analytic.py:314
 #, python-format
 msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr ""
+msgstr "Kontrakt for <em>%s</em> har vært <b> Opprett <b>."
 
 #. module: analytic
 #: view:account.analytic.account:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Vilkår og betingelser."
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -290,7 +290,7 @@ msgstr "Annulert"
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Analytic View"
-msgstr ""
+msgstr "Analytisk vis."
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
@@ -305,7 +305,7 @@ msgstr ""
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "To Renew"
-msgstr ""
+msgstr "Å fornye."
 
 #. module: analytic
 #: field:account.analytic.account,quantity:0
@@ -321,13 +321,13 @@ msgstr "Sluttdato"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Reference"
-msgstr ""
+msgstr "Referanse."
 
 #. module: analytic
 #: code:addons/analytic/analytic.py:151
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Feil!"
 
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
@@ -337,7 +337,7 @@ msgstr "Analytisk bokføring"
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "Contract or Project"
-msgstr ""
+msgstr "Kontrakt eller prosjekt."
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
@@ -367,12 +367,12 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Type of Account"
-msgstr ""
+msgstr "Konto type."
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdato."
 
 #. module: analytic
 #: help:account.analytic.line,amount:0
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index 35177ee3a66..ee92b469744 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -65,39 +65,25 @@ class account_analytic_account(osv.osv):
 
     def _expense_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        res_final = {}
-        child_ids = tuple(ids) #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
-        for i in child_ids:
-            res[i] =  0.0
-        if not child_ids:
-            return res
-
-        if child_ids:
-            cr.execute("""SELECT account_analytic_account.id, \
-                                COALESCE(SUM (product_template.list_price * \
-                                    account_analytic_line.unit_amount * \
-                                    ((100-hr_timesheet_invoice_factor.factor)/100)), 0.0) \
-                                    AS ca_to_invoice \
-                            FROM product_template \
-                            JOIN product_product \
-                                ON product_template.id = product_product.product_tmpl_id \
-                            JOIN account_analytic_line \
-                                ON account_analytic_line.product_id = product_product.id \
-                            JOIN account_analytic_journal \
-                                ON account_analytic_line.journal_id = account_analytic_journal.id \
-                            JOIN account_analytic_account \
-                                ON account_analytic_account.id = account_analytic_line.account_id \
-                            JOIN hr_timesheet_invoice_factor \
-                                ON hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
-                            WHERE account_analytic_account.id IN %s \
-                                AND account_analytic_line.invoice_id IS NULL \
-                                AND account_analytic_line.to_invoice IS NOT NULL \
-                                AND account_analytic_journal.type = 'purchase' \
-                            GROUP BY account_analytic_account.id;""",(child_ids,))
-            for account_id, sum in cr.fetchall():
-                res[account_id] = sum
-        res_final = res
-        return res_final
+        #We don't want consolidation for each of these fields because those complex computation is resource-greedy.
+        for account in self.pool.get('account.analytic.account').browse(cr, uid, ids, context=context):
+            cr.execute("""
+                SELECT product_id, sum(amount), user_id, to_invoice, sum(unit_amount), product_uom_id, line.name
+                FROM account_analytic_line line
+                    LEFT JOIN account_analytic_journal journal ON (journal.id = line.journal_id)
+                WHERE account_id = %s
+                    AND journal.type = 'purchase'
+                    AND invoice_id IS NULL
+                    AND to_invoice IS NOT NULL
+                GROUP BY product_id, user_id, to_invoice, product_uom_id, line.name""", (account.id,))
+
+            res[account.id] = 0.0
+            for product_id, price, user_id, factor_id, qty, uom, line_name in cr.fetchall():
+                #the amount to reinvoice is the real cost. We don't use the pricelist
+                price = -price
+                factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context)
+                res[account.id] += price * qty * (100 - factor.factor or 0.0) / 100.0
+        return res
 
     def _expense_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         lines_obj = self.pool.get('account.analytic.line')
diff --git a/addons/analytic_contract_hr_expense/i18n/nb.po b/addons/analytic_contract_hr_expense/i18n/nb.po
new file mode 100644
index 00000000000..8c3077c3ca7
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/nb.po
@@ -0,0 +1,77 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 13:13+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "Eller vis."
+
+#. module: analytic_contract_hr_expense
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "Ukjent."
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "Kostnader."
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytisk konto."
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:147
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr "Utgifter til Faktura av% s"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:133
+#, python-format
+msgid "Expenses of %s"
+msgstr "Utgifter av %s."
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Ikke noe å fakturere, opprett."
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr ""
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "Belast utgifter."
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ Faktura."
diff --git a/addons/analytic_contract_hr_expense/i18n/nl.po b/addons/analytic_contract_hr_expense/i18n/nl.po
new file mode 100644
index 00000000000..44ec2e927e1
--- /dev/null
+++ b/addons/analytic_contract_hr_expense/i18n/nl.po
@@ -0,0 +1,77 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:10+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "or view"
+msgstr "of bekijk"
+
+#. module: analytic_contract_hr_expense
+#: constraint:account.analytic.account:0
+msgid "Error! You cannot create recursive analytic accounts."
+msgstr "Fout! Het is niet toegestaan om recursieve kostenplaatsen te maken."
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,expense_invoiced:0
+#: field:account.analytic.account,expense_to_invoice:0
+#: field:account.analytic.account,remaining_expense:0
+msgid "unknown"
+msgstr "onbekend"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "expenses"
+msgstr "uitgaven"
+
+#. module: analytic_contract_hr_expense
+#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Kostenplaats"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:147
+#, python-format
+msgid "Expenses to Invoice of %s"
+msgstr "Uitgave te factureren van %s"
+
+#. module: analytic_contract_hr_expense
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:133
+#, python-format
+msgid "Expenses of %s"
+msgstr "Uitgaven van %s"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "Nothing to invoice, create"
+msgstr "Niets te factureren, aanmaken"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,est_expenses:0
+msgid "Estimation of Expenses to Invoice"
+msgstr "Te verwachten uitgaven te factureren"
+
+#. module: analytic_contract_hr_expense
+#: field:account.analytic.account,charge_expenses:0
+msgid "Charge Expenses"
+msgstr "Uitgaven doorberekenen"
+
+#. module: analytic_contract_hr_expense
+#: view:account.analytic.account:0
+msgid "⇒ Invoice"
+msgstr "⇒ Factuur"
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index c87c9f56da9..9084292a240 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-18 16:43+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-29 15:23+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:15+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
@@ -72,7 +72,7 @@ msgstr ""
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr "Relation Utilisateurs/Produits"
+msgstr "Relations utilisateurs/articles"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
@@ -100,7 +100,7 @@ msgstr ""
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
-"Il n'y a pas de compte de frais défini pour ce produit : \"%s\" (id:%d)"
+"Il n'y a pas de compte de frais défini pour cet article : \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.line:0
diff --git a/addons/analytic_user_function/i18n/nb.po b/addons/analytic_user_function/i18n/nb.po
index b17974113e4..21a25ee3985 100644
--- a/addons/analytic_user_function/i18n/nb.po
+++ b/addons/analytic_user_function/i18n/nb.po
@@ -8,49 +8,49 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-08-27 16:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-29 13:16+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Analytisk linje."
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "Faktura pris, vurder per bruker."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "Tjeneste."
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "Pris."
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
 msgid "Price per hour for this user."
-msgstr ""
+msgstr "Pris per time for denne brukeren."
 
 #. module: analytic_user_function
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
-msgstr ""
+msgstr "Du kan ikke endre en oppføring i en Bekreftet / Ferdig timeliste!"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -63,12 +63,12 @@ msgstr "Analytisk konto"
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Feil!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "Faktura data."
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
@@ -88,12 +88,12 @@ msgstr ""
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Price per User"
-msgstr ""
+msgstr "Pris per bruker."
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Måleenhet."
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
@@ -105,7 +105,7 @@ msgstr "Det er ingen regning definert for dette produktet: \"% s\" (id:% d)"
 #. module: analytic_user_function
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette en analytisk linje på vis konto."
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index 127d8ed10ee..3583ad57a2d 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -7,49 +7,49 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:46+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 14:18+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "辅助核算明细"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 msgid "Invoice Price Rate per User"
-msgstr ""
+msgstr "每用户的开票单价"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Service"
-msgstr ""
+msgstr "服务"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "错误！你不能循环创建辅助核算项"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,price:0
 msgid "Price"
-msgstr ""
+msgstr "价格"
 
 #. module: analytic_user_function
 #: help:analytic.user.funct.grid,price:0
 msgid "Price per hour for this user."
-msgstr ""
+msgstr "用户每小时价格"
 
 #. module: analytic_user_function
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
-msgstr ""
+msgstr "你不能修改在已经确认/完成的计工单的分录。"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
@@ -62,12 +62,12 @@ msgstr "辅助核算项"
 #: code:addons/analytic_user_function/analytic_user_function.py:135
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "Invoicing Data"
-msgstr ""
+msgstr "发票数据"
 
 #. module: analytic_user_function
 #: field:account.analytic.account,user_product_ids:0
@@ -87,12 +87,12 @@ msgstr ""
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Price per User"
-msgstr ""
+msgstr "每用户价格"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "计量单位"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:107
@@ -104,7 +104,7 @@ msgstr "此产品 \"%s\" （id：%d）没有定义辅助核算项"
 #. module: analytic_user_function
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能视图科目上面创建辅助核算行。"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
diff --git a/addons/anonymization/i18n/zh_CN.po b/addons/anonymization/i18n/zh_CN.po
index 6ad6b0c1016..0ba47de11c4 100644
--- a/addons/anonymization/i18n/zh_CN.po
+++ b/addons/anonymization/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-02 09:55+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 06:50+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -25,17 +25,17 @@ msgstr "ir.model.fields.anonymize.wizard"
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
 msgid "ir.model.fields.anonymization.migration.fix"
-msgstr ""
+msgstr "ir.model.fields.anonymization.migration.fix"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.migration.fix,target_version:0
 msgid "Target Version"
-msgstr ""
+msgstr "目标版本"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.migration.fix,query_type:0
 msgid "sql"
-msgstr ""
+msgstr "sql"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,field_name:0
@@ -62,7 +62,7 @@ msgstr "ir.model.fields.anonymization"
 #: field:ir.model.fields.anonymization.history,state:0
 #: field:ir.model.fields.anonymize.wizard,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization.history,direction:0
@@ -135,7 +135,7 @@ msgstr "隐藏数据库"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.migration.fix,query_type:0
 msgid "python"
-msgstr ""
+msgstr "python"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0
@@ -189,7 +189,7 @@ msgstr "隐藏日志"
 #. module: anonymization
 #: field:ir.model.fields.anonymization.migration.fix,model_name:0
 msgid "Model"
-msgstr ""
+msgstr "模型"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
@@ -201,7 +201,7 @@ msgstr "ir.model.fields.anonymization.history"
 msgid ""
 "This is the file created by the anonymization process. It should have the "
 "'.pickle' extention."
-msgstr ""
+msgstr "这个文件有匿名进程创建，他没有 '.pickle' 扩展名"
 
 #. module: anonymization
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
@@ -217,7 +217,7 @@ msgstr "文件名"
 #. module: anonymization
 #: field:ir.model.fields.anonymization.migration.fix,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "编号"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
@@ -238,7 +238,7 @@ msgstr "完成"
 #: field:ir.model.fields.anonymization.migration.fix,query:0
 #: field:ir.model.fields.anonymization.migration.fix,query_type:0
 msgid "Query"
-msgstr ""
+msgstr "查询"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 79468fdf936..344c8a6bdd9 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-26 05:10+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 06:31+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -44,7 +44,7 @@ msgstr "已订阅"
 #: code:addons/audittrail/audittrail.py:408
 #, python-format
 msgid "'%s' Model does not exist..."
-msgstr ""
+msgstr "'%s' 模型不存在..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -61,7 +61,7 @@ msgstr "审计跟踪规则"
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
@@ -215,7 +215,7 @@ msgstr "选择您要生成审计日志的对象"
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_audit
 msgid "Audit"
-msgstr ""
+msgstr "审核"
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
@@ -294,7 +294,7 @@ msgstr "记录删除操作"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Model"
-msgstr ""
+msgstr "模型"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
@@ -335,7 +335,7 @@ msgstr "新值"
 #: code:addons/audittrail/audittrail.py:223
 #, python-format
 msgid "'%s' field does not exist in '%s' model"
-msgstr ""
+msgstr "字段 '%s' 不存在于模型 '%s'"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -387,7 +387,7 @@ msgstr "日志明细"
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
diff --git a/addons/auth_anonymous/i18n/it.po b/addons/auth_anonymous/i18n/it.po
new file mode 100644
index 00000000000..519b3bd8318
--- /dev/null
+++ b/addons/auth_anonymous/i18n/it.po
@@ -0,0 +1,30 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-30 00:10+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Login"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "Gruppo Anonimo"
diff --git a/addons/auth_anonymous/i18n/nl.po b/addons/auth_anonymous/i18n/nl.po
new file mode 100644
index 00000000000..41d1a276d56
--- /dev/null
+++ b/addons/auth_anonymous/i18n/nl.po
@@ -0,0 +1,30 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:11+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_anonymous
+#. openerp-web
+#: code:addons/auth_anonymous/static/src/xml/auth_anonymous.xml:9
+#, python-format
+msgid "Login"
+msgstr "Inloggen"
+
+#. module: auth_anonymous
+#: model:res.groups,name:auth_anonymous.group_anonymous
+msgid "Anonymous Group"
+msgstr "Anonieme groep"
diff --git a/addons/auth_ldap/i18n/fr.po b/addons/auth_ldap/i18n/fr.po
index 82d40b4e9ef..058c315780a 100644
--- a/addons/auth_ldap/i18n/fr.po
+++ b/addons/auth_ldap/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-13 12:55+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 17:08+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: auth_ldap
 #: constraint:res.company:0
@@ -32,7 +32,7 @@ msgstr ""
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
 msgid "Template User"
-msgstr ""
+msgstr "Utilisateur modèle"
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_tls:0
@@ -77,6 +77,8 @@ msgid ""
 "Automatically create local user accounts for new users authenticating via "
 "LDAP"
 msgstr ""
+"Création automatique des comptes utilisateur locaux pour les nouveaux "
+"utilisateurs authentifiés par LDAP."
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -101,7 +103,7 @@ msgstr "Mot de passe LDAP"
 #. module: auth_ldap
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "l'UID OAuth doit être unique par fournisseur"
 
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_company
@@ -121,7 +123,7 @@ msgstr "res.company.ldap"
 #. module: auth_ldap
 #: help:res.company.ldap,user:0
 msgid "User to copy when creating new users"
-msgstr ""
+msgstr "Utilisateur à copier lors de la création des nouveaux utilisateurs"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_tls:0
@@ -171,12 +173,12 @@ msgstr ""
 #. module: auth_ldap
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur : Code EAN non valide"
 
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_binddn:0
diff --git a/addons/auth_ldap/i18n/zh_CN.po b/addons/auth_ldap/i18n/zh_CN.po
index ae4574e298f..3cd6d465fa5 100644
--- a/addons/auth_ldap/i18n/zh_CN.po
+++ b/addons/auth_ldap/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-08 03:35+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 07:07+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: auth_ldap
 #: constraint:res.company:0
@@ -30,7 +30,7 @@ msgstr "选择的用户组不在这用允许的用户组"
 #. module: auth_ldap
 #: field:res.company.ldap,user:0
 msgid "Template User"
-msgstr ""
+msgstr "用户模版"
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_tls:0
@@ -71,7 +71,7 @@ msgstr "LDAP 服务器端口"
 msgid ""
 "Automatically create local user accounts for new users authenticating via "
 "LDAP"
-msgstr ""
+msgstr "通过LDAP，为新用户自动创建本地用户账户。"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_base:0
@@ -96,7 +96,7 @@ msgstr "LDAP 密码"
 #. module: auth_ldap
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID必须是每个提供者唯一的"
 
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_company
@@ -116,7 +116,7 @@ msgstr "res.company.ldap"
 #. module: auth_ldap
 #: help:res.company.ldap,user:0
 msgid "User to copy when creating new users"
-msgstr ""
+msgstr "当创建新用户时，复制用户"
 
 #. module: auth_ldap
 #: field:res.company.ldap,ldap_tls:0
@@ -164,12 +164,12 @@ msgstr "LDAP 服务器上的用户帐号密码，用于查询该目录服务。"
 #. module: auth_ldap
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: auth_ldap
 #: model:ir.model,name:auth_ldap.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: auth_ldap
 #: help:res.company.ldap,ldap_binddn:0
diff --git a/addons/auth_oauth/i18n/zh_CN.po b/addons/auth_oauth/i18n/zh_CN.po
new file mode 100644
index 00000000000..f8c15e694f9
--- /dev/null
+++ b/addons/auth_oauth/i18n/zh_CN.po
@@ -0,0 +1,150 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 14:27+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,validation_endpoint:0
+msgid "Validation URL"
+msgstr "验证  URL"
+
+#. module: auth_oauth
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "两个用户不能使用相同的用户名！"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,auth_endpoint:0
+msgid "Authentication URL"
+msgstr "身份验证URL"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: auth_oauth
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的公司不属于此用户允许访问的公司。"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,scope:0
+msgid "Scope"
+msgstr "作用域"
+
+#. module: auth_oauth
+#: field:res.users,oauth_provider_id:0
+msgid "OAuth Provider"
+msgstr "OAuth Provider"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,css_class:0
+msgid "CSS class"
+msgstr "CSS class"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,body:0
+msgid "Body"
+msgstr "正文"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_res_users
+msgid "Users"
+msgstr "用户"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,sequence:0
+msgid "unknown"
+msgstr "未知"
+
+#. module: auth_oauth
+#: field:res.users,oauth_access_token:0
+msgid "OAuth Access Token"
+msgstr "OAuth  访问令牌"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,client_id:0
+#: field:base.config.settings,auth_oauth_facebook_client_id:0
+#: field:base.config.settings,auth_oauth_google_client_id:0
+msgid "Client ID"
+msgstr "Client ID"
+
+#. module: auth_oauth
+#: model:ir.ui.menu,name:auth_oauth.menu_oauth_providers
+msgid "OAuth Providers"
+msgstr "OAuth Providers"
+
+#. module: auth_oauth
+#: model:ir.model,name:auth_oauth.model_auth_oauth_provider
+msgid "OAuth2 provider"
+msgstr "OAuth2 provider"
+
+#. module: auth_oauth
+#: field:res.users,oauth_uid:0
+msgid "OAuth User ID"
+msgstr "OAuth User ID"
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_facebook_enabled:0
+msgid "Allow users to sign in with Facebook"
+msgstr "允许用户用Facebook登录"
+
+#. module: auth_oauth
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者（ provider ）唯一的"
+
+#. module: auth_oauth
+#: help:res.users,oauth_uid:0
+msgid "Oauth Provider user_id"
+msgstr "Oauth Provider user_id"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,data_endpoint:0
+msgid "Data URL"
+msgstr "数据URL"
+
+#. module: auth_oauth
+#: view:auth.oauth.provider:0
+msgid "arch"
+msgstr "arch"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,name:0
+msgid "Provider name"
+msgstr "Provider 名称"
+
+#. module: auth_oauth
+#: model:ir.actions.act_window,name:auth_oauth.action_oauth_provider
+msgid "Providers"
+msgstr "Providers"
+
+#. module: auth_oauth
+#: field:base.config.settings,auth_oauth_google_enabled:0
+msgid "Allow users to sign in with Google"
+msgstr "允许用户通过google登录"
+
+#. module: auth_oauth
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的(EAN)条码"
+
+#. module: auth_oauth
+#: field:auth.oauth.provider,enabled:0
+msgid "Allowed"
+msgstr "允许"
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index fdf7baf607c..c24dab3d55a 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -36,6 +36,9 @@ openerp.auth_oauth = function(instance) {
             ev.preventDefault();
             var index = $(ev.target).data('index');
             var provider = this.oauth_providers[index];
+            return this.do_oauth_sign_in(provider);
+        },
+        do_oauth_sign_in: function(provider) {
             var return_url = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
             if (instance.session.debug) {
                 return_url += '?debug';
diff --git a/addons/auth_reset_password/__openerp__.py b/addons/auth_reset_password/__openerp__.py
index e620d515fa1..2c5b61bf378 100644
--- a/addons/auth_reset_password/__openerp__.py
+++ b/addons/auth_reset_password/__openerp__.py
@@ -22,8 +22,11 @@
 {
     'name': 'Reset Password',
     'description': """
+Reset Password
+==============
+
 Allow users to reset their password from the login page.
-========================================================
+Allow administrator to click a button to send a "Reset Password" request to a user.
 """,
     'author': 'OpenERP SA',
     'version': '1.0',
diff --git a/addons/auth_reset_password/i18n/it.po b/addons/auth_reset_password/i18n/it.po
new file mode 100644
index 00000000000..c330056fe66
--- /dev/null
+++ b/addons/auth_reset_password/i18n/it.po
@@ -0,0 +1,74 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 19:58+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you did not ask for a password reset, you can safely ignore this "
+"email.</p>"
+msgstr ""
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Non è possibile avere due utenti con lo stesso login!"
+
+#. module: auth_reset_password
+#: model:ir.model,name:auth_reset_password.model_res_users
+msgid "Users"
+msgstr "Utenti"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "il UID OAuth deve essere unico per provider"
+
+#. module: auth_reset_password
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Reimposta Password"
+
+#. module: auth_reset_password
+#: model:email.template,subject:auth_reset_password.reset_password_email
+msgid "Password reset"
+msgstr "Ripristino password"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "Errore: codice EAN non valido"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "L'azienda scelta non è fra le aziende abilitate per questo utente"
+
+#. module: auth_reset_password
+#. openerp-web
+#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
+#, python-format
+msgid "Reset password"
+msgstr "Reimposta password"
diff --git a/addons/auth_reset_password/i18n/nl.po b/addons/auth_reset_password/i18n/nl.po
new file mode 100644
index 00000000000..501b9abae97
--- /dev/null
+++ b/addons/auth_reset_password/i18n/nl.po
@@ -0,0 +1,74 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:12+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you did not ask for a password reset, you can safely ignore this "
+"email.</p>"
+msgstr ""
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
+
+#. module: auth_reset_password
+#: model:ir.model,name:auth_reset_password.model_res_users
+msgid "Users"
+msgstr "Gebruikers"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID moet uniek zijn per provider"
+
+#. module: auth_reset_password
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "Stel wachtwoord opnieuw in"
+
+#. module: auth_reset_password
+#: model:email.template,subject:auth_reset_password.reset_password_email
+msgid "Password reset"
+msgstr "Reset wachtwoord"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "Fout: Ongeldige EAN-code"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Het gekozen bedrijf is geen toegestaan bedrijf voor deze gebruiker"
+
+#. module: auth_reset_password
+#. openerp-web
+#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
+#, python-format
+msgid "Reset password"
+msgstr "Reset wachtwoord"
diff --git a/addons/auth_reset_password/i18n/zh_CN.po b/addons/auth_reset_password/i18n/zh_CN.po
new file mode 100644
index 00000000000..ee06973b4c6
--- /dev/null
+++ b/addons/auth_reset_password/i18n/zh_CN.po
@@ -0,0 +1,78 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 07:14+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_reset_password
+#: model:email.template,body_html:auth_reset_password.reset_password_email
+msgid ""
+"\n"
+"<p>A password reset was requested for the OpenERP account linked to this "
+"email.</p>\n"
+"\n"
+"<p>You may change your password following <a "
+"href=\"${object.signup_url}\">this link</a>.</p>\n"
+"\n"
+"<p>Note: If you did not ask for a password reset, you can safely ignore this "
+"email.</p>"
+msgstr ""
+"\n"
+"一个关联到这个Email地址的Openerp帐号请求复位密码。\n"
+"你可以修改你的密码通过下面这个链接  <a href=\"${object.signup_url}\">。\n"
+"提醒：如果你没请求复位密码，请忽略这封邮件。"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "两个用户不能使用相同的用户名！"
+
+#. module: auth_reset_password
+#: model:ir.model,name:auth_reset_password.model_res_users
+msgid "Users"
+msgstr "用户"
+
+#. module: auth_reset_password
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者唯一的"
+
+#. module: auth_reset_password
+#: view:res.users:0
+msgid "Reset Password"
+msgstr "重置密码"
+
+#. module: auth_reset_password
+#: model:email.template,subject:auth_reset_password.reset_password_email
+msgid "Password reset"
+msgstr "重置密码"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的(EAN)条码"
+
+#. module: auth_reset_password
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的公司不属于此用户允许访问的公司。"
+
+#. module: auth_reset_password
+#. openerp-web
+#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7
+#, python-format
+msgid "Reset password"
+msgstr "重设密码"
diff --git a/addons/auth_reset_password/res_users.py b/addons/auth_reset_password/res_users.py
index b1039031812..cfac20c76f9 100644
--- a/addons/auth_reset_password/res_users.py
+++ b/addons/auth_reset_password/res_users.py
@@ -21,6 +21,7 @@
 
 from openerp.osv import osv, fields
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.translate import _
 
 from datetime import datetime, timedelta
 
@@ -54,6 +55,8 @@ class res_users(osv.osv):
         template = self.pool.get('ir.model.data').get_object(cr, uid, 'auth_reset_password', 'reset_password_email')
         assert template._name == 'email.template'
         for user in self.browse(cr, uid, ids, context):
+            if not user.email:
+                raise osv.except_osv(_("Cannot send email: user has no email address."), user.name)
             self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, context=context)
 
         return True
diff --git a/addons/auth_signup/i18n/nl.po b/addons/auth_signup/i18n/nl.po
new file mode 100644
index 00000000000..2a418b068a9
--- /dev/null
+++ b/addons/auth_signup/i18n/nl.po
@@ -0,0 +1,171 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:29+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr "Toestaan dat externe gebruikers inloggen"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:15
+#, python-format
+msgid "Confirm Password"
+msgstr "Bevestig wachtwoord"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr ""
+
+#. module: auth_signup
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Het gekozen bedrijf is geen toegestaan bedrijf voor deze gebruiker"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
+#, python-format
+msgid "Sign Up"
+msgstr "Aanmelden"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr "Nieuw"
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr "Gebruikers"
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr "URL voor aanmelden"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:20
+#, python-format
+msgid "Sign in"
+msgstr "Aanmelden"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+msgstr "Actief"
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:11
+#, python-format
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:7
+#, python-format
+msgid "Name"
+msgstr "Naam"
+
+#. module: auth_signup
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID moet uniek zijn per provider"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username (Email)"
+msgstr ""
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr ""
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
+#, python-format
+msgid "Log in"
+msgstr "Login"
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr ""
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr ""
+
+#. module: auth_signup
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+"Fout! Het is niet mogelijk om recursieve geassocieerde leden te maken"
+
+#. module: auth_signup
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
+#, python-format
+msgid "Back to Login"
+msgstr "Terug naar login"
+
+#. module: auth_signup
+#: constraint:res.partner:0
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "Fout: Ongeldige EAN-code"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr ""
diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po
new file mode 100644
index 00000000000..20b4ca05e9c
--- /dev/null
+++ b/addons/auth_signup/i18n/zh_CN.po
@@ -0,0 +1,170 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 16:52+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_uninvited:0
+msgid "Allow external users to sign up"
+msgstr "允许外部用户登录"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:15
+#, python-format
+msgid "Confirm Password"
+msgstr "确认密码"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: auth_signup
+#: field:base.config.settings,auth_signup_template_user_id:0
+msgid "Template user for new users created through signup"
+msgstr "用作通过注册创建的新用户的模版"
+
+#. module: auth_signup
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "选择的公司不属于此用户允许访问的公司。"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23
+#, python-format
+msgid "Sign Up"
+msgstr "注册"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "New"
+msgstr "新建"
+
+#. module: auth_signup
+#: field:res.users,state:0
+msgid "Status"
+msgstr "状态"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_users
+msgid "Users"
+msgstr "用户"
+
+#. module: auth_signup
+#: field:res.partner,signup_url:0
+msgid "Signup URL"
+msgstr "注册 URL"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:20
+#, python-format
+msgid "Sign in"
+msgstr "登录"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Active"
+msgstr "启用"
+
+#. module: auth_signup
+#: help:base.config.settings,auth_signup_uninvited:0
+msgid "If unchecked, only invited users may sign up"
+msgstr "如果不选中，只有被邀请用户方可注册。"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:11
+#, python-format
+msgid "Username"
+msgstr "用户名"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:7
+#, python-format
+msgid "Name"
+msgstr "姓名"
+
+#. module: auth_signup
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者（ provider ）唯一的"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
+#, python-format
+msgid "Username (Email)"
+msgstr "用户名(Email)"
+
+#. module: auth_signup
+#: field:res.partner,signup_expiration:0
+msgid "Signup Expiration"
+msgstr "注册过期"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:19
+#, python-format
+msgid "Log in"
+msgstr "登录"
+
+#. module: auth_signup
+#: field:res.partner,signup_valid:0
+msgid "Signup Token is Valid"
+msgstr "注册令牌（ Token  ）是有效的"
+
+#. module: auth_signup
+#: selection:res.users,state:0
+msgid "Resetting Password"
+msgstr "复位密码"
+
+#. module: auth_signup
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "错误，您不能创建循环引用的会员用户"
+
+#. module: auth_signup
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "两个用户不能使用相同的用户名！"
+
+#. module: auth_signup
+#. openerp-web
+#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24
+#, python-format
+msgid "Back to Login"
+msgstr "返回登录页面"
+
+#. module: auth_signup
+#: constraint:res.partner:0
+#: constraint:res.users:0
+msgid "Error: Invalid ean code"
+msgstr "错误：无效的(EAN)条码"
+
+#. module: auth_signup
+#: model:ir.model,name:auth_signup.model_res_partner
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: auth_signup
+#: field:res.partner,signup_token:0
+msgid "Signup Token"
+msgstr "注册令牌（ Token ）"
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index a6b401a4c7b..241c2406d56 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -52,6 +52,8 @@ openerp.auth_signup = function(instance) {
             if (result.token) {
                 // switch to signup mode, set user name and login
                 this.$el.addClass("oe_login_signup");
+                self.$(".oe_signup_show").show();
+                self.$(".oe_signup_hide").hide();
                 this.$("form input[name=name]").val(result.name).attr("readonly", "readonly");
                 if (result.login) {
                     this.$("form input[name=login]").val(result.login).attr("readonly", "readonly");
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index 3d3f67ffb75..a50f39dcf0d 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.po
@@ -8,26 +8,26 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-10-25 16:32+0000\n"
+"PO-Revision-Date: 2012-11-30 04:40+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_followers:0
 msgid "Set Followers"
-msgstr ""
+msgstr "设置关注者"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid ""
 "The rule uses the AND operator. The model must match all non-empty fields so "
 "that the rule executes the action  described in the 'Actions' tab."
-msgstr ""
+msgstr "这条规则用了AND 操作符。这个模型必须匹配所有非空字段，这样这条规则执行在“动作”便签里说明的动作"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -42,7 +42,7 @@ msgstr "负责人"
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_ir_actions_server
 msgid "ir.actions.server"
-msgstr ""
+msgstr "ir.actions.server"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -71,7 +71,7 @@ msgstr "触发日期后的延迟"
 msgid ""
 "If the active field is set to False, it will allow you to hide the rule "
 "without removing it."
-msgstr "如果有效不勾选，你可以不需删除这个规则而隐藏它"
+msgstr "如果有效字段不选择，你可以隐藏它而无需删除。"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -125,6 +125,8 @@ msgid ""
 "Define Server actions.\n"
 "eg:Email Reminders, Call Object Service, etc.."
 msgstr ""
+"定义服务器动作。\n"
+"例如：Emaik 提醒，调用Object Service，等"
 
 #. module: base_action_rule
 #: help:base.action.rule,trg_date_range:0
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 8590bcb8b49..84c03d68dbd 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -5,7 +5,7 @@
     <!-- Read/Unread actions -->
 
     <record id="actions_server_crm_meeting_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
+        <field name="name">CRM Meeting: Mark read</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>
@@ -23,7 +23,7 @@
     </record>
 
     <record id="actions_server_crm_meeting_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
+        <field name="name">CRM Meeting: Mark unread</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>
diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/base_calendar/i18n/zh_CN.po
index 4fb5c3afbca..8d5d3f545f1 100644
--- a/addons/base_calendar/i18n/zh_CN.po
+++ b/addons/base_calendar/i18n/zh_CN.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 17:39+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 16:50+0000\n"
+"Last-Translator: Joshua Jan(SHINEIT) <popkar77@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:27+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event starts"
-msgstr "事件开始时"
+msgstr "活动开始"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "My Events"
-msgstr "我的事件"
+msgstr "我的活动"
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
@@ -40,14 +40,14 @@ msgstr "这属性定义循环日程的日期/时间异常列表。"
 #. module: base_calendar
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr "用户无权操作所选择公司数据"
+msgstr "选择的公司不属于此用户允许访问的公司。"
 
 #. module: base_calendar
 #: field:calendar.event,we:0
 #: field:calendar.todo,we:0
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr "周三"
+msgstr "星期三"
 
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
@@ -64,13 +64,13 @@ msgstr "定期会议"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet5
 msgid "Feedback Meeting"
-msgstr ""
+msgstr "会议反馈"
 
 #. module: base_calendar
 #: code:addons/base_calendar/crm_meeting.py:117
 #, python-format
 msgid "Meeting <b>completed</b>."
-msgstr ""
+msgstr "会议<b>完成</b>."
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
@@ -83,7 +83,7 @@ msgstr "提醒"
 #: selection:calendar.todo,week_list:0
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr "周日"
+msgstr "星期天"
 
 #. module: base_calendar
 #: field:calendar.attendee,role:0
@@ -147,14 +147,14 @@ msgstr "指定类型的邀请"
 #: view:crm.meeting:0
 #: field:crm.meeting,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: base_calendar
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr "周五"
+msgstr "星期五"
 
 #. module: base_calendar
 #: field:calendar.event,allday:0
@@ -182,12 +182,12 @@ msgstr "空闲"
 #. module: base_calendar
 #: help:crm.meeting,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr "标明是否要求答复赞成"
+msgstr "标明是否要求答复"
 
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
@@ -209,7 +209,7 @@ msgstr "事件"
 #: field:calendar.todo,tu:0
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "周二"
+msgstr "星期二"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -222,7 +222,7 @@ msgstr "第三个"
 #: selection:calendar.alarm,trigger_related:0
 #: selection:res.alarm,trigger_related:0
 msgid "The event ends"
-msgstr "这事件结束时"
+msgstr "这活动结束时"
 
 #. module: base_calendar
 #: selection:calendar.event,byday:0
@@ -234,12 +234,12 @@ msgstr "最近"
 #. module: base_calendar
 #: help:crm.meeting,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: base_calendar
 #: field:crm.meeting,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -266,7 +266,7 @@ msgstr "主席"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "我的会议"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
@@ -303,12 +303,12 @@ msgstr ""
 #. module: base_calendar
 #: field:crm.meeting,name:0
 msgid "Meeting Subject"
-msgstr ""
+msgstr "会议主题"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "End of Recurrence"
-msgstr ""
+msgstr "循环结束"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -329,7 +329,7 @@ msgstr "选择重复会议的日子"
 #: view:crm.meeting:0
 #: model:ir.actions.act_window,name:base_calendar.action_crm_meeting
 msgid "Meetings"
-msgstr ""
+msgstr "会议"
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
@@ -342,19 +342,19 @@ msgstr "循环日期"
 #: field:calendar.alarm,event_end_date:0
 #: field:calendar.attendee,event_end_date:0
 msgid "Event End Date"
-msgstr "事件结束日期"
+msgstr "活动结束日期"
 
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr "可参与"
+msgstr "可选择参与"
 
 #. module: base_calendar
 #: help:crm.meeting,message_summary:0
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:388
diff --git a/addons/base_crypt/i18n/it.po b/addons/base_crypt/i18n/it.po
index 1425a8c7924..e82a13db711 100644
--- a/addons/base_crypt/i18n/it.po
+++ b/addons/base_crypt/i18n/it.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-28 19:47+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_crypt
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Errore: codice EAN non valido"
 
 #. module: base_crypt
 #: constraint:res.users:0
@@ -30,12 +30,12 @@ msgstr "L'azienda scelta non è fra le aziende abilitate per questo utente"
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "il UID OAuth deve essere unico per provider"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
diff --git a/addons/base_crypt/i18n/zh_CN.po b/addons/base_crypt/i18n/zh_CN.po
index 200f04f2971..25cb55361b9 100644
--- a/addons/base_crypt/i18n/zh_CN.po
+++ b/addons/base_crypt/i18n/zh_CN.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-06-22 08:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-28 06:30+0000\n"
+"Last-Translator: mrshelly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_crypt
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: base_crypt
 #: constraint:res.users:0
@@ -30,17 +30,17 @@ msgstr "用户无权操作所选择公司数据"
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID必须是每个提供者唯一的"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "你不能同时登录两个用户！"
+msgstr "两个用户不能使用相同的用户名！"
 
 #, python-format
 #~ msgid "Error"
diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py
index c831ffd229d..b926c6b2782 100644
--- a/addons/base_import/controllers.py
+++ b/addons/base_import/controllers.py
@@ -14,7 +14,7 @@ class ImportController(openerp.addons.web.http.Controller):
             'file': file.read(),
             'file_name': file.filename,
             'file_type': file.content_type,
-        }, req.session.eval_context(req.context))
+        }, req.context)
 
         return 'window.top.%s(%s)' % (
             jsonp, simplejson.dumps({'result': written}))
diff --git a/addons/base_import/i18n/fr.po b/addons/base_import/i18n/fr.po
new file mode 100644
index 00000000000..520af932a87
--- /dev/null
+++ b/addons/base_import/i18n/fr.po
@@ -0,0 +1,1164 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:28+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:420
+#, python-format
+msgid "Get all possible values"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:71
+#, python-format
+msgid "Need to import data from an other application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:163
+#, python-format
+msgid ""
+"When you use External IDs, you can import CSV files \n"
+"                        with the \"External ID\" column to define the "
+"External \n"
+"                        ID of each record you import. Then, you will be able "
+"\n"
+"                        to make a reference to that record with columns like "
+"\n"
+"                        \"Field/External ID\". The following two CSV files "
+"give \n"
+"                        you an example for Products and their Categories."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:271
+#, python-format
+msgid ""
+"How to export/import different tables from an SQL \n"
+"                        application to OpenERP?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:310
+#, python-format
+msgid "Relation Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:142
+#, python-format
+msgid ""
+"Country/Database ID: the unique OpenERP ID for a \n"
+"                        record, defined by the ID postgresql column"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:155
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/Database ID: You should rarely use this \n"
+"                        notation. It's mostly used by developers as it's "
+"main \n"
+"                        advantage is to never have conflicts (you may have \n"
+"                        several records with the same name, but they always "
+"\n"
+"                        have a unique Database ID)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:146
+#, python-format
+msgid ""
+"For the country \n"
+"                        Belgium, you can use one of these 3 ways to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:303
+#, python-format
+msgid "company_1,Bigees,True"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o
+msgid "base_import.tests.models.m2o"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:297
+#, python-format
+msgid ""
+"copy \n"
+"                        (select 'company_'||id as \"External "
+"ID\",company_name \n"
+"                        as \"Name\",'True' as \"Is a Company\" from "
+"companies) TO \n"
+"                        '/tmp/company.csv' with CSV HEADER;"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:206
+#, python-format
+msgid "CSV file for Manufacturer, Retailer"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:160
+#, python-format
+msgid ""
+"Use \n"
+"                        Country/External ID: Use External ID when you import "
+"\n"
+"                        data from a third party application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:316
+#, python-format
+msgid "person_1,Fabien,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:351
+#, python-format
+msgid "Don't Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:24
+#, python-format
+msgid "Select the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:100
+#, python-format
+msgid ""
+"Note that if your CSV file \n"
+"                        has a tabulation as separator, OpenERP will not \n"
+"                        detect the separations. You will need to change the "
+"\n"
+"                        file format options in your spreadsheet application. "
+"\n"
+"                        See the following question."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:141
+#, python-format
+msgid "Country: the name or code of the country"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m_child
+msgid "base_import.tests.models.o2m.child"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:239
+#, python-format
+msgid "Can I import several times the same record?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:15
+#, python-format
+msgid "Validate"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:55
+#, python-format
+msgid "Map your data to OpenERP"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:153
+#, python-format
+msgid ""
+"Use Country: This is \n"
+"                        the easiest way when your data come from CSV files \n"
+"                        that have been created manually."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:127
+#, python-format
+msgid ""
+"What's the difference between Database ID and \n"
+"                        External ID?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:138
+#, python-format
+msgid ""
+"For example, to \n"
+"                        reference the country of a contact, OpenERP proposes "
+"\n"
+"                        you 3 different fields to import:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:175
+#, python-format
+msgid "What can I do if I have multiple matches for a field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:302
+#, python-format
+msgid "External ID,Name,Is a Company"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,somevalue:0
+msgid "Some Value"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:231
+#, python-format
+msgid ""
+"The following CSV file shows how to import \n"
+"                        suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:109
+#, python-format
+msgid ""
+"How can I change the CSV file format options when \n"
+"                        saving in my spreadsheet application?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:320
+#, python-format
+msgid ""
+"As you can see in this file, Fabien and Laurence \n"
+"                        are working for the Bigees company (company_1) and \n"
+"                        Eric is working for the Organi company. The relation "
+"\n"
+"                        between persons and companies is done using the \n"
+"                        External ID of the companies. We had to prefix the \n"
+"                        \"External ID\" by the name of the table to avoid a "
+"\n"
+"                        conflict of ID between persons and companies "
+"(person_1 \n"
+"                        and company_1 who shared the same ID 1 in the "
+"orignial \n"
+"                        database)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:308
+#, python-format
+msgid ""
+"copy (select \n"
+"                        'person_'||id as \"External ID\",person_name as \n"
+"                        \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+"                         as \"Related Company/External ID\" from persons) TO "
+"\n"
+"                        '/tmp/person.csv' with CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid "Country: Belgium"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
+msgid "base_import.tests.models.char.stillreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:314
+#, python-format
+msgid ""
+"External ID,Name,Is a \n"
+"                        Company,Related Company/External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:233
+#, python-format
+msgid "Suppliers and their respective contacts"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:179
+#, python-format
+msgid ""
+"If for example you have two product categories \n"
+"                        with the child name \"Sellable\" (ie. \"Misc. \n"
+"                        Products/Sellable\" & \"Other Products/Sellable\"),\n"
+"                        your validation is halted but you may still import \n"
+"                        your data. However, we recommend you do not import "
+"the \n"
+"                        data because they will all be linked to the first \n"
+"                        'Sellable' category found in the Product Category "
+"list \n"
+"                        (\"Misc. Products/Sellable\"). We recommend you "
+"modify \n"
+"                        one of the duplicates' values or your product "
+"category \n"
+"                        hierarchy."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:306
+#, python-format
+msgid ""
+"To create the CSV file for persons, linked to \n"
+"                        companies, we will use the following SQL command in "
+"\n"
+"                        PSQL:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:119
+#, python-format
+msgid ""
+"Microsoft Excel will allow \n"
+"                        you to modify only the encoding when saving \n"
+"                        (in 'Save As' dialog box > click 'Tools' dropdown \n"
+"                        list > Encoding tab)."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,othervalue:0
+msgid "Other Variable"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid ""
+"will also be used to update the original\n"
+"                        import if you need to re-import modified data\n"
+"                        later, it's thus good practice to specify it\n"
+"                        whenever possible"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ""
+"file to import. If you need a sample importable file, you\n"
+"            can use the export tool to generate one."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:148
+#, python-format
+msgid ""
+"Country/Database \n"
+"                        ID: 21"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char
+msgid "base_import.tests.models.char"
+msgstr ""
+
+#. module: base_import
+#: help:base_import.import,file:0
+msgid "File to check and/or import, raw binary (not base64)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:230
+#, python-format
+msgid "Purchase orders with their respective purchase order lines"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:60
+#, python-format
+msgid ""
+"If the file contains\n"
+"                the column names, OpenERP can try auto-detecting the\n"
+"                field corresponding to the column. This makes imports\n"
+"                simpler especially when the file has many columns."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:26
+#, python-format
+msgid ".CSV"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid ""
+". The issue is\n"
+"            usually an incorrect file encoding."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
+msgid "base_import.tests.models.m2o.required"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid ""
+"How can I import a one2many relationship (e.g. several \n"
+"                        Order Lines of a Sale Order)?"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
+msgid "base_import.tests.models.char.noreadonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:113
+#, python-format
+msgid ""
+"If you edit and save CSV files in speadsheet \n"
+"                        applications, your computer's regional settings will "
+"\n"
+"                        be applied for the separator and delimiter. \n"
+"                        We suggest you use OpenOffice or LibreOffice Calc \n"
+"                        as they will allow you to modify all three options \n"
+"                        (in 'Save As' dialog box > Check the box 'Edit "
+"filter \n"
+"                        settings' > Save)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:30
+#, python-format
+msgid "CSV File:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_preview
+msgid "base_import.tests.models.preview"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_required
+msgid "base_import.tests.models.char.required"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:112
+#, python-format
+msgid "Database ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:313
+#, python-format
+msgid "It will produce the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:362
+#, python-format
+msgid "Here is the start of the file we could not import:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_type:0
+msgid "File Type"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_import
+msgid "base_import.import"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_o2m
+msgid "base_import.tests.models.o2m"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:360
+#, python-format
+msgid "Import preview failed due to:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:144
+#, python-format
+msgid ""
+"Country/External ID: the ID of this record \n"
+"                        referenced in another application (or the .XML file "
+"\n"
+"                        that imported it)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:35
+#, python-format
+msgid "Reload data to check changes."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_readonly
+msgid "base_import.tests.models.char.readonly"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:131
+#, python-format
+msgid ""
+"Some fields define a relationship with another \n"
+"                        object. For example, the country of a contact is a \n"
+"                        link to a record of the 'Country' object. When you \n"
+"                        want to import such fields, OpenERP will have to \n"
+"                        recreate links between the different records. \n"
+"                        To help you import such fields, OpenERP provides 3 \n"
+"                        mechanisms. You must use one and only one mechanism "
+"\n"
+"                        per field you want to import."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:201
+#, python-format
+msgid ""
+"The tags should be separated by a comma without any \n"
+"                        spacing. For example, if you want you customer to be "
+"\n"
+"                        lined to both tags 'Manufacturer' and 'Retailer' \n"
+"                        then you will encode it as follow \"Manufacturer,\n"
+"                        Retailer\" in the same column of your CSV file."
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models.py:264
+#, python-format
+msgid "You must configure at least one field to import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:304
+#, python-format
+msgid "company_2,Organi,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:58
+#, python-format
+msgid ""
+"The first row of the\n"
+"                file contains the label of the column"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_char_states
+msgid "base_import.tests.models.char.states"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:7
+#, python-format
+msgid "Import a CSV File"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:74
+#, python-format
+msgid "Quoting:"
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
+msgid "base_import.tests.models.m2o.required.related"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid ")."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:18
+#: code:addons/base_import/static/src/xml/import.xml:396
+#, python-format
+msgid "Import"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:407
+#, python-format
+msgid "Here are the possible values:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "The"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:227
+#, python-format
+msgid ""
+"A single column was found in the file, this often means the file separator "
+"is incorrect"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:293
+#, python-format
+msgid "dump of such a PostgreSQL database"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:301
+#, python-format
+msgid "This SQL command will create the following CSV file:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:228
+#, python-format
+msgid ""
+"The following CSV file shows how to import purchase \n"
+"                        orders with their respective purchase order lines:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:91
+#, python-format
+msgid ""
+"What can I do when the Import preview table isn't \n"
+"                        displayed correctly?"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.char,value:0
+#: field:base_import.tests.models.char.noreadonly,value:0
+#: field:base_import.tests.models.char.readonly,value:0
+#: field:base_import.tests.models.char.required,value:0
+#: field:base_import.tests.models.char.states,value:0
+#: field:base_import.tests.models.char.stillreadonly,value:0
+#: field:base_import.tests.models.m2o,value:0
+#: field:base_import.tests.models.m2o.related,value:0
+#: field:base_import.tests.models.m2o.required,value:0
+#: field:base_import.tests.models.m2o.required.related,value:0
+#: field:base_import.tests.models.o2m,value:0
+#: field:base_import.tests.models.o2m.child,parent_id:0
+#: field:base_import.tests.models.o2m.child,value:0
+msgid "unknown"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:317
+#, python-format
+msgid "person_2,Laurence,False,company_1"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:149
+#, python-format
+msgid "Country/External ID: base.be"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:288
+#, python-format
+msgid ""
+"As an example, suppose you have a SQL database \n"
+"                        with two tables you want to import: companies and \n"
+"                        persons. Each person belong to one company, so you \n"
+"                        will have to recreate the link between a person and "
+"\n"
+"                        the company he work for. (If you want to test this \n"
+"                        example, here is a"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:396
+#, python-format
+msgid "(%d more)"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:227
+#, python-format
+msgid "File for some Quotations"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:72
+#, python-format
+msgid "Encoding:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:280
+#, python-format
+msgid ""
+"To manage relations between tables, \n"
+"                        you can use the \"External ID\" facilities of "
+"OpenERP. \n"
+"                        The \"External ID\" of a record is the unique "
+"identifier \n"
+"                        of this record in another application. This "
+"\"External \n"
+"                        ID\" must be unique accoss all the records of all \n"
+"                        objects, so it's a good practice to prefix this \n"
+"                        \"External ID\" with the name of the application or "
+"\n"
+"                        table. (like 'company_1', 'person_1' instead of '1')"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:295
+#, python-format
+msgid ""
+"We will first export all companies and their \n"
+"                        \"External ID\". In PSQL, write the following "
+"command:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:373
+#, python-format
+msgid "Everything seems valid."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:188
+#, python-format
+msgid ""
+"However if you do not wish to change your \n"
+"                        configuration of product categories, we recommend "
+"you \n"
+"                        use make use of the external ID for this field \n"
+"                        'Category'."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:390
+#, python-format
+msgid "at row %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:197
+#, python-format
+msgid ""
+"How can I import a many2many relationship field \n"
+"                        (e.g. a customer that has multiple tags)?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "XXX/ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:275
+#, python-format
+msgid ""
+"If you need to import data from different tables, \n"
+"                        you will have to recreate relations between records "
+"\n"
+"                        belonging to different tables. (e.g. if you import \n"
+"                        companies and persons, you will have to recreate the "
+"\n"
+"                        link between each person and the company they work \n"
+"                        for)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:150
+#, python-format
+msgid ""
+"According to your need, you should use \n"
+"                        one of these 3 ways to reference records in "
+"relations. \n"
+"                        Here is when you should use one or the other, \n"
+"                        according to your need:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:319
+#, python-format
+msgid "person_4,Ramsy,False,company_3"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:261
+#, python-format
+msgid ""
+"If you do not set all fields in your CSV file, \n"
+"                        OpenERP will assign the default value for every non "
+"\n"
+"                        defined fields. But if you\n"
+"                        set fields with empty values in your CSV file, "
+"OpenERP \n"
+"                        will set the EMPTY value in the field, instead of \n"
+"                        assigning the default value."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:20
+#, python-format
+msgid "Cancel"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:257
+#, python-format
+msgid ""
+"What happens if I do not provide a value for a \n"
+"                        specific field?"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:68
+#, python-format
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:305
+#, python-format
+msgid "company_3,Boum,True"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:249
+#, python-format
+msgid ""
+"This feature \n"
+"                        allows you to use the Import/Export tool of OpenERP "
+"to \n"
+"                        modify a batch of records in your favorite "
+"spreadsheet \n"
+"                        application."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#, python-format
+msgid ""
+"column in OpenERP. When you\n"
+"                        import an other record that links to the first\n"
+"                        one, use"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:242
+#, python-format
+msgid ""
+"If you import a file that contains one of the \n"
+"                        column \"External ID\" or \"Database ID\", records "
+"that \n"
+"                        have already been imported will be modified instead "
+"of \n"
+"                        being created. This is very usefull as it allows you "
+"\n"
+"                        to import several times the same CSV file while "
+"having \n"
+"                        made some changes in between two imports. OpenERP "
+"will \n"
+"                        take care of creating or modifying each record \n"
+"                        depending if it's new or not."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:169
+#, python-format
+msgid "CSV file for categories"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:309
+#, python-format
+msgid "Normal Fields"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:74
+#, python-format
+msgid ""
+"In order to re-create relationships between\n"
+"                        different records, you should use the unique\n"
+"                        identifier from the original application and\n"
+"                        map it to the"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:170
+#, python-format
+msgid "CSV file for Products"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:216
+#, python-format
+msgid ""
+"If you want to import sales order having several \n"
+"                        order lines; for each order line, you need to "
+"reserve \n"
+"                        a specific row in the CSV file. The first order line "
+"\n"
+"                        will be imported on the same row as the information "
+"\n"
+"                        relative to order. Any additional lines will need an "
+"\n"
+"                        addtional row that does not have any information in "
+"\n"
+"                        the fields relative to the order."
+msgstr ""
+
+#. module: base_import
+#: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
+msgid "base_import.tests.models.m2o.related"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.tests.models.preview,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:80
+#, python-format
+msgid "to the original unique identifier."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:318
+#, python-format
+msgid "person_3,Eric,False,company_2"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,res_model:0
+msgid "Model"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:329
+#, python-format
+msgid ""
+"The two files produced are ready to be imported in \n"
+"                        OpenERP without any modifications. After having \n"
+"                        imported these two CSV files, you will have 4 "
+"contacts \n"
+"                        and 3 companies. (the firsts two contacts are linked "
+"\n"
+"                        to the first company). You must first import the \n"
+"                        companies and then the persons."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:95
+#, python-format
+msgid ""
+"By default the Import preview is set on commas as \n"
+"                        field separators and quotation marks as text \n"
+"                        delimiters. If your csv file does not have these \n"
+"                        settings, you can modify the File Format Options \n"
+"                        (displayed under the Browse CSV file bar after you \n"
+"                        select your file)."
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:73
+#, python-format
+msgid "Separator:"
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file_name:0
+msgid "File Name"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/models.py:80
+#: code:addons/base_import/models.py:111
+#: code:addons/base_import/static/src/xml/import.xml:77
+#: code:addons/base_import/static/src/xml/import.xml:82
+#, python-format
+msgid "External ID"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:39
+#, python-format
+msgid "File Format Options…"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/import.js:392
+#, python-format
+msgid "between rows %d and %d"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:19
+#, python-format
+msgid "or"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:223
+#, python-format
+msgid ""
+"As an example, here is \n"
+"                        purchase.order_functional_error_line_cant_adpat.CSV "
+"\n"
+"                        file of some quotations you can import, based on "
+"demo \n"
+"                        data."
+msgstr ""
+
+#. module: base_import
+#: field:base_import.import,file:0
+msgid "File"
+msgstr ""
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 981a8d63301..514223d74e0 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-05-10 18:17+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 19:53+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -180,7 +180,7 @@ msgstr "Annulla"
 #. module: base_report_designer
 #: view:base.report.sxw:0
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index c834e408d1d..3bca1c04209 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -7,20 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-07-28 19:07+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-11-29 20:10+0000\n"
+"Last-Translator: Luiz Fernando M.França <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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Emails Integration"
-msgstr ""
+msgstr "Integração de Emails"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -30,18 +29,18 @@ msgstr "Convidado"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contatos"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_oauth:0
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+msgstr "Use provedores de autenticação externos, como google, facebook, ..."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -64,12 +63,12 @@ msgstr "Membro"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "Acesso ao Portal"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "Autenticação"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -81,7 +80,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "Configurações Gerais"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -91,12 +90,12 @@ msgstr "Doador"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -106,17 +105,17 @@ msgstr "Paciente"
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "Permite a usuários importar dados de arquivos CSV"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "Gerir múltiplas empresas"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give access your customers and suppliers to their documents."
-msgstr ""
+msgstr "Dar acesso a seus clientes e fornecedores aos seus documentos."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -126,12 +125,12 @@ msgstr ""
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Pegar contatos automaticamente do linkedIn"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
 msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "Habilitar pluguin Thunderbird"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -141,22 +140,22 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Customer Features"
-msgstr ""
+msgstr "Características dos clientes"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "Importar / Exportar"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Sale Features"
-msgstr ""
+msgstr "Características de venda"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_outlook:0
 msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "Habilita plug-in Outlook"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -175,7 +174,7 @@ msgstr "Locatário"
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "Compartilhar ou incorporar qualquer tela do OpenERP."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -188,6 +187,8 @@ msgid ""
 "When you create a new contact (person or company), you will be able to load "
 "all the data from LinkedIn (photos, address, etc)."
 msgstr ""
+"Quando você cria um novo contato (pessoa ou empresa), você será capaz de "
+"carregar todos os dados do LinkedIn (fotos, endereço, etc.)"
 
 #. module: base_setup
 #: help:base.config.settings,module_multi_company:0
@@ -196,6 +197,9 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"Trabalhar em ambientes multi-empresa, com acesso de segurança apropriado "
+"entre as empresas.\n"
+"                 Isso instala o módulo multi_company."
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -203,11 +207,13 @@ msgid ""
 "You will find more options in your company details: address for the header "
 "and footer, overdue payments texts, etc."
 msgstr ""
+"Você vai encontrar mais opções em detalhes da sua empresa: endereço para o "
+"cabeçalho e rodapé, textos atraso de pagamentos, etc"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -228,6 +234,7 @@ msgstr "Cliente"
 #: help:base.config.settings,module_auth_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
 msgstr ""
+"Habilita a parte pública do OpenERP, OpenERP torna-se um site público."
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@@ -255,7 +262,7 @@ msgstr "Use uma outra palavra para dizer \"Cliente\""
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "Configurar Vendas"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -272,32 +279,32 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Opções"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer/supplier portal"
-msgstr ""
+msgstr "Ativar o portal do cliente / fornecedor"
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "Permite compartilhar documentos"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "Ativar o portal público"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Configurar servidor de email para saida"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "Integração com redes sociais"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -309,7 +316,7 @@ msgstr "Cancelar"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -320,12 +327,12 @@ msgstr "Especifique a sua Trminologia"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "Configurar dados de sua empresa"
 
 #~ msgid "City"
 #~ msgstr "Cidade"
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 85494807d9c..7fa74452b03 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-10 03:32+0000\n"
+"PO-Revision-Date: 2012-11-28 16:54+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-11-25 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Emails Integration"
-msgstr ""
+msgstr "Email 集成"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -29,18 +29,18 @@ msgstr "访客"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "联系人"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_oauth:0
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
-msgstr ""
+msgstr "使用OpenID登陆(Google, Facebook...)"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -63,24 +63,24 @@ msgstr "会员"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "门户访问"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "身份验证"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "报价和销售订单"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "常规设置"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -90,12 +90,12 @@ msgstr "捐助者"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -105,12 +105,12 @@ msgstr "病人"
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "允许导入CSV数据"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "允许多公司操作"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
@@ -120,17 +120,17 @@ msgstr ""
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "On Mail Client"
-msgstr ""
+msgstr "在邮件客户端"
 
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "自动获取LinkedIn联系人"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
 msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "允许 Thunderbird 插件"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -140,22 +140,22 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Customer Features"
-msgstr ""
+msgstr "客户特性"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "导入/导出"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Sale Features"
-msgstr ""
+msgstr "销售特性"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_outlook:0
 msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "允许 Outlook 插件"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -172,7 +172,7 @@ msgstr "承租人"
 #. module: base_setup
 #: help:base.config.settings,module_share:0
 msgid "Share or embbed any screen of openerp."
-msgstr ""
+msgstr "分享或者嵌入任意Openerp屏幕"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -193,6 +193,8 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"工作在多公司环境，公司之间适当地安全访问\n"
+"               为此安装模块multi_company。"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -204,7 +206,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -224,7 +226,7 @@ msgstr "客户"
 #. module: base_setup
 #: help:base.config.settings,module_auth_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
+msgstr "启用Openerp的公共部分，Openerp成为一个公共的web站点"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@@ -237,6 +239,9 @@ msgid ""
 "                Partner from the selected emails.\n"
 "                This installs the module plugin_thunderbird."
 msgstr ""
+"插件允许把你的email和附件存档到Openerp对象。你能选择一个业务伙伴、或者线索，并 选择邮件存为 .eml 文件 附加到在选中记录的附件中。\n"
+"\n"
+"为此要安装模块 plugin_thunderbird."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -252,7 +257,7 @@ msgstr "称呼客户的另一种方式"
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "销售模块配置"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -265,36 +270,39 @@ msgid ""
 "                email into an OpenERP mail message with attachments.\n"
 "                This installs the module plugin_outlook."
 msgstr ""
+"Outlook 插件允许你把 邮件和它附件添加到你选择对象里。 你能选择一个业务伙伴或者线索 对象，并且把选择的邮件存档到一个带附件的 Openerp "
+"邮件消息中。\n"
+"为此要安装模块plugin_outlook."
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "选项"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer/supplier portal"
-msgstr ""
+msgstr "开启合作伙伴Portal"
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "允许分享单据"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "启用公共门户"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "配置邮箱发件服务器"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "集成社交网络"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -306,7 +314,7 @@ msgstr "取消"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "应用"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -317,12 +325,12 @@ msgstr "指定贵公司所用的术语"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "配置公司信息"
 
 #~ msgid "Report Header"
 #~ msgstr "报表页眉"
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 67c6354fd3b..9858a7fe0cc 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -41,12 +41,10 @@ class base_stage(object):
         """
         if context is None:
             context = {}
-        if not context or not context.get('portal'):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        if hasattr(user, 'partner_address_id') and user.partner_address_id:
-            return user.partner_address_id
-        return user.company_id.partner_id.id
+        if context.get('portal'):
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            return user.partner_id.id
+        return False
 
     def _get_default_email(self, cr, uid, context=None):
         """ Gives default email address for current user
@@ -54,10 +52,10 @@ class base_stage(object):
         """
         if context is None:
             context = {}
-        if not context or not context.get('portal'):
-            return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        return user.email
+        if context.get('portal'):
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+            return user.email
+        return False        
 
     def _get_default_user(self, cr, uid, context=None):
         """ Gives current user id
@@ -65,7 +63,7 @@ class base_stage(object):
         """
         if context is None:
             context = {}
-        if not context or not context.get('portal'):
+        if not context or context.get('portal'):
             return False
         return uid
 
diff --git a/addons/base_status/i18n/fr.po b/addons/base_status/i18n/fr.po
new file mode 100644
index 00000000000..5ec55b0c43d
--- /dev/null
+++ b/addons/base_status/i18n/fr.po
@@ -0,0 +1,91 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 17:43+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "Erreur!"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:333
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been <b>opened</b>."
+msgstr "%s a été <b>ouverte</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:357
+#: code:addons/base_status/base_state.py:220
+#, python-format
+msgid "%s has been <b>renewed</b>."
+msgstr "%s a été <b>renouvelée</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid "Error!"
+msgstr "Erreur!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr ""
+"Vous ne pouvez pas escalader, vous êtes déjà au niveau le plus haut selon la "
+"catégorie de votre équipe de ventes."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:351
+#: code:addons/base_status/base_state.py:214
+#, python-format
+msgid "%s is now <b>pending</b>."
+msgstr "%s est mainetant <b>en attente</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:345
+#, python-format
+msgid "%s has been <b>cancelled</b>."
+msgstr "%s à été <b>annulée</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:208
+#, python-format
+msgid "%s has been <b>canceled</b>."
+msgstr "%s à été <b>annulée</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"vous êtes déjà au niveau le plus haut selon la catégorie de votre équipe de "
+"ventes.\n"
+"Par conséquent vous ne pouvez pas escalder plus haut."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:339
+#: code:addons/base_status/base_state.py:202
+#, python-format
+msgid "%s has been <b>closed</b>."
+msgstr "%s à été <b>fermée</b>."
diff --git a/addons/base_status/i18n/zh_CN.po b/addons/base_status/i18n/zh_CN.po
new file mode 100644
index 00000000000..bfb2e6fcebf
--- /dev/null
+++ b/addons/base_status/i18n/zh_CN.po
@@ -0,0 +1,88 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 07:43+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid "Error !"
+msgstr "错误！"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:333
+#: code:addons/base_status/base_state.py:187
+#, python-format
+msgid "%s has been <b>opened</b>."
+msgstr "%s 已经被 <b>打开</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:357
+#: code:addons/base_status/base_state.py:220
+#, python-format
+msgid "%s has been <b>renewed</b>."
+msgstr "%s 已经被 <b>更新</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid "Error!"
+msgstr "错误!"
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:107
+#, python-format
+msgid ""
+"You can not escalate, you are already at the top level regarding your sales-"
+"team category."
+msgstr "不能上报，你已经在您销售团队类别中的最高级了。"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:351
+#: code:addons/base_status/base_state.py:214
+#, python-format
+msgid "%s is now <b>pending</b>."
+msgstr "%s 现在 <b>待定</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:345
+#, python-format
+msgid "%s has been <b>cancelled</b>."
+msgstr "%s 已经被 <b>取消</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_state.py:208
+#, python-format
+msgid "%s has been <b>canceled</b>."
+msgstr "%s 已经被 <b>取消</b>."
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:215
+#, python-format
+msgid ""
+"You are already at the top level of your sales-team category.\n"
+"Therefore you cannot escalate furthermore."
+msgstr ""
+"你已经在您销售团队类别中的最高级了。\n"
+"因此，你不能再上报了。"
+
+#. module: base_status
+#: code:addons/base_status/base_stage.py:339
+#: code:addons/base_status/base_state.py:202
+#, python-format
+msgid "%s has been <b>closed</b>."
+msgstr "%s 已经被 <b>关闭</b>."
diff --git a/addons/board/controllers.py b/addons/board/controllers.py
index 81557f64fa3..3bdebe1ef26 100644
--- a/addons/board/controllers.py
+++ b/addons/board/controllers.py
@@ -2,7 +2,6 @@
 from xml.etree import ElementTree
 
 import openerp
-from openerp.addons.web import nonliterals
 from openerp.addons.web.controllers.main import load_actions_from_ir_values
 
 class Board(openerp.addons.web.http.Controller):
@@ -11,16 +10,8 @@ class Board(openerp.addons.web.http.Controller):
     @openerp.addons.web.http.jsonrequest
     def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''):
         # FIXME move this method to board.board model
-        to_eval = nonliterals.CompoundContext(context_to_save)
-        to_eval.session = req.session
-        ctx = dict((k, v) for k, v in to_eval.evaluate().iteritems()
-                   if not k.startswith('search_default_'))
-        ctx['dashboard_merge_domains_contexts'] = False  # TODO: replace this 6.1 workaround by attribute on <action/>
-        domain = nonliterals.CompoundDomain(domain)
-        domain.session = req.session
-        domain = domain.evaluate()
-
-        dashboard_action = load_actions_from_ir_values(req, 'action', 'tree_but_open', [('ir.ui.menu', menu_id)], False)
+        dashboard_action = load_actions_from_ir_values(
+            req, 'action', 'tree_but_open', [('ir.ui.menu', menu_id)], False)
 
         if dashboard_action:
             action = dashboard_action[0][2]
@@ -36,7 +27,7 @@ class Board(openerp.addons.web.http.Controller):
                             'name': str(action_id),
                             'string': name,
                             'view_mode': view_mode,
-                            'context': str(ctx),
+                            'context': str(context_to_save),
                             'domain': str(domain)
                         })
                         column.insert(0, new_action)
@@ -45,6 +36,6 @@ class Board(openerp.addons.web.http.Controller):
                             'user_id': req.session._uid,
                             'ref_id': view_id,
                             'arch': arch
-                        }, req.session.eval_context(req.context))
+                        }, req.context)
 
         return False
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index eb835c43e22..13a51cc663e 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -375,11 +375,22 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         var domain = new instance.web.CompoundDomain(getParent.dataset.get_domain() || []);
         _.each(data.contexts, context.add, context);
         _.each(data.domains, domain.add, domain);
+
+        var c = instance.web.pyeval.eval('context', context);
+        for(var k in c) {
+            if (c.hasOwnProperty(k) && /^search_default_/.test(k)) {
+                delete c[k];
+            }
+        }
+        // TODO: replace this 6.1 workaround by attribute on <action/>
+        c.dashboard_merge_domains_contexts = false;
+        var d = instance.web.pyeval.eval('domain', domain);
+
         this.rpc('/board/add_to_dashboard', {
             menu_id: this.$el.find("select").val(),
             action_id: view_parent.action.id,
-            context_to_save: context,
-            domain: domain,
+            context_to_save: c,
+            domain: d,
             view_mode: view_parent.active_view,
             name: this.$el.find("input").val()
         }).done(function(r) {
diff --git a/addons/claim_from_delivery/i18n/it.po b/addons/claim_from_delivery/i18n/it.po
index 539e0a1c8b4..da5e8074e9c 100644
--- a/addons/claim_from_delivery/i18n/it.po
+++ b/addons/claim_from_delivery/i18n/it.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2010-12-29 12:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-30 00:12+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: claim_from_delivery
 #: view:stock.picking.out:0
 msgid "Claims"
-msgstr ""
+msgstr "Reclami"
 
 #. module: claim_from_delivery
 #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
 msgid "Delivery Order"
-msgstr ""
+msgstr "Ordine di consegna"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim From Delivery"
-msgstr ""
+msgstr "Reclami Da Consegne"
 
 #~ msgid "Claim from delivery"
 #~ msgstr "Reclamo da consegna"
diff --git a/addons/contacts/i18n/hu.po b/addons/contacts/i18n/hu.po
index 9b414baee4e..eacc9b22406 100644
--- a/addons/contacts/i18n/hu.po
+++ b/addons/contacts/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: contacts
 #: model:ir.actions.act_window,help:contacts.action_contacts
diff --git a/addons/contacts/i18n/it.po b/addons/contacts/i18n/it.po
new file mode 100644
index 00000000000..e0d4d816737
--- /dev/null
+++ b/addons/contacts/i18n/it.po
@@ -0,0 +1,46 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-28 19:52+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: contacts
+#: model:ir.actions.act_window,help:contacts.action_contacts
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a contact in your address book.\n"
+"          </p><p>\n"
+"            OpenERP helps you easily track all activities related to\n"
+"            a customer; discussions, history of business opportunities,\n"
+"            documents, etc.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Premere per creare un contatto in rubrica.\n"
+"          </p><p>\n"
+"            OpenERP ti aiuta a tenere traccia delle attività legate\n"
+"            a clienti, discussioni, storia delle opportunità,\n"
+"            document, etc.\n"
+"\n"
+"          </p>\n"
+"        "
+
+#. module: contacts
+#: model:ir.actions.act_window,name:contacts.action_contacts
+#: model:ir.ui.menu,name:contacts.menu_contacts
+msgid "Contacts"
+msgstr "Contatti"
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index d80183b80c9..19baa5a5709 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -43,7 +43,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree,form</field>
             <field name="view_id" ref="view_crm_opportunity_user_stage_graph"/>
-            <field name="domain">[('state','!=','cancel'),('opening_date','&gt;',datetime.date.today().strftime("%Y-%m-%d"))]</field>
+            <field name="domain">[('state','!=','cancel'),('opening_date','&gt;',context_today().strftime("%Y-%m-%d"))]</field>
             <field name="context">{'search_default_Stage':1}</field>
         </record>
 
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 4bc01047b73..80ac2fa16d3 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -272,6 +272,10 @@ class crm_lead(base_stage, format_address, osv.osv):
         'color': 0,
     }
 
+    _sql_constraints = [
+        ('check_probability', 'check(probability >= 0 and probability <= 100)', 'The probability of closing the deal should be between 0% and 100%!')
+    ]
+
     def create(self, cr, uid, vals, context=None):
         obj_id = super(crm_lead, self).create(cr, uid, vals, context)
         section_id = self.browse(cr, uid, obj_id, context=context).section_id
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 88b2edcd665..c552b1835f2 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -4,7 +4,7 @@
 
         <!-- Read/Unread actions -->
         <record id="actions_server_crm_lead_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">CRM Lead: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
@@ -22,7 +22,7 @@
         </record>
 
         <record id="actions_server_crm_lead_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">CRM Lead: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 9cb09e71be2..a6e8dbe397a 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -4,7 +4,7 @@
 
     <!-- Read/Unread actions -->
     <record id="actions_server_crm_phonecall_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
+        <field name="name">CRM Phonecall: Mark unread</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>
@@ -22,7 +22,7 @@
     </record>
 
     <record id="actions_server_crm_phonecall_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
+        <field name="name">CRM Phonecall: Mark read</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index 075cfe8fdb0..f172aaa663e 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-02-27 10:26+0000\n"
-"Last-Translator: Fabrice (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 15:18+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 05:48+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2201,7 +2201,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Product"
-msgstr ""
+msgstr "Article"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:282
diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index da5167da1e6..25598abc3ea 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -81,7 +81,6 @@ class crm_lead_report(osv.osv):
         'type_id':fields.many2one('crm.case.resource.type', 'Campaign', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
-        'email': fields.integer('# Emails', size=128, readonly=True),
         'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg"),
         'planned_revenue': fields.float('Planned Revenue',digits=(16,2),readonly=True),
         'probable_revenue': fields.float('Probable Revenue', digits=(16,2),readonly=True),
@@ -137,7 +136,6 @@ class crm_lead_report(osv.osv):
                     c.planned_revenue,
                     c.planned_revenue*(c.probability/100) as probable_revenue,
                     1 as nbr,
-                    (SELECT count(id) FROM mail_message WHERE model='crm.lead' AND res_id=c.id AND email_from is not null) AS email,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
                     abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as  delay_expected,
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index a17633d0ef6..0e5df8837f1 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -25,7 +25,6 @@
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
                 <field name="nbr" sum="# Leads"/>
-                <field name="email" sum="# Mails"/>
                 <field name="delay_open"/>
                 <field name="delay_close"/>
                 <field name="planned_revenue"/>
@@ -148,7 +147,6 @@
                 <field name="company_id" invisible="1" groups="base.group_multi_company"/>
                 <field name="nbr" string="#Opportunities" sum="#Opportunities"/>
                 <field name="planned_revenue" sum="Planned Revenues"/>
-                <field name="email" sum="# of Emails"/>
                 <field name="delay_open" sum='Delay to open'/>
                 <field name="delay_close" sum='Delay to close'/>
                 <field name="delay_expected"/>
@@ -167,7 +165,7 @@
            <field name="context">{'search_default_year': 1,'search_default_lead': 1, "search_default_user":1, "search_default_this_month":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
            <field name="view_mode">tree,graph</field>
            <field name="domain">[]</field>
-           <field name="help">Leads Analysis allows you to check different CRM related information. Check for treatment delays, number of responses given and emails sent. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
+           <field name="help">Leads Analysis allows you to check different CRM related information like the treatment delays or number of leads per state. You can sort out your leads analysis by different groups to get accurate grained analysis.</field>
        </record>
        <record model="ir.actions.act_window.view" id="action_report_crm_lead_tree">
             <field name="sequence" eval="1"/>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 85507a32c0f..8b6217b97e1 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -104,7 +104,7 @@
                 <header>
                     <button name="case_close" string="Settle" type="object" class="oe_highlight"
                             states="draft,open,pending" groups="base.group_user"/>
-                    <button name="case_cancel" string="Reject" type="object"  groups="base.group_user"
+                    <button name="case_cancel" string="Reject" type="object" groups="base.group_user"
                             states="draft,open,pending"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
@@ -113,9 +113,9 @@
                         <field name="name"/>
                         <field name="date"/>
                     </group>
-                    <group colspan="4" col="4">
+                    <group colspan="4" col="4"  groups="base.group_user">
                         <field name="user_id"/>
-                        <field name="priority" groups="base.group_user"/>
+                        <field name="priority"/>
                         <field name="section_id"/>
                         <field name="date_deadline"/>
                         <field name="state" groups="base.group_no_one"/>
@@ -130,17 +130,17 @@
                                     <field name="partner_phone"/>
                                     <field name="email_from" widget="email"/>
                                 </group>
-                                <group colspan="2" col="2">
+                                <group colspan="2" col="2" groups="base.group_user">
                                     <separator colspan="2" string="Responsibilities"/>
                                     <field name="user_fault"/>
                                     <field name="categ_id" widget="selection"
                                         domain="[('object_id.model', '=', 'crm.claim')]"/>
                                     <field name="ref"/>
                                 </group>
-                                <separator colspan="4" string="Claim/Action Description"/>
+                                <separator colspan="4" string="Claim/Action Description" groups="base.group_user"/>
                                 <field name="description" colspan="4" nolabel="1"/>
                             </page>
-                            <page string="Follow Up">
+                            <page string="Follow Up" groups="base.group_user">
                                 <group colspan="2" col="2">
                                     <separator colspan="2" string="Actions"/>
                                     <field name="date_action_next"/>
@@ -167,7 +167,7 @@
                     </group>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                 </div>
                 </form>
diff --git a/addons/decimal_precision/i18n/it.po b/addons/decimal_precision/i18n/it.po
index 0880c6e8394..53f4da9eaad 100644
--- a/addons/decimal_precision/i18n/it.po
+++ b/addons/decimal_precision/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-12 19:11+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 19:56+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -28,6 +28,8 @@ msgid ""
 "Error! You cannot define the decimal precision of 'Account' as greater than "
 "the rounding factor of the company's main currency"
 msgstr ""
+"Errore! La precisione decimale di 'Contabilità' non può essere più grande "
+"del fattore di arrotondamento della valuta principale dell'azienda"
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 9b67d6b01b9..d6ec48e7601 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -264,9 +264,9 @@
         <record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
             <field name="name">stock.picking_withweight.internal.move.form.view</field>
             <field name="model">stock.move</field>
-            <field name="inherit_id" ref="stock.view_move_picking_tree"/>
+            <field name="inherit_id" ref="stock.view_move_picking_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='product_uom']" position="after">
+                <xpath expr="//field[@name='date_expected']" position="after">
                     <field name="weight"/>
                     <field name="weight_net" groups="base.group_no_one"/>
                 </xpath>
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 91d233219a7..e2886841fc1 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-18 13:05+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 14:54+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 05:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue !"
@@ -416,7 +416,7 @@ msgstr "Date d'expédition"
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "Produit de livraison"
+msgstr "Article de livraison"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -426,7 +426,7 @@ msgstr "Condition"
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Vous devez attribuer un numéro de série pour cet article."
 
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
@@ -437,6 +437,8 @@ msgstr "Prix de revient"
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
 msgstr ""
+"Il  est impossible de déplacer des articles depuis ou vers un emplacement de "
+"type \"vue\"."
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -505,7 +507,7 @@ msgstr "<="
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Vous tentez d'assigner un lot qui n'appartient pas au même article."
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py
index 10bf214d921..14cd97b3e62 100644
--- a/addons/edi/controllers/main.py
+++ b/addons/edi/controllers/main.py
@@ -23,10 +23,9 @@ class EDI(openerpweb.Controller):
 
     @openerpweb.jsonrequest
     def import_edi_url(self, req, url):
-        context = req.session.eval_context(req.context)
         result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url)
         if len(result) == 1:
-            return {"action": webmain.clean_action(req, result[0][2], context)}
+            return {"action": webmain.clean_action(req, result[0][2])}
         return True
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/i18n/zh_CN.po b/addons/edi/i18n/zh_CN.po
index 5f9d159b7b3..4a71e45fa8e 100644
--- a/addons/edi/i18n/zh_CN.po
+++ b/addons/edi/i18n/zh_CN.po
@@ -8,28 +8,28 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-17 03:29+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:46+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "原因："
 
 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "这个单据已经被成功导入！"
 
 #. module: edi
 #: sql_constraint:res.company:0
@@ -46,7 +46,7 @@ msgstr "错误，您不能创建循环引用的会员用户"
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "对不起，这个单据不能导入！"
 
 #. module: edi
 #: constraint:res.company:0
@@ -61,7 +61,7 @@ msgstr "公司"
 #. module: edi
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: edi
 #: sql_constraint:res.currency:0
@@ -78,13 +78,13 @@ msgstr "货币"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "单据导入通知"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "找不到的应用。"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:131
@@ -111,12 +111,12 @@ msgstr "业务伙伴"
 msgid ""
 "Error! You cannot define a rounding factor for the company's main currency "
 "that is smaller than the decimal precision of 'Account'."
-msgstr ""
+msgstr "错误！公司本位币的舍入系数不能定义得小于”科目“的小数位数"
 
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "EDI 子系统"
 
 #~ msgid "Partner Addresses"
 #~ msgstr "业务伙伴地址"
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 14895f2a1a7..a9a60570735 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -59,7 +59,7 @@
 
         <!-- Event Read/Unread actions -->
         <record id="actions_server_event_event_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Event: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
@@ -77,7 +77,7 @@
         </record>
 
         <record id="actions_server_event_event_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Event: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
@@ -107,7 +107,7 @@
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>
-                        <div class="oe_right oe_button_box">
+                        <div class="oe_right oe_button_box" groups="base.group_user">
                             <button name="%(event.act_event_list_register_event)d" type="action" string="Registrations" help="Register with this event"/>
                         </div>
                         <div class="oe_title">
@@ -204,7 +204,7 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                         <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                     </div>
                 </form>
@@ -377,7 +377,7 @@
 
         <!-- Registration Read/Unread actions -->
         <record id="actions_server_event_registration_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Event registration : Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>
@@ -395,7 +395,7 @@
         </record>
 
         <record id="actions_server_event_registration_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Event registration : Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>
@@ -538,7 +538,7 @@
           <field name="view_mode">tree,form,calendar,graph</field>
           <field name="context">{}</field>
           <field name="search_view_id" ref="view_registration_search"/>
-        </record>view_
+        </record>
 
         <menuitem name="Registrations"
             id="menu_action_registration" parent="base.menu_event_main"
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index 8df0dadcd18..03be1d2db23 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-16 14:07+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 11:10+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 05:44+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr "我的事件"
+msgstr "我的活动"
 
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Number of Participants"
-msgstr ""
+msgstr "参与者数目"
 
 #. module: event
 #: field:event.event,register_attended:0
 msgid "# of Participations"
-msgstr ""
+msgstr "参与编号#"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
@@ -61,22 +61,22 @@ msgstr ""
 #: code:addons/event/event.py:305
 #, python-format
 msgid "Event has been <b>cancelled</b>."
-msgstr ""
+msgstr "活动 <b>已经被取消</b>."
 
 #. module: event
 #: field:event.registration,date_open:0
 msgid "Registration Date"
-msgstr "登记记录日期"
+msgstr "活动日期"
 
 #. module: event
 #: help:event.registration,origin:0
 msgid "Name of the sale order which create the registration"
-msgstr ""
+msgstr "源销售单摘要"
 
 #. module: event
 #: field:event.event,type:0
 msgid "Type of Event"
-msgstr ""
+msgstr "活动类型"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -88,17 +88,17 @@ msgstr "Bon Jovi音乐会"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,registration_state:0
 msgid "Attended"
-msgstr ""
+msgstr "参加"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr "3月"
+msgstr "三月"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send Email"
-msgstr ""
+msgstr "发送邮件"
 
 #. module: event
 #: field:event.event,company_id:0
@@ -112,44 +112,44 @@ msgstr "公司"
 #: field:event.event,email_confirmation_id:0
 #: field:event.type,default_email_event:0
 msgid "Event Confirmation Email"
-msgstr ""
+msgstr "活动确认邮件"
 
 #. module: event
 #: field:event.type,default_registration_max:0
 msgid "Default Maximum Registration"
-msgstr ""
+msgstr "默认最多的注册者"
 
 #. module: event
 #: help:event.event,message_unread:0
 #: help:event.registration,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: event
 #: field:event.event,register_avail:0
 msgid "Available Registrations"
-msgstr ""
+msgstr "可参与活动"
 
 #. module: event
 #: view:event.registration:0
 #: model:ir.model,name:event.model_event_registration
 msgid "Event Registration"
-msgstr "事件登记记录"
+msgstr "活动登记记录"
 
 #. module: event
 #: model:ir.module.category,description:event.module_category_event_management
 msgid "Helps you manage your Events."
-msgstr ""
+msgstr "帮你管理你的活动"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "登记记录的事件"
+msgstr "登记记录的活动"
 
 #. module: event
 #: view:event.event:0
@@ -167,18 +167,18 @@ msgstr "活动开始日期"
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr "事件分析"
+msgstr "活动分析"
 
 #. module: event
 #: help:event.type,default_registration_max:0
 msgid "It will select this default maximum value when you choose this event"
-msgstr ""
+msgstr "当你选择这个活动，将选择默认最大值"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id_registration:0
 msgid "Register"
-msgstr ""
+msgstr "发起者"
 
 #. module: event
 #: field:event.event,message_ids:0
@@ -202,18 +202,18 @@ msgstr "登记记录"
 #: code:addons/event/event.py:400
 #, python-format
 msgid "Error!"
-msgstr "错误！"
+msgstr "错误!"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirm Event"
-msgstr "确认事件"
+msgstr "确认活动"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr "下一个事件"
+msgstr "下一个活动"
 
 #. module: event
 #: selection:event.event,state:0
@@ -226,7 +226,7 @@ msgstr "已取消"
 #. module: event
 #: view:event.event:0
 msgid "ticket"
-msgstr ""
+msgstr "入场券"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -236,33 +236,33 @@ msgstr "Verdi歌剧"
 #. module: event
 #: view:report.event.registration:0
 msgid "Display"
-msgstr ""
+msgstr "显示"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,registration_state:0
 msgid "Registration State"
-msgstr ""
+msgstr "等级状态"
 
 #. module: event
 #: view:event.event:0
 msgid "tickets"
-msgstr ""
+msgstr "门票"
 
 #. module: event
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "False"
 
 #. module: event
 #: model:mail.message.subtype,name:event.mt_event_registration
 msgid "New Registrations"
-msgstr ""
+msgstr "新登记者"
 
 #. module: event
 #: field:event.registration,event_end_date:0
 msgid "Event End Date"
-msgstr ""
+msgstr "活动结束日期"
 
 #. module: event
 #: help:event.event,message_summary:0
@@ -270,7 +270,7 @@ msgstr ""
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: event
 #: view:report.event.registration:0
@@ -282,7 +282,7 @@ msgstr "在已确认或已完成状态的报名者"
 #: code:addons/event/event.py:116
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: event
 #: view:event.event:0
@@ -300,12 +300,12 @@ msgstr "业务伙伴"
 #. module: event
 #: help:event.type,default_registration_min:0
 msgid "It will select this default minimum value when you choose this event"
-msgstr ""
+msgstr "当你选择这个活动，将选择默认最小值"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr " 事件类型 "
+msgstr " 活动类型 "
 
 #. module: event
 #: view:event.registration:0
@@ -315,7 +315,7 @@ msgstr " 事件类型 "
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr "事件"
+msgstr "活动"
 
 #. module: event
 #: view:event.event:0
@@ -330,7 +330,7 @@ msgstr "已确认"
 #. module: event
 #: view:event.registration:0
 msgid "Participant"
-msgstr ""
+msgstr "参与者"
 
 #. module: event
 #: view:event.registration:0
@@ -341,30 +341,30 @@ msgstr "确定"
 #. module: event
 #: view:event.event:0
 msgid "Organized by"
-msgstr ""
+msgstr "组织"
 
 #. module: event
 #: view:event.event:0
 msgid "Register with this event"
-msgstr ""
+msgstr "注册这次活动"
 
 #. module: event
 #: help:event.type,default_email_registration:0
 msgid ""
 "It will select this default confirmation registration mail value when you "
 "choose this event"
-msgstr ""
+msgstr "当你选择这个活动，将选择确认登记邮件值"
 
 #. module: event
 #: view:event.event:0
 msgid "Only"
-msgstr ""
+msgstr "仅"
 
 #. module: event
 #: field:event.event,message_follower_ids:0
 #: field:event.registration,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: event
 #: view:event.event:0
@@ -377,7 +377,7 @@ msgstr "位置"
 #: view:event.registration:0
 #: field:event.registration,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读消息"
 
 #. module: event
 #: view:event.registration:0
@@ -399,18 +399,18 @@ msgstr "电子邮件"
 #: code:addons/event/event.py:367
 #, python-format
 msgid "New registration confirmed: %s."
-msgstr ""
+msgstr "已确认的登记: %s."
 
 #. module: event
 #: model:ir.actions.server,name:event.actions_server_event_event_read
 #: model:ir.actions.server,name:event.actions_server_event_registration_read
 msgid "Mark read"
-msgstr ""
+msgstr "标记为已读"
 
 #. module: event
 #: view:event.event:0
 msgid "Upcoming"
-msgstr ""
+msgstr "即将"
 
 #. module: event
 #: field:event.registration,create_date:0
@@ -421,7 +421,7 @@ msgstr "创建日期"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Event Responsible"
-msgstr ""
+msgstr "活动负责人"
 
 #. module: event
 #: view:event.event:0
@@ -438,7 +438,7 @@ msgstr "7月"
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To Email"
-msgstr ""
+msgstr "回复Email"
 
 #. module: event
 #: view:event.registration:0
@@ -448,12 +448,12 @@ msgstr "确认报名者"
 #. module: event
 #: view:event.event:0
 msgid "Starting Date"
-msgstr ""
+msgstr "开始日期"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr "事件结构"
+msgstr "活动组织机构"
 
 #. module: event
 #: view:event.confirm:0
@@ -463,7 +463,7 @@ msgstr "总是确认"
 #. module: event
 #: field:report.event.registration,nbevent:0
 msgid "Number Of Events"
-msgstr "事件数"
+msgstr "活动数量"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
@@ -474,29 +474,29 @@ msgstr "要在这次活动上发言的演讲者"
 #: code:addons/event/event.py:457
 #, python-format
 msgid "Registration has been <b>created</b>."
-msgstr ""
+msgstr "登记被 <b>创建</b>."
 
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr "取消事件"
+msgstr "取消活动"
 
 #. module: event
 #: code:addons/event/event.py:398
 #, python-format
 msgid "State set to Done"
-msgstr ""
+msgstr "状态设置为完成"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr "事件填充状态"
+msgstr "活动填充状态"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Category"
-msgstr ""
+msgstr "活动分类"
 
 #. module: event
 #: field:event.event,register_prospect:0
@@ -506,13 +506,13 @@ msgstr "不确认登记记录"
 #. module: event
 #: model:ir.actions.client,name:event.action_client_event_menu
 msgid "Open Event Menu"
-msgstr ""
+msgstr "打开活动菜单"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,event_state:0
 msgid "Event State"
-msgstr ""
+msgstr "活动状态"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -543,7 +543,7 @@ msgstr " # 没草稿状态的登记记录"
 #: field:event.event,email_registration_id:0
 #: field:event.type,default_email_registration:0
 msgid "Registration Confirmation Email"
-msgstr ""
+msgstr "登记确认Email"
 
 #. module: event
 #: view:report.event.registration:0
@@ -554,18 +554,18 @@ msgstr "月份"
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Attended Date"
-msgstr ""
+msgstr "参加日期"
 
 #. module: event
 #: view:event.event:0
 msgid "Finish Event"
-msgstr ""
+msgstr "结束活动"
 
 #. module: event
 #: model:ir.actions.server,name:event.actions_server_event_event_unread
 #: model:ir.actions.server,name:event.actions_server_event_registration_unread
 msgid "Mark unread"
-msgstr ""
+msgstr "标记为未读"
 
 #. module: event
 #: view:event.registration:0
@@ -575,7 +575,7 @@ msgstr "未确认状态的报名者"
 #. module: event
 #: view:event.event:0
 msgid "Event Description"
-msgstr ""
+msgstr "活动描述"
 
 #. module: event
 #: field:event.event,date_begin:0
@@ -585,24 +585,24 @@ msgstr "开始日期"
 #. module: event
 #: view:event.confirm:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: event
 #: code:addons/event/event.py:315
 #, python-format
 msgid "Event has been <b>done</b>."
-msgstr ""
+msgstr "活动已经 <b>完成</b>"
 
 #. module: event
 #: help:res.partner,speaker:0
 msgid "Check this box if this contact is a speaker."
-msgstr ""
+msgstr "如果联系人是演讲者，选中此项"
 
 #. module: event
 #: code:addons/event/event.py:116
 #, python-format
 msgid "No Tickets Available!"
-msgstr ""
+msgstr "没有可用的门票"
 
 #. module: event
 #: help:event.event,state:0
@@ -627,6 +627,12 @@ msgid ""
 "             </p>\n"
 "           "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               单击添加一个新的活动\n"
+"             </p><p>\n"
+"               OpenERP帮你排程并有效地组织活动：跟踪订阅和参与、自动确认邮件、卖票等等。\n"
+"             </p>\n"
+"           "
 
 #. module: event
 #: help:event.event,register_max:0
@@ -634,13 +640,13 @@ msgid ""
 "You can for each event define a maximum registration level. If you have too "
 "much registrations you are not able to confirm your event. (put 0 to ignore "
 "this rule )"
-msgstr ""
+msgstr "你能为每个活动定义最大的登记水平。如果你有太多的登记，你不能确认你的活动。（输入0忽略这个规则）"
 
 #. module: event
 #: code:addons/event/event.py:462
 #, python-format
 msgid "Registration has been set as <b>draft</b>."
-msgstr ""
+msgstr "登记 会设为“草稿”"
 
 #. module: event
 #: code:addons/event/event.py:108
@@ -649,14 +655,14 @@ msgid ""
 "The total of confirmed registration for the event '%s' does not meet the "
 "expected minimum/maximum. Please reconsider those limits before going "
 "further."
-msgstr ""
+msgstr "活动 '%s' 的确认登记合计没有遇到最小或最大值。进一步深入前请重新考虑这些限制。"
 
 #. module: event
 #: help:event.event,email_confirmation_id:0
 msgid ""
 "If you set an email template, each participant will receive this email "
 "announcing the confirmation of the event."
-msgstr ""
+msgstr "如果你设定了邮件模板，每个参与者将收到邮件公告确认次次活动。"
 
 #. module: event
 #: view:board.board:0
@@ -683,7 +689,7 @@ msgstr "新建状态的活动"
 #: code:addons/event/event.py:404
 #, python-format
 msgid "State set to Cancel"
-msgstr ""
+msgstr "状态设为取消"
 
 #. module: event
 #: view:event.event:0
@@ -696,7 +702,7 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_reporting_events
 #: view:res.partner:0
 msgid "Events"
-msgstr "事件"
+msgstr "活动"
 
 #. module: event
 #: view:event.event:0
@@ -709,7 +715,7 @@ msgstr "状态"
 #. module: event
 #: field:event.event,city:0
 msgid "city"
-msgstr ""
+msgstr "城市"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -719,7 +725,7 @@ msgstr "8月"
 #. module: event
 #: field:event.event,zip:0
 msgid "zip"
-msgstr ""
+msgstr "邮政编码"
 
 #. module: event
 #: field:res.partner,event_ids:0
@@ -730,7 +736,7 @@ msgstr "未知的"
 #. module: event
 #: field:event.event,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "街区地址2"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -743,18 +749,18 @@ msgid ""
 "The email address of the organizer which is put in the 'Reply-To' of all "
 "emails sent automatically at event or registrations confirmation. You can "
 "also put your email address of your mail gateway if you use one."
-msgstr ""
+msgstr "在自动发送的活动或者登记确认的email中，组织者的email地址放在'Reply-To' 。你也能放你用的邮件网关的Email地址"
 
 #. module: event
 #: help:event.event,message_ids:0
 #: help:event.registration,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: event
 #: field:event.registration,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "电话"
 
 #. module: event
 #: model:email.template,body_html:event.confirmation_event
@@ -774,20 +780,20 @@ msgstr ""
 #: field:event.event,message_is_follower:0
 #: field:event.registration,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: event
 #: field:event.registration,user_id:0
 #: model:res.groups,name:event.group_event_user
 msgid "User"
-msgstr ""
+msgstr "用户"
 
 #. module: event
 #: view:event.confirm:0
 msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
-msgstr "警告：这事件没有达到最低登记记录的规定，你肯定要确认它？"
+msgstr "警告：这活动没有达到最低登记记录的规定，你肯定要确认它？"
 
 #. module: event
 #: view:event.event:0
@@ -803,7 +809,7 @@ msgstr "我的登记记录"
 #: code:addons/event/event.py:310
 #, python-format
 msgid "Event has been set to <b>draft</b>."
-msgstr ""
+msgstr "活动被设置为“草稿”状态"
 
 #. module: event
 #: view:report.event.registration:0
@@ -816,7 +822,7 @@ msgstr "增加筛选条件"
 #: field:event.registration,message_comment_ids:0
 #: help:event.registration,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -855,18 +861,18 @@ msgstr "日期"
 #. module: event
 #: view:event.event:0
 msgid "Email Configuration"
-msgstr ""
+msgstr "邮箱配置"
 
 #. module: event
 #: field:event.type,default_registration_min:0
 msgid "Default Minimum Registration"
-msgstr ""
+msgstr "默认最小登记数"
 
 #. module: event
 #: code:addons/event/event.py:368
 #, python-format
 msgid "Registration confirmed."
-msgstr ""
+msgstr "登记确认。"
 
 #. module: event
 #: field:event.event,address_id:0
@@ -877,7 +883,7 @@ msgstr "地址"
 #: model:ir.actions.act_window,name:event.action_event_type
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr "事件类型"
+msgstr "活动类型"
 
 #. module: event
 #: help:event.event,email_registration_id:0
@@ -889,7 +895,7 @@ msgstr ""
 #. module: event
 #: view:event.event:0
 msgid "Attended the Event"
-msgstr ""
+msgstr "参加活动"
 
 #. module: event
 #: constraint:event.event:0
@@ -900,7 +906,7 @@ msgstr "错误！结束日期不能在开始日期前。"
 #: code:addons/event/event.py:400
 #, python-format
 msgid "You must wait for the starting day of the event to do this action."
-msgstr ""
+msgstr "你必须等待活动开始才能做这些动作"
 
 #. module: event
 #: field:event.event,user_id:0
@@ -916,7 +922,7 @@ msgstr "完成"
 #. module: event
 #: view:report.event.registration:0
 msgid "Show Confirmed Registrations"
-msgstr ""
+msgstr "显示确认的登记"
 
 #. module: event
 #: view:event.confirm:0
@@ -926,35 +932,35 @@ msgstr "取消"
 #. module: event
 #: field:event.registration,reply_to:0
 msgid "Reply-to Email"
-msgstr ""
+msgstr "回复email"
 
 #. module: event
 #: code:addons/event/event.py:114
 #, python-format
 msgid "Only %d Seats are Available!"
-msgstr ""
+msgstr "只有 %d 个座位可用！"
 
 #. module: event
 #: model:email.template,subject:event.confirmation_event
 #: model:email.template,subject:event.confirmation_registration
 msgid "Your registration at ${object.event_id.name}"
-msgstr ""
+msgstr "你的登记在${object.event_id.name}"
 
 #. module: event
 #: view:event.registration:0
 msgid "Set To Unconfirmed"
-msgstr ""
+msgstr "设置为未确认"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,is_subscribed:0
 msgid "Subscribed"
-msgstr ""
+msgstr "已订阅"
 
 #. module: event
 #: view:event.event:0
 msgid "Unsubscribe"
-msgstr ""
+msgstr "退订"
 
 #. module: event
 #: view:event.event:0
@@ -965,7 +971,7 @@ msgstr "负责人"
 #. module: event
 #: view:report.event.registration:0
 msgid "Registration contact"
-msgstr ""
+msgstr "登记联系人"
 
 #. module: event
 #: view:report.event.registration:0
@@ -977,23 +983,23 @@ msgstr "关注者"
 #. module: event
 #: view:event.event:0
 msgid "Upcoming events from today"
-msgstr ""
+msgstr "今天将开始的活动"
 
 #. module: event
 #: code:addons/event/event.py:300
 #, python-format
 msgid "Event has been <b>created</b>."
-msgstr ""
+msgstr "活动已经被'创建'"
 
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Business"
-msgstr ""
+msgstr "ERP 商务会议"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_event_view_registration
 msgid "New Registration"
-msgstr ""
+msgstr "新的登记"
 
 #. module: event
 #: field:event.event,note:0
@@ -1008,33 +1014,33 @@ msgstr " # 没确认登记记录"
 #. module: event
 #: field:report.event.registration,name_registration:0
 msgid "Participant / Contact Name"
-msgstr ""
+msgstr "参与者/联系人名字"
 
 #. module: event
 #: code:addons/event/event.py:320
 #, python-format
 msgid "Event has been <b>confirmed</b>."
-msgstr ""
+msgstr "活动已经被'确认'"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr "事件登记记录"
+msgstr "活动登记记录"
 
 #. module: event
 #: view:event.event:0
 msgid "No ticket available."
-msgstr ""
+msgstr "没有可用的入场券"
 
 #. module: event
 #: field:event.event,street:0
 msgid "Street"
-msgstr ""
+msgstr "街区地址"
 
 #. module: event
 #: view:event.event:0
 msgid "available."
-msgstr ""
+msgstr "可用."
 
 #. module: event
 #: field:event.event,register_max:0
@@ -1089,7 +1095,7 @@ msgstr "结束登记记录"
 #. module: event
 #: field:event.registration,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "源单据"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -1115,7 +1121,7 @@ msgstr "已确认状态的活动"
 #: view:report.event.registration:0
 #: field:report.event.registration,event_type:0
 msgid "Event Type"
-msgstr "事件类型"
+msgstr "活动类型"
 
 #. module: event
 #: field:event.event,message_summary:0
@@ -1131,7 +1137,7 @@ msgstr "标识"
 #. module: event
 #: field:event.type,default_reply_to:0
 msgid "Default Reply-To"
-msgstr ""
+msgstr "默认回复给"
 
 #. module: event
 #: view:event.event:0
@@ -1148,17 +1154,17 @@ msgstr "错误，您不能创建循环引用的会员用户"
 #: field:event.registration,event_begin_date:0
 #: field:report.event.registration,event_date:0
 msgid "Event Start Date"
-msgstr "事件开始日期"
+msgstr "活动开始日期"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Participant / Contact"
-msgstr ""
+msgstr "参与者/联系人"
 
 #. module: event
 #: view:event.event:0
 msgid "Current Registrations"
-msgstr ""
+msgstr "当前登记"
 
 #. module: event
 #: model:email.template,body_html:event.confirmation_registration
@@ -1191,7 +1197,7 @@ msgstr "5月"
 #. module: event
 #: model:res.groups,name:event.group_event_manager
 msgid "Manager"
-msgstr ""
+msgstr "主管"
 
 #. module: event
 #: constraint:res.partner:0
@@ -1203,7 +1209,7 @@ msgstr "错误:无效EAN编码"
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr "事件确认"
+msgstr "活动确认"
 
 #. module: event
 #: view:report.event.registration:0
diff --git a/addons/event_sale/i18n/fr.po b/addons/event_sale/i18n/fr.po
new file mode 100644
index 00000000000..49b5eb3a18e
--- /dev/null
+++ b/addons/event_sale/i18n/fr.po
@@ -0,0 +1,101 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 15:35+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_product_product
+msgid "Product"
+msgstr "Article"
+
+#. module: event_sale
+#: help:product.product,event_ok:0
+msgid ""
+"Determine if a product needs to create automatically an event registration "
+"at the confirmation of a sale order line."
+msgstr ""
+
+#. module: event_sale
+#: help:sale.order.line,event_id:0
+msgid ""
+"Choose an event and it will automatically create a registration for this "
+"event."
+msgstr ""
+
+#. module: event_sale
+#: sql_constraint:product.product:0
+msgid "Error ! Ending Date cannot be set before Beginning Date."
+msgstr ""
+
+#. module: event_sale
+#: model:event.event,name:event_sale.event_technical_training
+msgid "Technical training in Grand-Rosiere"
+msgstr ""
+
+#. module: event_sale
+#: help:product.product,event_type_id:0
+msgid ""
+"Filter the list of event on this category only, in the sale order lines"
+msgstr ""
+
+#. module: event_sale
+#: constraint:product.product:0
+msgid ""
+"You provided an invalid \"EAN13 Barcode\" reference. You may use the "
+"\"Internal Reference\" field instead."
+msgstr ""
+
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sale Order %s."
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_ok:0
+msgid "Event Subscription"
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_type_id:0
+msgid "Event Type"
+msgstr ""
+
+#. module: event_sale
+#: model:product.template,name:event_sale.event_product_product_template
+msgid "Technical Training"
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_id:0
+msgid "Event"
+msgstr ""
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
diff --git a/addons/event_sale/i18n/zh_CN.po b/addons/event_sale/i18n/zh_CN.po
new file mode 100644
index 00000000000..2ab74311b0a
--- /dev/null
+++ b/addons/event_sale/i18n/zh_CN.po
@@ -0,0 +1,101 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 01:53+0000\n"
+"Last-Translator: mrshelly <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_product_product
+msgid "Product"
+msgstr "产品"
+
+#. module: event_sale
+#: help:product.product,event_ok:0
+msgid ""
+"Determine if a product needs to create automatically an event registration "
+"at the confirmation of a sale order line."
+msgstr "销售订单确认时自动创建产品的相关活动."
+
+#. module: event_sale
+#: help:sale.order.line,event_id:0
+msgid ""
+"Choose an event and it will automatically create a registration for this "
+"event."
+msgstr "选择活动"
+
+#. module: event_sale
+#: sql_constraint:product.product:0
+msgid "Error ! Ending Date cannot be set before Beginning Date."
+msgstr "错误!结束日期不能早于开始日期。"
+
+#. module: event_sale
+#: model:event.event,name:event_sale.event_technical_training
+msgid "Technical training in Grand-Rosiere"
+msgstr ""
+
+#. module: event_sale
+#: help:product.product,event_type_id:0
+msgid ""
+"Filter the list of event on this category only, in the sale order lines"
+msgstr "仅在此类中过滤."
+
+#. module: event_sale
+#: constraint:product.product:0
+msgid ""
+"You provided an invalid \"EAN13 Barcode\" reference. You may use the "
+"\"Internal Reference\" field instead."
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
+
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sale Order %s."
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
+msgstr ""
+
+#. module: event_sale
+#: field:product.product,event_ok:0
+msgid "Event Subscription"
+msgstr "订阅活动"
+
+#. module: event_sale
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
+msgstr "活动类型"
+
+#. module: event_sale
+#: field:sale.order.line,event_type_id:0
+msgid "Event Type"
+msgstr "活动类型"
+
+#. module: event_sale
+#: model:product.template,name:event_sale.event_product_product_template
+msgid "Technical Training"
+msgstr ""
+
+#. module: event_sale
+#: field:sale.order.line,event_id:0
+msgid "Event"
+msgstr "活动"
+
+#. module: event_sale
+#: model:ir.model,name:event_sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "销售订单明细"
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index 6251eb81991..4ccea4d621e 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index be0e8b34351..e74ac4839f4 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -625,7 +625,7 @@ class fleet_vehicle_log_contract(osv.Model):
             startdate = datetime.datetime.strptime(last_cost_date, tools.DEFAULT_SERVER_DATE_FORMAT).date()
             if found:
                 startdate += deltas.get(contract.cost_frequency)
-            while (startdate < d) & (startdate < datetime.datetime.strptime(contract.expiration_date, tools.DEFAULT_SERVER_DATE_FORMAT).date()):
+            while (startdate <= d) & (startdate <= datetime.datetime.strptime(contract.expiration_date, tools.DEFAULT_SERVER_DATE_FORMAT).date()):
                 data = {
                     'amount': contract.cost_generated,
                     'date': startdate.strftime(tools.DEFAULT_SERVER_DATE_FORMAT),
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 8c7ceaf8d2d..416ca191a6e 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -318,12 +318,7 @@
                                         
                                     </ul>
 
-                                    <div class="oe_kanban_partner_categories">
-                                        <span class="oe_kanban_list_many2many">
-                                            <div modifiers="{}" name="tag_ids" class="oe_form_field oe_tags" model="fleet.vehicle.tag" t-att-data="record.tag_ids.raw_value" />
-                                        </span>
-                                    </div>
-
+                                    <field name="tag_ids"/>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/fleet/i18n/zh_CN.po b/addons/fleet/i18n/zh_CN.po
new file mode 100644
index 00000000000..870403f5924
--- /dev/null
+++ b/addons/fleet/i18n/zh_CN.po
@@ -0,0 +1,1895 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:52+0000\n"
+"PO-Revision-Date: 2012-11-29 08:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Hybrid"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact
+msgid "Compact"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_1
+msgid "A/C Compressor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,vin_sn:0
+msgid "Unique number written on the vehicle motor (VIN/SN number)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Service"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Monthly"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:62
+#, python-format
+msgid "Unknown"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_20
+msgid "Engine/Drive Belt(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicle costs"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Diesel"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:421
+#, python-format
+msgid "License Plate: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_38
+msgid "Resurface Rotors"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Group By..."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_32
+msgid "Oil Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_18
+msgid "Engine Belt Inspection"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "No"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,power:0
+msgid "Power in kW of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_2
+msgid "Depreciation and Interests"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,insurer_id:0
+#: field:fleet.vehicle.log.fuel,vendor_id:0
+#: field:fleet.vehicle.log.services,vendor_id:0
+msgid "Supplier"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_35
+msgid "Power Steering Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Odometer details"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Has Alert(s)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,liter:0
+msgid "Liter"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fuel Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_9
+msgid "Battery Inspection"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Refueling Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:655
+#, python-format
+msgid "%s contract(s) need(s) to be renewed and/or closed!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Indicative Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_16
+msgid "Charging System Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,car_value:0
+msgid "Value of the bought vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_44
+msgid "Tie Rod End Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_24
+msgid "Head Gasket(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Services"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer:0
+#: help:fleet.vehicle.cost,odometer:0
+#: help:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer measure of the vehicle at the moment of this log"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,notes:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban
+msgid "Vehicles with alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu
+msgid "Vehicle Costs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+msgid "Both"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_id:0
+#: field:fleet.vehicle.log.fuel,cost_id:0
+#: field:fleet.vehicle.log.services,cost_id:0
+msgid "Automatically created field to link to parent fleet.vehicle.cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Terminate Contract"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,parent_id:0
+msgid "Parent cost to this current cost"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Frequency of the recuring cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_1
+msgid "Calculation Benefit In Kind"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,expiration_date:0
+msgid ""
+"Date when the coverage of the contract expirates (by default, one year after "
+"begin date)"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: field:fleet.vehicle.log.fuel,notes:0
+#: view:fleet.vehicle.log.services:0
+#: field:fleet.vehicle.log.services,notes:0
+msgid "Notes"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Operation not allowed!"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,vehicle_id:0
+msgid "Vehicle concerned by this log"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_amount:0
+#: field:fleet.vehicle.log.fuel,cost_amount:0
+#: field:fleet.vehicle.log.services,cost_amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_6
+msgid "Air Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_tag
+msgid "fleet.vehicle.tag"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the services logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_name:0
+msgid "Name of contract to renew soon"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior
+msgid "Senior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,state:0
+msgid "Choose wheter the contract is still valid or not"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Automatic"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:414
+#, python-format
+msgid "Driver: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "and"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_medium:0
+msgid "Medium-sized photo"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_34
+msgid "Oxygen Sensor Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Service Type"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,transmission:0
+msgid "Transmission Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:726
+#: view:fleet.vehicle.log.contract:0
+#: model:ir.actions.act_window,name:fleet.act_renew_contract
+#, python-format
+msgid "Renew Contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the odometer logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,odometer_unit:0
+msgid "Unit of the odometer "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Effective Costs"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_8
+msgid "Repair and maintenance"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Person to which the contract is signed for"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new contract. \n"
+"              </p><p>\n"
+"                Manage all your contracts (leasing, insurances, etc.) with\n"
+"                their related services, costs. OpenERP will automatically "
+"warn\n"
+"                you when some contracts have to be renewed.\n"
+"              </p><p>\n"
+"                Each contract (e.g.: leasing) may include several services\n"
+"                (reparation, insurances, periodic maintenance).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_service_type
+msgid "Type of services available on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu
+msgid "Service Types"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Contracts Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu
+msgid "Vehicles Services Logs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu
+msgid "Vehicles Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model.brand:0
+msgid ""
+"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { "
+"$(this).addClass('oe_employee_picture_wide') } });"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Vehicles With Alerts"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new cost.\n"
+"              </p><p>\n"
+"                OpenERP helps you managing the costs for your different\n"
+"                vehicles. Costs are created automatically from services,\n"
+"                contracts (fixed or recurring) and fuel logs.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the fuel logs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,purchaser_id:0
+msgid "Contractor"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,license_plate:0
+msgid "License Plate"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Recurring Cost Frequency"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,inv_ref:0
+#: field:fleet.vehicle.log.services,inv_ref:0
+msgid "Invoice Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,location:0
+msgid "Location"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.contract.state,name:0
+msgid "Contract Status"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_total:0
+msgid "Total of contracts due or overdue minus one"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_subtype:0
+msgid "Type"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_overdue:0
+msgid "Has Contracts Overdued"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,amount:0
+msgid "Total Price"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_27
+msgid "Heater Core Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_14
+msgid "Car Wash"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,driver:0
+msgid "Driver of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "other(s)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_refueling
+msgid "Refueling"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_5
+msgid "A/C Recharge"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel
+msgid "Fuel log for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Engine Options"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan
+msgid "Sedan"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,seats:0
+msgid "Seats Number"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible
+msgid "Convertible"
+msgstr ""
+
+#. module: fleet
+#: model:ir.ui.menu,name:fleet.fleet_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,sum_cost:0
+msgid "Indicative Costs Total"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior
+msgid "Junior"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,model_id:0
+msgid "Model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a vehicule status.\n"
+"              </p><p>\n"
+"                You can customize available status to track the evolution "
+"of\n"
+"                each vehicule. Example: Active, Being Repaired, Sold.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_fuel:0
+#: view:fleet.vehicle.log.fuel:0
+msgid "Fuel Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:409
+#: code:addons/fleet/fleet.py:413
+#: code:addons/fleet/fleet.py:417
+#: code:addons/fleet/fleet.py:420
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs
+msgid "Indicative Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_12
+msgid "Brake Inspection"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,state:0
+msgid "Current state of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,transmission:0
+msgid "Manual"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_52
+msgid "Wheel Bearing Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_subtype:0
+msgid "Cost type purchased with this cost"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Gasoline"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new brand.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,start_date:0
+msgid "Contract Start Date"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer_unit:0
+msgid "Odometer Unit"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_30
+msgid "Intake Manifold Gasket Replacement"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Daily"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_6
+msgid "Snow tires"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,date:0
+msgid "Date when the cost has been executed"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Order"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Vehicles costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_services
+msgid "Services for vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Indicative Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_26
+msgid "Heater Control Valve Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid ""
+"Create a new contract automatically with all the same informations except "
+"for the date that will start at the end of current contract"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "Terminated"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_cost
+msgid "Cost related to a vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_33
+msgid "Other Maintenance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,brand:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,state:0
+#: view:fleet.vehicle.state:0
+msgid "State"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,cost_generated:0
+msgid "Recurring Cost Amount"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_49
+msgid "Transmission Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new fuel log. \n"
+"              </p><p>\n"
+"                Here you can add refuelling entries for all vehicles.  You "
+"can\n"
+"                also filter logs of a particular vehicle using the search\n"
+"                field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_11
+msgid "Brake Caliper Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,odometer:0
+msgid "Last Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu
+msgid "Vehicle Model"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,doors:0
+msgid "Doors Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,acquisition_date:0
+msgid "Date when the vehicle has been bought"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+msgid "Models"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "amount"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,fuel_type:0
+msgid "Fuel Used by the vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Set Contract In Progress"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_unit:0
+#: field:fleet.vehicle.odometer,unit:0
+msgid "Unit"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower:0
+msgid "Horsepower"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,image:0
+#: field:fleet.vehicle,image_medium:0
+#: field:fleet.vehicle,image_small:0
+#: field:fleet.vehicle.model,image:0
+#: field:fleet.vehicle.model,image_medium:0
+#: field:fleet.vehicle.model,image_small:0
+#: field:fleet.vehicle.model.brand,image:0
+msgid "Logo"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,horsepower_tax:0
+msgid "Horsepower Taxation"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,log_services:0
+#: view:fleet.vehicle.log.services:0
+msgid "Services Logs"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_43
+msgid "Thermostat Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,category:0
+msgid "Category"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph
+msgid "Fuel Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image:0
+msgid ""
+"This field holds the image used as logo for the brand, limited to "
+"1024x1024px."
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_11
+msgid "Management Fee"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "All vehicles"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Additional Details"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph
+msgid "Services Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_9
+msgid "Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,price_per_liter:0
+msgid "Price Per Liter"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_17
+msgid "Door Window Motor/Regulator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_46
+msgid "Tire Service"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_8
+msgid "Ball Joint Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,fuel_type:0
+msgid "Fuel Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_22
+msgid "Fuel Injector Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_50
+msgid "Water Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,location:0
+msgid "Location of the vehicle (garage, ...)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_28
+msgid "Heater Hose Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,state:0
+msgid "Status"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_40
+msgid "Rotor Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model,brand:0
+msgid "Brand of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,start_date:0
+msgid "Date when the coverage of the contract begins"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,fuel_type:0
+msgid "Electric"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: field:fleet.vehicle,log_contracts:0
+msgid "Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_13
+msgid "Brake Pad(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Odometer Details"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,driver:0
+msgid "Driver"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_small:0
+msgid ""
+"Small-sized photo of the brand. It is automatically resized as a 64x64px "
+"image, with aspect ratio preserved. Use this field anywhere a small image is "
+"required."
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Fleet Dashboard"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break
+msgid "Break"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_omnium
+msgid "Omnium"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Services Details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_15
+msgid "Residual value (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_7
+msgid "Alternator Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_3
+msgid "A/C Diagnosis"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_23
+msgid "Fuel Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Activation Cost"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Type"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_4
+msgid "A/C Evaporator Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show all the costs for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Values Per Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_comment_ids:0
+#: help:fleet.vehicle,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new vehicle. \n"
+"              </p><p>\n"
+"                You will be able to manage your fleet by keeping track of "
+"the\n"
+"                contracts, services, fixed and recurring costs, odometers "
+"and\n"
+"                fuel logs associated to each vehicle.\n"
+"            </p><p>\n"
+"                OpenERP will warn you when services or contract have to be\n"
+"                renewed.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_13
+msgid "Entry into service tax"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,expiration_date:0
+msgid "Contract Expiration Date"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Subtype"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.open_board_fleet
+msgid ""
+"<div class=\"oe_empty_custom_dashboard\">\n"
+"                  <p>\n"
+"                    <b>Fleet dashboard is empty.</b>\n"
+"                  </p><p>\n"
+"                    To add your first report into this dashboard, go to any\n"
+"                    menu, switch to list or graph view, and click <i>'Add "
+"to\n"
+"                    Dashboard'</i> in the extended search options.\n"
+"                  </p><p>\n"
+"                    You can filter and group data before inserting into the\n"
+"                    dashboard using the search options.\n"
+"                  </p>\n"
+"              </div>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_12
+msgid "Rent (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Kilometers"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.fuel:0
+msgid "Vehicle Details"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.service.type,category:0
+#: field:fleet.vehicle.cost,contract_id:0
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Contract"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu
+msgid "Model brand of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_10
+msgid "Battery Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,date:0
+#: field:fleet.vehicle.odometer,date:0
+msgid "Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu
+#: model:ir.ui.menu,name:fleet.fleet_vehicles
+msgid "Vehicles"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle,odometer_unit:0
+msgid "Miles"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,cost_generated:0
+msgid ""
+"Costs paid at regular intervals, depending on the cost frequency. If the "
+"cost frequency is set to unique, the cost will be logged at the start date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_17
+msgid "Emissions"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
+#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
+msgid ""
+"<p>\n"
+"          OpenERP helps you managing the costs for your different vehicles\n"
+"          Costs are generally created from services and contract and appears "
+"here.\n"
+"        </p>\n"
+"        <p>\n"
+"          Thanks to the different filters, OpenERP can only print the "
+"effective\n"
+"          costs, sort them by type and by vehicle.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,car_value:0
+msgid "Car Value"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
+#: model:ir.ui.menu,name:fleet.menu_root
+msgid "Fleet"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_14
+msgid "Total expenses (Excluding VAT)"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer_id:0
+msgid "Odometer"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_45
+msgid "Tire Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.service.type:0
+msgid "Service types"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.fuel,purchaser_id:0
+#: field:fleet.vehicle.log.services,purchaser_id:0
+msgid "Purchaser"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_3
+msgid "Tax roll"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.model:0
+#: field:fleet.vehicle.model,vendors:0
+msgid "Vendors"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_leasing
+msgid "Leasing"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.model.brand,image_medium:0
+msgid ""
+"Medium-sized logo of the brand. It is automatically resized as a 128x128px "
+"image, with aspect ratio preserved. Use this field in form views or some "
+"kanban views."
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Weekly"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.odometer:0
+msgid "Odometer Logs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,acquisition_date:0
+msgid "Acquisition Date"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_odometer
+msgid "Odometer log for a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_type:0
+msgid "Category of the cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_5
+#: model:fleet.service.type,name:fleet.type_service_service_7
+msgid "Summer tires"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,contract_renewal_due_soon:0
+msgid "Has Contracts to renew"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_31
+msgid "Oil Change"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand
+msgid "Brand model of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_51
+msgid "Wheel Alignment"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased
+msgid "Purchased"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act
+msgid ""
+"<p>\n"
+"                Here you can add various odometer entries for all vehicles.\n"
+"                You can also show odometer value for a particular vehicle "
+"using\n"
+"                the search field.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new model.\n"
+"              </p><p>\n"
+"                You can define several models (e.g. A3, A4) for each brand "
+"(Audi).\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "General Properties"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_21
+msgid "Exhaust Manifold Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_47
+msgid "Transmission Filter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_10
+msgid "Replacement Vehicle"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,cost_frequency:0
+msgid "Yearly"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "States of Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model,modelname:0
+msgid "Model name"
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph
+msgid "Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_18
+msgid "Touring Assistance"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,power:0
+msgid "Power (kW)"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:418
+#, python-format
+msgid "State: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_2
+msgid "A/C Condenser Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_19
+msgid "Engine Coolant Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+msgid "Cost Details"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:410
+#, python-format
+msgid "Model: from '%s' to '%s'"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Other"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract details"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing
+msgid "Employee Car"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,auto_generated:0
+msgid "Automatically Generated"
+msgstr ""
+
+#. module: fleet
+#: selection:fleet.vehicle.cost,cost_type:0
+msgid "Fuel"
+msgstr ""
+
+#. module: fleet
+#: sql_constraint:fleet.vehicle.state:0
+msgid "State name already exists"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_37
+msgid "Radiator Repair"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_log_contract
+msgid "Contract information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,days_left:0
+msgid "Warning Date"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_19
+msgid "Residual value in %"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Additional Properties"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_state
+msgid "fleet.vehicle.state"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract Costs Per Month"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu
+msgid "Vehicles Contracts"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_48
+msgid "Transmission Fluid Replacement"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.model.brand,name:0
+msgid "Brand Name"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_36
+msgid "Power Steering Pump Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,contract_id:0
+msgid "Contract attached to this cost"
+msgstr ""
+
+#. module: fleet
+#: code:addons/fleet/fleet.py:397
+#, python-format
+msgid "Vehicle %s has been added to the fleet!"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.fuel:0
+#: view:fleet.vehicle.log.services:0
+msgid "Price"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,vehicle_id:0
+#: field:fleet.vehicle.odometer,vehicle_id:0
+msgid "Vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,cost_ids:0
+#: view:fleet.vehicle.log.contract:0
+#: view:fleet.vehicle.log.services:0
+msgid "Included Services"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban
+msgid ""
+"<p>\n"
+"          Here are displayed vehicles for which one or more contracts need "
+"to be renewed. If you see this message, then there is no contracts to "
+"renew.\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_15
+msgid "Catalytic Converter Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_25
+msgid "Heater Blower Motor Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu
+msgid "Vehicles Odometer"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.log.contract,notes:0
+msgid "Write here all supplementary informations relative to this contract"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_29
+msgid "Ignition Coil Replacement"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_service_16
+msgid "Options"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_contract_repairing
+msgid "Repairing"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs
+#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs
+msgid "Costs Analysis"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.log.contract,ins_ref:0
+msgid "Contract Reference"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.service.type,name:0
+#: field:fleet.vehicle,name:0
+#: field:fleet.vehicle.cost,name:0
+#: field:fleet.vehicle.log.contract,name:0
+#: field:fleet.vehicle.model,name:0
+#: field:fleet.vehicle.odometer,name:0
+#: field:fleet.vehicle.state,name:0
+#: field:fleet.vehicle.tag,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,doors:0
+msgid "Number of doors of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,transmission:0
+msgid "Transmission"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,vin_sn:0
+msgid "Chassis Number"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,color:0
+msgid "Color of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new service entry. \n"
+"              </p><p>\n"
+"                OpenERP helps you keeping track of all the services done\n"
+"                on your vehicle. Services can be of many type: occasional\n"
+"                repair, fixed maintenance, etc.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,co2:0
+msgid "CO2 Emissions"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+msgid "Contract logs"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph
+msgid "Contracts Costs by Month"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,model_id:0
+#: view:fleet.vehicle.model:0
+msgid "Model"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_41
+msgid "Spark Plug Replacement"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle
+msgid "Information on a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,co2:0
+msgid "CO2 emissions of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_53
+msgid "Windshield Wiper(s) Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.contract:0
+#: field:fleet.vehicle.log.contract,generated_cost_ids:0
+msgid "Generated Costs"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle,color:0
+msgid "Color"
+msgstr ""
+
+#. module: fleet
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new type of service.\n"
+"              </p><p>\n"
+"                Each service can used in contracts, as a standalone service "
+"or both.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: fleet
+#: view:board.board:0
+msgid "Services Costs"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,seats:0
+msgid "Number of seats of the vehicle"
+msgstr ""
+
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Cost"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_39
+msgid "Rotate Tires"
+msgstr ""
+
+#. module: fleet
+#: model:fleet.service.type,name:fleet.type_service_42
+msgid "Starter Replacement"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,year:0
+msgid "Year"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle,license_plate:0
+msgid "License plate number of the vehicle (ie: plate number for a car)"
+msgstr ""
+
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_contract_state
+msgid "Contains the different possible status of a leasing contract"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle:0
+msgid "show the contract for this vehicle"
+msgstr ""
+
+#. module: fleet
+#: view:fleet.vehicle.log.services:0
+msgid "Total"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.service.type,category:0
+msgid ""
+"Choose wheter the service refer to contracts, vehicle services or both"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.cost,cost_type:0
+msgid "For internal purpose only"
+msgstr ""
+
+#. module: fleet
+#: help:fleet.vehicle.state,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
diff --git a/addons/google_base_account/i18n/zh_CN.po b/addons/google_base_account/i18n/zh_CN.po
index 40b08fb64c9..391d9f10409 100644
--- a/addons/google_base_account/i18n/zh_CN.po
+++ b/addons/google_base_account/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-16 12:46+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 15:28+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
@@ -25,7 +25,7 @@ msgstr "用户名："
 #. module: google_base_account
 #: view:res.users:0
 msgid "Synchronization"
-msgstr ""
+msgstr "同步"
 
 #. module: google_base_account
 #: model:ir.actions.act_window,name:google_base_account.act_google_login_form
@@ -41,7 +41,7 @@ msgstr "导入Google联系人失败！"
 #. module: google_base_account
 #: model:ir.model,name:google_base_account.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #. module: google_base_account
 #: constraint:res.users:0
@@ -56,7 +56,7 @@ msgstr "两个用户不能使用相同的用户名！"
 #. module: google_base_account
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID必须是每个提供者（ provider ）唯一的"
 
 #. module: google_base_account
 #: view:google.login:0
@@ -71,13 +71,13 @@ msgstr "Google密码"
 #. module: google_base_account
 #: view:google.login:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: google_base_account
 #: view:res.users:0
@@ -87,13 +87,13 @@ msgstr "Google 帐户"
 #. module: google_base_account
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:77
 #, python-format
 msgid "Authentication failed. Check the user and password."
-msgstr ""
+msgstr "身份授权失败。检查用户名和密码。"
 
 #. module: google_base_account
 #: code:addons/google_base_account/wizard/google_login.py:29
@@ -113,7 +113,7 @@ msgstr "Google联系人"
 #. module: google_base_account
 #: view:google.login:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: google_base_account
 #: field:google.login,user:0
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 9db2e181c8e..3678d669560 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-10 17:47+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-30 00:11+0000\n"
+"Last-Translator: Fabio Graziosi <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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -597,7 +597,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account Number"
-msgstr ""
+msgstr "Numero C/C Bancario"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index 658d6c6b71d..95a375ccd0f 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-09-03 17:10+0000\n"
+"PO-Revision-Date: 2012-11-29 15:03+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-11-25 06:12+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -24,7 +24,7 @@ msgstr "OpenERP gebruiker"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "Allow timesheets validation by managers"
-msgstr ""
+msgstr "Urenstaaat controle door managers"
 
 #. module: hr
 #: field:hr.job,requirements:0
@@ -59,11 +59,14 @@ msgid ""
 "128x128px image, with aspect ratio preserved. Use this field in form views "
 "or some kanban views."
 msgstr ""
+"Foto van gemiddeld formaat van de werknemer. Deze afbeelding wordt, in "
+"verhouding, geschaald naar 128x128px. Gebruik dit veld in de formulier "
+"weergave of sommige kanban weergaven."
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Time Tracking"
-msgstr ""
+msgstr "Tijdregistratie"
 
 #. module: hr
 #: view:hr.employee:0
@@ -84,7 +87,7 @@ msgstr "Huidige aantal werknemers welke deze functie bekleden ."
 #. module: hr
 #: field:hr.config.settings,module_hr_evaluation:0
 msgid "Organize employees periodic evaluation"
-msgstr ""
+msgstr "Organiseer periodieke werknemer beoordelingen"
 
 #. module: hr
 #: view:hr.department:0
@@ -106,11 +109,13 @@ msgid ""
 "This field holds the image used as photo for the employee, limited to "
 "1024x1024px."
 msgstr ""
+"Dit veld bevat de afbeelding, welke wordt gebruikt als foto voor de "
+"werknemer. Maximale grootte 1024x1024px."
 
 #. module: hr
 #: help:hr.config.settings,module_hr_holidays:0
 msgid "This installs the module hr_holidays."
-msgstr ""
+msgstr "Dit installeert de module hr_holidays."
 
 #. module: hr
 #: view:hr.job:0
@@ -125,7 +130,7 @@ msgstr "Wordt geworven"
 #. module: hr
 #: field:hr.job,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Ongelezen berichten"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -143,32 +148,32 @@ msgstr "Werving verwacht"
 #. module: hr
 #: field:res.users,employee_ids:0
 msgid "Related employees"
-msgstr ""
+msgstr "Betreffende werknemers"
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error! You cannot create recursive Categories."
-msgstr ""
+msgstr "Fout! het is niet toegestaan om recursieve categorieën te maken."
 
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
 msgid "This installs the module hr_recruitment."
-msgstr ""
+msgstr "Dit installeert de module hr_recruitment."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Birth"
-msgstr ""
+msgstr "Geboortedatum"
 
 #. module: hr
 #: field:hr.employee,last_login:0
 msgid "Latest Connection"
-msgstr ""
+msgstr "Laatste verbinding"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Launch Recruitement"
-msgstr ""
+msgstr "Start werving en selectie"
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -193,22 +198,22 @@ msgstr "Getrouwd"
 #. module: hr
 #: field:hr.job,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Berichten"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Talent Management"
-msgstr ""
+msgstr "Kwaliteiten beheer"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet_sheet:0
 msgid "This installs the module hr_timesheet_sheet."
-msgstr ""
+msgstr "Dit installeert de module hr_timesheet_sheet."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Mobile:"
-msgstr ""
+msgstr "Mobiel:"
 
 #. module: hr
 #: view:hr.employee:0
@@ -218,7 +223,7 @@ msgstr "Baan"
 #. module: hr
 #: help:hr.job,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
 
 #. module: hr
 #: field:hr.employee,color:0
@@ -237,7 +242,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,image_medium:0
 msgid "Medium-sized photo"
-msgstr ""
+msgstr "Foto van gemiddelde grootte"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
@@ -253,7 +258,7 @@ msgstr "Vrouw"
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employees"
-msgstr ""
+msgstr "Werknemer categorieën"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -284,7 +289,7 @@ msgstr "Locatie kantoor"
 #. module: hr
 #: field:hr.job,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Volgers"
 
 #. module: hr
 #: view:hr.employee:0
@@ -305,6 +310,9 @@ msgid ""
 "image, with aspect ratio preserved. Use this field anywhere a small image is "
 "required."
 msgstr ""
+"Kleinen foto van de werknemer. Deze foto wordt automatisch, in verhouding, "
+"geschaald naar 64x64px. Gebruik dit veld, overal waar een kleine afbeelding "
+"nodig is."
 
 #. module: hr
 #: field:hr.employee,birthday:0
@@ -319,7 +327,7 @@ msgstr "Verwachte aantal te werven nieuwe werknemers."
 #. module: hr
 #: model:ir.actions.client,name:hr.action_client_hr_menu
 msgid "Open HR Menu"
-msgstr ""
+msgstr "Personeelsbeheer menu openen"
 
 #. module: hr
 #: help:hr.job,message_summary:0
@@ -327,6 +335,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
+"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
+"ingevoegd."
 
 #. module: hr
 #: help:hr.config.settings,module_account_analytic_analysis:0
@@ -334,11 +345,13 @@ msgid ""
 "This installs the module account_analytic_analysis, which will install sales "
 "management too."
 msgstr ""
+"Dit installeert de module  account_analytic_analysis, welke tevens de "
+"verkoopbeheer modules zal installeren."
 
 #. module: hr
 #: view:board.board:0
 msgid "Human Resources Dashboard"
-msgstr "Personeel dashboard"
+msgstr "Personeelsbeheer dashboard"
 
 #. module: hr
 #: view:hr.employee:0
@@ -350,7 +363,7 @@ msgstr "Functie"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Current Number of Employees"
-msgstr ""
+msgstr "Huidig aantal werknemers"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -365,7 +378,7 @@ msgstr "Instellingen"
 #. module: hr
 #: field:hr.config.settings,module_hr_expense:0
 msgid "Manage employees expenses"
-msgstr ""
+msgstr "Beheers werknemers declaraties"
 
 #. module: hr
 #: help:hr.job,expected_employees:0
@@ -376,7 +389,7 @@ msgstr "Verwachte aantal werknemers voor deze functie na de nieuwe werving."
 #. module: hr
 #: view:hr.employee:0
 msgid "Tel:"
-msgstr ""
+msgstr "Tel:"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -391,7 +404,7 @@ msgstr "Bovenliggende categorie"
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "OAuth UID must be unique per provider"
-msgstr ""
+msgstr "OAuth UID moet uniek zijn per provider"
 
 #. module: hr
 #: view:hr.department:0
@@ -439,26 +452,30 @@ msgid ""
 "$('.oe_employee_picture').load(function() { if($(this).width() > "
 "$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 msgstr ""
+"$('.oe_employee_picture').load(function() { if($(this).width() > "
+"$(this).height()) { $(this).addClass('oe_employee_picture_wide') } });"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_evaluation:0
 msgid "This installs the module hr_evaluation."
-msgstr ""
+msgstr "Dit installeert de module  hr_evaluation."
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
 msgstr ""
+"Fout! Het is niet toegestaan om een recursieve werknemer hiërarchie aan te "
+"maken."
 
 #. module: hr
 #: help:hr.config.settings,module_hr_attendance:0
 msgid "This installs the module hr_attendance."
-msgstr ""
+msgstr "Dit installeert de module  hr_attendance."
 
 #. module: hr
 #: field:hr.employee,image_small:0
 msgid "Smal-sized photo"
-msgstr ""
+msgstr "Kleine foto"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -469,12 +486,12 @@ msgstr "Categorie werknemer"
 #. module: hr
 #: field:hr.employee,category_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Labels"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_contract:0
 msgid "This installs the module hr_contract."
-msgstr ""
+msgstr "Dit installeert de module hr_contact."
 
 #. module: hr
 #: view:hr.employee:0
@@ -484,7 +501,7 @@ msgstr "Gekoppelde gebruiker"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -494,12 +511,12 @@ msgstr "Categorie"
 #. module: hr
 #: view:hr.job:0
 msgid "Stop Recruitment"
-msgstr ""
+msgstr "Werving en selectie stoppen"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_attendance:0
 msgid "Install attendances feature"
-msgstr ""
+msgstr "Installeer aanwezigheids opties"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
@@ -529,7 +546,7 @@ msgstr "Contactgegevens"
 #. module: hr
 #: field:hr.config.settings,module_hr_holidays:0
 msgid "Manage holidays, leaves and allocation requests"
-msgstr ""
+msgstr "Beheer vakanties, verlof en wijs aanvragen toe."
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -556,12 +573,12 @@ msgstr "Arbeidsovereenkomst"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Contracts"
-msgstr ""
+msgstr "Contracten"
 
 #. module: hr
 #: help:hr.job,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Berichten en communicatie historie"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -571,12 +588,12 @@ msgstr "BSN nummer"
 #. module: hr
 #: field:hr.job,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Is een volger"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_recruitment:0
 msgid "Manage the recruitment process"
-msgstr ""
+msgstr "Beheers het werving en selectie proces"
 
 #. module: hr
 #: view:hr.employee:0
@@ -586,17 +603,17 @@ msgstr "Actief"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Human Resources Management"
-msgstr ""
+msgstr "Personeelsbeheer"
 
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Install your country's payroll"
-msgstr ""
+msgstr "Installeer uw land specifieke salarisadministratie"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account Number"
-msgstr "Nummer bankrekening"
+msgstr "Bankrekeningnummer"
 
 #. module: hr
 #: view:hr.department:0
@@ -606,7 +623,7 @@ msgstr "Bedrijven"
 #. module: hr
 #: field:hr.job,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -635,17 +652,17 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "HR Settings"
-msgstr ""
+msgstr "Personeelsbeheer instellingen"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Citizenship & Other Info"
-msgstr ""
+msgstr "Nationaliteit & andere informatie"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You cannot create recursive departments."
-msgstr ""
+msgstr "Fout! het is niet toegestaan recursieve afdelingen aan te maken."
 
 #. module: hr
 #: sql_constraint:res.users:0
@@ -660,7 +677,7 @@ msgstr "Werkadres"
 #. module: hr
 #: view:hr.employee:0
 msgid "Public Information"
-msgstr ""
+msgstr "Publieke informatie"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -685,7 +702,7 @@ msgstr "Foto"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -704,13 +721,13 @@ msgstr ""
 #. module: hr
 #: help:hr.config.settings,module_hr_timesheet:0
 msgid "This installs the module hr_timesheet."
-msgstr ""
+msgstr "Dit installeert de module hr_timesheet."
 
 #. module: hr
 #: field:hr.job,message_comment_ids:0
 #: help:hr.job,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Opmerkingen en e-mails."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -749,13 +766,15 @@ msgstr "Mobiel nummer werk"
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Recruitement in Progress"
-msgstr ""
+msgstr "Werving en selectie in behandeling"
 
 #. module: hr
 #: field:hr.config.settings,module_account_analytic_analysis:0
 msgid ""
 "Allow invoicing based on timesheets (the sale application will be installed)"
 msgstr ""
+"Sta facturering op basis van urenstaten (de verkoopbeheer  module wordt "
+"geinstalleerd)"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -775,7 +794,7 @@ msgstr "Privé-adres"
 #. module: hr
 #: field:hr.config.settings,module_hr_timesheet:0
 msgid "Manage timesheets"
-msgstr ""
+msgstr "Urenstaten beheren"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -806,7 +825,7 @@ msgstr "Is vervuld"
 #. module: hr
 #: help:hr.config.settings,module_hr_payroll:0
 msgid "This installs the module hr_payroll."
-msgstr ""
+msgstr "Dit installeert de module hr_payroll."
 
 #. module: hr
 #: field:hr.config.settings,module_hr_contract:0
@@ -826,7 +845,7 @@ msgstr "Nationaliteit"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Additional Features"
-msgstr ""
+msgstr "Extra opties"
 
 #. module: hr
 #: field:hr.employee,notes:0
@@ -879,23 +898,23 @@ msgstr "Naam afdeling"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting_timesheet
 msgid "Reports"
-msgstr ""
+msgstr "Rapportages"
 
 #. module: hr
 #: field:hr.config.settings,module_hr_payroll:0
 msgid "Manage payroll"
-msgstr ""
+msgstr "Loonadministratie"
 
 #. module: hr
 #: view:hr.config.settings:0
 #: model:ir.actions.act_window,name:hr.action_human_resources_configuration
 msgid "Configure Human Resources"
-msgstr ""
+msgstr "Personeelsbeheer instellen"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "No Recruitment"
-msgstr ""
+msgstr "Geen werving en selectie"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
@@ -915,7 +934,7 @@ msgstr "Login"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Forecasted Employees"
-msgstr ""
+msgstr "Totaal aantal verwachte werknmers"
 
 #. module: hr
 #: help:hr.job,state:0
@@ -927,7 +946,7 @@ msgstr ""
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
@@ -968,12 +987,12 @@ msgstr "De naam van de functie  moet uniek zijn per bedrijf!"
 #. module: hr
 #: help:hr.config.settings,module_hr_expense:0
 msgid "This installs the module hr_expense."
-msgstr ""
+msgstr "Dit installeert de module hr_expense."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr
 #: field:hr.department,manager_id:0
@@ -985,7 +1004,7 @@ msgstr "Manager"
 #. module: hr
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fout: Ongeldige EAN-code"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -1000,7 +1019,7 @@ msgstr "Ondergeschikten"
 #. module: hr
 #: view:hr.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Toepassen"
 
 #~ msgid "Error! You can not create recursive departments."
 #~ msgstr "Fout! U kunt geen recursieve afdelingen aanmaken."
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 919cbcc678e..1d55acccbac 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,14 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-27 15:32+0000\n"
+"PO-Revision-Date: 2012-11-28 16:54+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: hr
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr "错误！，你不能创建循环的员工等级"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -148,7 +153,7 @@ msgstr "相关的员工"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error! You cannot create recursive Categories."
-msgstr "错误！你不能创建递归的分类。"
+msgstr "错误！你不能创建循环的分类。"
 
 #. module: hr
 #: help:hr.config.settings,module_hr_recruitment:0
@@ -455,11 +460,6 @@ msgid "This installs the module hr_evaluation."
 msgstr "为此要安装模块 hr_evaluation."
 
 #. module: hr
-#: constraint:hr.employee:0
-msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr "错误！，你不能创建递归的员工层次"
-
-#. module: hr
 #: help:hr.config.settings,module_hr_attendance:0
 msgid "This installs the module hr_attendance."
 msgstr "为此要安装模块 hr_attendance."
@@ -660,7 +660,7 @@ msgstr "国籍和其他信息"
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You cannot create recursive departments."
-msgstr "错误！你不能创建递归的部门"
+msgstr "错误！你不能创建循环的部门"
 
 #. module: hr
 #: sql_constraint:res.users:0
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index 5016923c645..3ed9cfad779 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-05-10 17:49+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 11:12+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:15+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
@@ -29,7 +29,7 @@ msgstr "人力资源考勤搜索"
 #. module: hr_attendance
 #: field:hr.employee,last_sign:0
 msgid "Last Sign"
-msgstr ""
+msgstr "上次签到"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -43,12 +43,12 @@ msgstr "考勤"
 #: code:addons/hr_attendance/static/src/js/attendance.js:34
 #, python-format
 msgid "Last sign in: %s,<br />%s.<br />Click to sign out."
-msgstr ""
+msgstr "上次签到：%s,<br />%s.<br />，单击 签出。"
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
 msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "错误"
 
 #. module: hr_attendance
 #: help:hr.action.reason,name:0
@@ -70,7 +70,7 @@ msgstr "打印每月考勤报表"
 #: code:addons/hr_attendance/report/timesheet.py:122
 #, python-format
 msgid "Attendances by Week"
-msgstr ""
+msgstr "周出席率"
 
 #. module: hr_attendance
 #: selection:hr.action.reason,action_type:0
@@ -104,7 +104,7 @@ msgstr "签出"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No records are found for your selection!"
-msgstr ""
+msgstr "没找到你要的计量"
 
 #. module: hr_attendance
 #: view:hr.attendance.error:0
@@ -170,12 +170,12 @@ msgstr "警告"
 #. module: hr_attendance
 #: help:hr.config.settings,group_hr_attendance:0
 msgid "Allocates attendance group to all users."
-msgstr ""
+msgstr "分配出席组给全体用户"
 
 #. module: hr_attendance
 #: field:hr.employee,attendance_access:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -191,7 +191,7 @@ msgstr "6月"
 #: code:addons/hr_attendance/report/attendance_by_month.py:193
 #, python-format
 msgid "Attendances by Month"
-msgstr ""
+msgstr "月度出勤率"
 
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_week
@@ -244,7 +244,7 @@ msgstr "日期"
 #. module: hr_attendance
 #: field:hr.config.settings,group_hr_attendance:0
 msgid "Track attendances for all employees"
-msgstr ""
+msgstr "跟踪全体员工出席率"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -328,7 +328,7 @@ msgstr "1月"
 #: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
 #, python-format
 msgid "No Data Available !"
-msgstr ""
+msgstr "无可用数据"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
@@ -401,14 +401,14 @@ msgstr "打印每周考勤报表"
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_config_settings
 msgid "hr.config.settings"
-msgstr ""
+msgstr "hr.config.settings"
 
 #. module: hr_attendance
 #. openerp-web
 #: code:addons/hr_attendance/static/src/js/attendance.js:36
 #, python-format
 msgid "Click to Sign In at %s."
-msgstr ""
+msgstr "单击登录在 %s."
 
 #. module: hr_attendance
 #: field:hr.action.reason,action_type:0
@@ -448,7 +448,7 @@ msgstr "操作"
 #. module: hr_attendance
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "错误！，你不能创建循环的员工等级"
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -461,7 +461,7 @@ msgstr "(*)负数延期表示员工的工作时间超过记录的时间"
 #: view:hr.attendance.month:0
 #: view:hr.attendance.week:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index 4cd9668d803..b143238c2b7 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-10-25 17:16+0000\n"
+"PO-Revision-Date: 2012-11-28 15:27+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -83,7 +83,7 @@ msgstr "评估阶段"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Request"
-msgstr ""
+msgstr "发送请求"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -96,7 +96,7 @@ msgstr "这个月份将在选择的考评计划里对员工进行首次考评。
 #: view:hr.employee:0
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
 msgid "Appraisals"
-msgstr ""
+msgstr "评估"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -107,7 +107,7 @@ msgstr "(eval_name)s:评估名称"
 #: field:hr.evaluation.interview,message_ids:0
 #: field:hr_evaluation.evaluation,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -141,13 +141,13 @@ msgstr "没有达到预期"
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
 msgid "Appraisal"
-msgstr "考评"
+msgstr "评估"
 
 #. module: hr_evaluation
 #: help:hr.evaluation.interview,message_unread:0
 #: help:hr_evaluation.evaluation,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -215,7 +215,7 @@ msgstr "在计划执行阶段的评估"
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -232,7 +232,7 @@ msgstr "截止日期"
 #: code:addons/hr_evaluation/hr_evaluation.py:326
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -252,7 +252,7 @@ msgstr "(date)s: 当前日期"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Interviews"
-msgstr ""
+msgstr "面试"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:82
@@ -264,13 +264,13 @@ msgstr "关于 "
 #: field:hr.evaluation.interview,message_follower_ids:0
 #: field:hr_evaluation.evaluation,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,message_unread:0
 #: field:hr_evaluation.evaluation,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -391,6 +391,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击定义一个评估计划 \n"
+"              </p><p>\n"
+"                你能定义评估计划(例如：6个月后首次面谈，然后每年一次).\n"
+"                然后每个员工能关联到一个评估计划，这样Openerp 能自动\n"
+"                生成一个面谈要求给管理人员和下属.\n"
+"              </p>\n"
+"            "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -405,7 +413,7 @@ msgstr "行动计划"
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Appraisal"
-msgstr "定义复核"
+msgstr "定期评估"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
@@ -438,7 +446,7 @@ msgstr "所有答案"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "填写问卷"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -549,7 +557,7 @@ msgstr " (employee_name)s: 业务伙伴名称"
 #: field:hr.evaluation.interview,message_is_follower:0
 #: field:hr_evaluation.evaluation,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -580,7 +588,7 @@ msgstr "增加筛选条件"
 #: field:hr_evaluation.evaluation,message_comment_ids:0
 #: help:hr_evaluation.evaluation,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
@@ -733,7 +741,7 @@ msgstr "取消"
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
+msgstr "错误！，你不能创建循环的员工层次"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -836,7 +844,7 @@ msgstr "阶段"
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr "自下而上的考评申请"
+msgstr "自下而上的评估申请"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -847,7 +855,7 @@ msgstr "2月"
 #: view:hr.evaluation.interview:0
 #: view:hr_evaluation.evaluation:0
 msgid "Interview Appraisal"
-msgstr "面谈评估"
+msgstr "面谈测评"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
@@ -871,7 +879,7 @@ msgstr "面谈员工"
 msgid ""
 "You cannot change state, because some appraisal(s) are in waiting answer or "
 "draft state."
-msgstr ""
+msgstr "你不能改变状态，因为有些评估正在等待结果。"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -887,7 +895,7 @@ msgstr "评估计划阶段"
 #: help:hr.evaluation.interview,message_ids:0
 #: help:hr_evaluation.evaluation,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 092424ef7e6..361a3d8c74f 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -20,5 +20,3 @@ access_account_move_user,account.move.user,account.model_account_move,base.group
 access_account_move_line_user,account.move.line.user,account.model_account_move_line,base.group_hr_user,1,1,1,1

 access_account_analytic_line_user,account.ianalytic.line.user,account.model_account_analytic_line,base.group_hr_user,1,1,1,1

 access_account_journal_period_manager,account.journal.period.manager,account.model_account_journal_period,base.group_hr_manager,1,1,1,1

-hr.access_account_journal_view_hruser,account.journal.view hruser,account.model_account_journal_view,base.group_hr_user,1,0,0,0

-hr.access_account_journal_column_hruser,account.journal.column hruser,account.model_account_journal_column,base.group_hr_user,1,0,0,0

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1914d30ec05..aba6dd36538 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -3,7 +3,7 @@
 
         <!-- Hr holidays Read/Unread actions -->
         <record id="actions_server_holidays_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Holidays: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>
@@ -21,7 +21,7 @@
         </record>
 
         <record id="actions_server_holidays_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Holidays: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 53182ce1413..c98d0d9a578 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-09-03 17:12+0000\n"
+"PO-Revision-Date: 2012-11-29 15:39+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-11-25 06:11+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -62,7 +62,7 @@ msgstr "Reserveringsmode"
 #. module: hr_holidays
 #: field:hr.employee,leave_date_from:0
 msgid "From Date"
-msgstr ""
+msgstr "Vanaf datum"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -146,7 +146,7 @@ msgstr "Huidige verlof"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Validate"
-msgstr ""
+msgstr "Bevestig"
 
 #. module: hr_holidays
 #: selection:hr.employee,current_leave_state:0
@@ -188,7 +188,7 @@ msgstr "Verlof"
 #. module: hr_holidays
 #: field:hr.holidays,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Berichten"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
@@ -199,7 +199,7 @@ msgstr "Verlof"
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fout!"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
@@ -247,7 +247,7 @@ msgstr "Controle"
 #. module: hr_holidays
 #: help:hr.holidays,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -278,6 +278,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
+"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
+"ingevoegd."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:230
@@ -347,7 +350,7 @@ msgstr "Tarwe"
 #. module: hr_holidays
 #: field:hr.holidays,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Volgers"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
@@ -391,7 +394,7 @@ msgstr "Lichtzalm"
 #. module: hr_holidays
 #: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
 msgid "Mark read"
-msgstr ""
+msgstr "Markeer als gelezen"
 
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
@@ -521,7 +524,7 @@ msgstr "Lavendel"
 #. module: hr_holidays
 #: field:hr.holidays,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Ongelezen berichten"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -551,7 +554,7 @@ msgstr ""
 #: view:hr.holidays.summary.dept:0
 #: view:hr.holidays.summary.employee:0
 msgid "or"
-msgstr ""
+msgstr "of"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -590,12 +593,12 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Reset to New"
-msgstr ""
+msgstr "Terugzetten op Nieuw"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0."
-msgstr ""
+msgstr "Het aantal dagen moet groter zijn dan nul."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -605,7 +608,7 @@ msgstr "Lichtkoraal"
 #. module: hr_holidays
 #: field:hr.employee,leave_date_to:0
 msgid "To Date"
-msgstr ""
+msgstr "T/m datum"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -633,7 +636,7 @@ msgstr ""
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -653,7 +656,7 @@ msgstr "Eerder opgenomen verlof"
 #. module: hr_holidays
 #: field:hr.holidays,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Is een volger"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -670,7 +673,7 @@ msgstr "Actief"
 #: field:hr.holidays,message_comment_ids:0
 #: help:hr.holidays,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Opmerkingen en e-mails."
 
 #. module: hr_holidays
 #: view:hr.employee:0
@@ -686,7 +689,7 @@ msgstr "Eerste goedkeuring"
 #. module: hr_holidays
 #: field:hr.holidays,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
@@ -706,7 +709,7 @@ msgstr "Verlof samenvatting"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Submit to Manager"
-msgstr ""
+msgstr "Aanbieden aan manager"
 
 #. module: hr_holidays
 #: view:hr.employee:0
@@ -779,6 +782,8 @@ msgstr "Annuleren"
 #: constraint:hr.employee:0
 msgid "Error! You cannot create recursive hierarchy of Employee(s)."
 msgstr ""
+"Fout! Het is niet toegestaan om een recursieve werknemer hiërarchie aan te "
+"maken."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:230
@@ -806,7 +811,7 @@ msgstr "Gebruik dubbele goedkeuring"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "days"
-msgstr ""
+msgstr "dagen"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
@@ -863,7 +868,7 @@ msgstr "Omschrijving"
 #: code:addons/hr_holidays/hr_holidays.py:453
 #, python-format
 msgid "Request <b>refused</b>"
-msgstr ""
+msgstr "Aanvraag <b>geewijgerd</b>"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
@@ -877,7 +882,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Soort afspraak"
 
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
@@ -937,7 +942,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
 msgid "Mark unread"
-msgstr ""
+msgstr "Markeer als ongelezen"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -958,7 +963,7 @@ msgstr "Goedkeuren"
 #. module: hr_holidays
 #: help:hr.holidays,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Berichten en communicatie historie"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:241
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index 972677ea688..32438f5aa66 100644
--- a/addons/hr_payroll/i18n/fr.po
+++ b/addons/hr_payroll/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-01-18 16:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-29 15:38+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:21+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -674,9 +674,9 @@ msgid ""
 "inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
 "Il est utilisé dans le calcul. Par exemple : une règle sur les ventes pour "
-"quelqu'un percevant une commission de 1% du salaire de base par produit  "
-"peut être défini par l'expression comme résultat = inputs.SALEURO.amount * "
-"contract.wage * 0,01."
+"quelqu'un percevant une commission de 1% du salaire de base par article peut "
+"être défini par l'expression \"résultat = inputs.SALEURO.amount * "
+"contract.wage * 0,01\"."
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po
index a57e92bc0e3..9db7853f4ca 100644
--- a/addons/hr_payroll/i18n/zh_CN.po
+++ b/addons/hr_payroll/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-02-15 09:22+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 11:14+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:22+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -123,7 +123,7 @@ msgstr "hr.salary.rule"
 #: view:hr.payslip:0
 #: view:hr.payslip.run:0
 msgid "to"
-msgstr ""
+msgstr "到"
 
 #. module: hr_payroll
 #: field:hr.payslip,payslip_run_id:0
@@ -149,7 +149,7 @@ msgstr "数量 / 费率"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Children Definition"
-msgstr ""
+msgstr "子项定义"
 
 #. module: hr_payroll
 #: field:hr.payslip.input,payslip_id:0
@@ -205,7 +205,7 @@ msgstr "备注"
 #: code:addons/hr_payroll/hr_payroll.py:900
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -231,7 +231,7 @@ msgstr "其它信息"
 #. module: hr_payroll
 #: field:hr.config.settings,module_hr_payroll_account:0
 msgid "Link your payroll to accounting system"
-msgstr ""
+msgstr "连接你的工资单到会计系统"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,amount_select:0
@@ -300,7 +300,7 @@ msgstr "结构"
 #. module: hr_payroll
 #: field:hr.contribution.register,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "业务伙伴"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -427,7 +427,7 @@ msgstr "百分比基数"
 #: code:addons/hr_payroll/hr_payroll.py:85
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (副本)"
 
 #. module: hr_payroll
 #: help:hr.config.settings,module_hr_payroll_account:0
@@ -455,7 +455,7 @@ msgstr "工资条明细"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "其它"
 
 #. module: hr_payroll
 #: selection:hr.payslip,state:0
@@ -507,7 +507,7 @@ msgstr "固定金额"
 #: code:addons/hr_payroll/hr_payroll.py:365
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,active:0
@@ -521,7 +521,7 @@ msgstr "如果去掉了“激活”这个字段上的勾，你可以不必删除
 #: field:hr.payslip,state:0
 #: field:hr.payslip.run,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -596,7 +596,7 @@ msgstr "所有当期员工的合同工资合计"
 #. module: hr_payroll
 #: constraint:hr.contract:0
 msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
+msgstr "错误！联系人开始日期必须小于结束日期"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -619,7 +619,7 @@ msgstr "工资条计算明细"
 #: help:hr.payslip.line,appears_on_payslip:0
 #: help:hr.salary.rule,appears_on_payslip:0
 msgid "Used to display the salary rule on payslip."
-msgstr ""
+msgstr "用于显示工资单的工资规则"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_input
@@ -912,7 +912,7 @@ msgstr "序列"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Period"
-msgstr ""
+msgstr "会计周期"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
@@ -1256,7 +1256,7 @@ msgstr "工资条名称"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Accounting"
-msgstr ""
+msgstr "会计"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range:0
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 63c1cf47ccb..f2ba3d55057 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -60,7 +60,6 @@ You can define the different phases of interviews and easily rate the applicant
         'hr_recruitment_data.xml'
     ],
     'demo': ['hr_recruitment_demo.yml'],
-    'js': ['static/src/js/hr_recruitment.js'],
     'test': ['test/recruitment_process.yml'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index c3281b43b94..8282c5a300c 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -37,7 +37,7 @@
     <!-- Jobs -->
     <!-- Applicant Read/Unread actions -->
     <record id="actions_server_applicant_unread" model="ir.actions.server">
-        <field name="name">Mark unread</field>
+        <field name="name">HR Applicant: Mark unread</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>
@@ -55,7 +55,7 @@
     </record>
 
     <record id="actions_server_applicant_read" model="ir.actions.server">
-        <field name="name">Mark read</field>
+        <field name="name">HR Applicant: Mark read</field>
         <field name="condition">True</field>
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>
@@ -314,9 +314,7 @@
 
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
-                                    <div class="oe_left oe_tags">
-                                        <field name="categ_ids"/>
-                                    </div>
+                                    <field name="categ_ids"/>
                                 </div>
                             </div>
                             <div class="oe_clear"></div>
diff --git a/addons/hr_recruitment/static/src/js/hr_recruitment.js b/addons/hr_recruitment/static/src/js/hr_recruitment.js
deleted file mode 100644
index d11326ac9de..00000000000
--- a/addons/hr_recruitment/static/src/js/hr_recruitment.js
+++ /dev/null
@@ -1,35 +0,0 @@
-openerp.hr_recruitment = function(openerp) {
-    openerp.web_kanban.KanbanView.include({
-        applicant_display_categ_names: function() {
-            /*
-             * Set proper names to applicant categories.
-             * In kanban views, many2many fields only return a list of ids.
-             * Therefore, we have to fetch the matching data by ourselves.
-             */
-            var self = this;
-            var categ_ids = [];
-
-            // Collect categories ids
-            self.$el.find('span[data-categ_id]').each(function() {
-                categ_ids.push($(this).data('categ_id'));
-            });
-
-            // Find their matching names
-            var dataset = new openerp.web.DataSetSearch(self, 'hr.applicant_category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
-            dataset.read_slice(['id', 'name']).done(function(result) {
-                _.each(result, function(v, k) {
-                    // Set the proper value in the DOM and display the element
-                    self.$el.find('span[data-categ_id=' + v.id + ']').text(v.name);
-                });
-            });
-        },
-        on_groups_started: function() {
-            var self = this;
-            self._super.apply(self, arguments);
-
-            if (self.dataset.model === 'hr.applicant') {
-                self.applicant_display_categ_names();
-            }
-        }
-    });
-};
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index 069a5a9c170..689d425054a 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -8,7 +8,5 @@ access_product_product_user,product.product user,product.model_product_product,b
 access_product_template_hr_timesheet,product.template.hr.timesheet,product.model_product_template,base.group_hr_user,1,1,1,1

 access_product_uom_hr_timesheet,product.uom.hr.timesheet,product.model_product_uom,base.group_hr_user,1,1,1,1

 access_account_fiscalyear_hr_user,account.account.fiscalyear.user,account.model_account_fiscalyear,base.group_hr_user,1,1,1,1

-hr.access_account_journal_view_hruser,account.journal.view hruser,account.model_account_journal_view,base.group_hr_user,1,0,0,0

-hr.access_account_journal_column_hruser,account.journal.column hruser,account.model_account_journal_column,base.group_hr_user,1,0,0,0

 access_hr_analytic_timesheet_user,hr.analytic.timesheet.user,model_hr_analytic_timesheet,base.group_user,1,1,1,0

 access_account_analytic_journal_user,account.account.analytic.journal.user,account.model_account_analytic_journal,base.group_user,1,0,0,0

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index a24208d6ce0..161ac761aec 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -19,8 +19,9 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+import time
 
+from osv import fields, osv
 from tools.translate import _
 
 class hr_timesheet_invoice_factor(osv.osv):
@@ -172,6 +173,143 @@ class account_analytic_line(osv.osv):
         return super(account_analytic_line, self).copy(cursor, user, obj_id,
                 default, context=context)
 
+    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
+        pro_price_obj = self.pool.get('product.pricelist')
+        if account.pricelist_id:
+            pl = account.pricelist_id.id
+            price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=context)[pl]
+        else:
+            price = 0.0
+        return price
+
+    def invoice_cost_create(self, cr, uid, ids, data=None, context=None):
+        analytic_account_obj = self.pool.get('account.analytic.account')
+        account_payment_term_obj = self.pool.get('account.payment.term')
+        invoice_obj = self.pool.get('account.invoice')
+        product_obj = self.pool.get('product.product')
+        invoice_factor_obj = self.pool.get('hr_timesheet_invoice.factor')
+        fiscal_pos_obj = self.pool.get('account.fiscal.position')
+        product_uom_obj = self.pool.get('product.uom')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        invoices = []
+        if context is None:
+            context = {}
+        if data is None:
+            data = {}
+
+        journal_types = {}
+        for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
+            if line.journal_id.type not in journal_types:
+                journal_types[line.journal_id.type] = set()
+            journal_types[line.journal_id.type].add(line.account_id.id)
+        for journal_type, account_ids in journal_types.items():
+            for account in analytic_account_obj.browse(cr, uid, list(account_ids), context=context):
+                partner = account.partner_id
+                if (not partner) or not (account.pricelist_id):
+                    raise osv.except_osv(_('Analytic Account incomplete !'),
+                            _('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
+
+                date_due = False
+                if partner.property_payment_term:
+                    pterm_list= account_payment_term_obj.compute(cr, uid,
+                            partner.property_payment_term.id, value=1,
+                            date_ref=time.strftime('%Y-%m-%d'))
+                    if pterm_list:
+                        pterm_list = [line[0] for line in pterm_list]
+                        pterm_list.sort()
+                        date_due = pterm_list[-1]
+
+                curr_invoice = {
+                    'name': time.strftime('%d/%m/%Y') + ' - '+account.name,
+                    'partner_id': account.partner_id.id,
+                    'company_id': account.company_id.id,
+                    'payment_term': partner.property_payment_term.id or False,
+                    'account_id': partner.property_account_receivable.id,
+                    'currency_id': account.pricelist_id.currency_id.id,
+                    'date_due': date_due,
+                    'fiscal_position': account.partner_id.property_account_position.id
+                }
+
+                context2 = context.copy()
+                context2['lang'] = partner.lang
+                # set company_id in context, so the correct default journal will be selected
+                context2['force_company'] = curr_invoice['company_id']
+                # set force_company in context so the correct product properties are selected (eg. income account)
+                context2['company_id'] = curr_invoice['company_id']
+
+                last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
+                invoices.append(last_invoice)
+
+                cr.execute("""SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id
+                        FROM account_analytic_line as line LEFT JOIN account_analytic_journal journal ON (line.journal_id = journal.id)
+                        WHERE account_id = %s
+                            AND line.id IN %s AND journal.type = %s AND to_invoice IS NOT NULL
+                        GROUP BY product_id, user_id, to_invoice, product_uom_id""", (account.id, tuple(ids), journal_type))
+
+                for product_id, user_id, factor_id, qty, uom in cr.fetchall():
+                    if data.get('product'):
+                        product_id = data['product'][0]
+                    product = product_obj.browse(cr, uid, product_id, context=context2)
+                    if not product:
+                        raise osv.except_osv(_('Error!'), _('There is no product defined. Please select one or force the product through the wizard.'))
+                    factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
+                    factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
+                    if factor.customer_name:
+                        factor_name += ' - ' + factor.customer_name
+
+                    ctx =  context.copy()
+                    ctx.update({'uom':uom})
+
+                    price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
+
+                    general_account = product.product_tmpl_id.property_account_income or product.categ_id.property_account_income_categ
+                    if not general_account:
+                        raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
+                    taxes = product.taxes_id or general_account.tax_ids
+                    tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
+                    curr_line = {
+                        'price_unit': price,
+                        'quantity': qty,
+                        'discount':factor.factor,
+                        'invoice_line_tax_id': [(6,0,tax )],
+                        'invoice_id': last_invoice,
+                        'name': factor_name,
+                        'product_id': product_id,
+                        'invoice_line_tax_id': [(6,0,tax)],
+                        'uos_id': uom,
+                        'account_id': general_account.id,
+                        'account_analytic_id': account.id,
+                    }
+
+                    #
+                    # Compute for lines
+                    #
+                    cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(ids), product_id, factor_id))
+
+                    line_ids = cr.dictfetchall()
+                    note = []
+                    for line in line_ids:
+                        # set invoice_line_note
+                        details = []
+                        if data.get('date', False):
+                            details.append(line['date'])
+                        if data.get('time', False):
+                            if line['product_uom_id']:
+                                details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
+                            else:
+                                details.append("%s" % (line['unit_amount'], ))
+                        if data.get('name', False):
+                            details.append(line['name'])
+                        note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
+
+                    if note:
+                        curr_line['name'] += "\n" + ("\n".join(map(lambda x: unicode(x) or '',note)))
+                    invoice_line_obj.create(cr, uid, curr_line, context=context)
+                    cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))
+
+                invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
+        return invoices
+
 account_analytic_line()
 
 
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index d01f81b7c6e..074d9b6d902 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-08-29 20:46+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 14:35+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -59,7 +59,7 @@ msgstr "Regrouper par..."
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 msgid "Force to use a specific product"
-msgstr "Forcer l'utilisation d'un produit spécifique"
+msgstr "Forcer l'utilisation d'un article spécifique"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -343,7 +343,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
 msgid "Force to use a special product"
-msgstr "Forcer l'utilisation d'un produit particulier"
+msgstr "Forcer l'utilisation d'un article particulier"
 
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
@@ -881,7 +881,7 @@ msgstr "Feuilles de présences jounalière par Compte"
 #: view:report.timesheet.line:0
 #: field:report.timesheet.line,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -910,7 +910,7 @@ msgstr "Journal"
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,product:0
 msgid "The product that will be used to invoice the remaining amount"
-msgstr "Le produit qui sera utilisé pour facturer le montant restant"
+msgstr "L'article qui sera utilisé pour facturer le montant restant"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:109
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index ac799f41364..0a8fd36f469 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -19,163 +19,10 @@
 #
 ##############################################################################
 
-import time
 
 from osv import osv, fields
 from tools.translate import _
 
-## Create an invoice based on selected timesheet lines
-#
-
-class account_analytic_line(osv.osv):
-    _inherit = "account.analytic.line"
-    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
-        pro_price_obj = self.pool.get('product.pricelist')
-        if account.pricelist_id:
-            pl = account.pricelist_id.id
-            price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=context)[pl]
-        else:
-            price = 0.0
-        return price
-
-
-    #
-    # data = {
-    #   'date': boolean
-    #   'time': boolean
-    #   'name': boolean
-    #   'price': boolean
-    #   'product': many2one id
-    # }
-    def invoice_cost_create(self, cr, uid, ids, data=None, context=None):
-        analytic_account_obj = self.pool.get('account.analytic.account')
-        account_payment_term_obj = self.pool.get('account.payment.term')
-        invoice_obj = self.pool.get('account.invoice')
-        product_obj = self.pool.get('product.product')
-        invoice_factor_obj = self.pool.get('hr_timesheet_invoice.factor')
-        fiscal_pos_obj = self.pool.get('account.fiscal.position')
-        product_uom_obj = self.pool.get('product.uom')
-        invoice_line_obj = self.pool.get('account.invoice.line')
-        invoices = []
-        if context is None:
-            context = {}
-        if data is None:
-            data = {}
-
-        account_ids = [line.account_id.id for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context)]
-        for account in analytic_account_obj.browse(cr, uid, account_ids, context=context):
-            partner = account.partner_id
-            if (not partner) or not (account.pricelist_id):
-                raise osv.except_osv(_('Analytic Account incomplete !'),
-                        _('Contract incomplete. Please fill in the Customer and Pricelist fields.'))
-
-
-
-            date_due = False
-            if partner.property_payment_term:
-                pterm_list= account_payment_term_obj.compute(cr, uid,
-                        partner.property_payment_term.id, value=1,
-                        date_ref=time.strftime('%Y-%m-%d'))
-                if pterm_list:
-                    pterm_list = [line[0] for line in pterm_list]
-                    pterm_list.sort()
-                    date_due = pterm_list[-1]
-
-            curr_invoice = {
-                'name': time.strftime('%d/%m/%Y')+' - '+account.name,
-                'partner_id': account.partner_id.id,
-                'company_id': account.company_id.id,
-                'payment_term': partner.property_payment_term.id or False,
-                'account_id': partner.property_account_receivable.id,
-                'currency_id': account.pricelist_id.currency_id.id,
-                'date_due': date_due,
-                'fiscal_position': account.partner_id.property_account_position.id
-            }
-
-            context2 = context.copy()
-            context2['lang'] = partner.lang
-            # set company_id in context, so the correct default journal will be selected
-            context2['force_company'] = curr_invoice['company_id']
-            # set force_company in context so the correct product properties are selected (eg. income account)
-            context2['company_id'] = curr_invoice['company_id']
-
-            last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
-            invoices.append(last_invoice)
-
-            cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id " \
-                    "FROM account_analytic_line as line " \
-                    "WHERE account_id = %s " \
-                        "AND id IN %s AND to_invoice IS NOT NULL " \
-                    "GROUP BY product_id, user_id, to_invoice, product_uom_id", (account.id, tuple(ids),))
-
-            for product_id, user_id, factor_id, qty, uom in cr.fetchall():
-                if data.get('product'):
-                    product_id = data['product'][0]
-                product = product_obj.browse(cr, uid, product_id, context=context2)
-                if not product:
-                    raise osv.except_osv(_('Error!'), _('There is no product defined. Please select one or force the product through the wizard.'))
-                factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
-                factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
-                if factor.customer_name:
-                    factor_name += ' - ' + factor.customer_name
-
-                ctx =  context.copy()
-                ctx.update({'uom':uom})
-
-                price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
-
-                general_account = product.product_tmpl_id.property_account_income or product.categ_id.property_account_income_categ
-                if not general_account:
-                    raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
-                taxes = product.taxes_id or general_account.tax_ids
-                tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
-                curr_line = {
-                    'price_unit': price,
-                    'quantity': qty,
-                    'discount':factor.factor,
-                    'invoice_line_tax_id': [(6,0,tax )],
-                    'invoice_id': last_invoice,
-                    'name': factor_name,
-                    'product_id': product_id,
-                    'invoice_line_tax_id': [(6,0,tax)],
-                    'uos_id': uom,
-                    'account_id': general_account.id,
-                    'account_analytic_id': account.id,
-                }
-
-                #
-                # Compute for lines
-                #
-                cr.execute("SELECT * FROM account_analytic_line WHERE account_id = %s and id IN %s AND product_id=%s and to_invoice=%s ORDER BY account_analytic_line.date", (account.id, tuple(ids), product_id, factor_id))
-
-                line_ids = cr.dictfetchall()
-                note = []
-                for line in line_ids:
-                    # set invoice_line_note
-                    details = []
-                    if data.get('date', False):
-                        details.append(line['date'])
-                    if data.get('time', False):
-                        if line['product_uom_id']:
-                            details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
-                        else:
-                            details.append("%s" % (line['unit_amount'], ))
-                    if data.get('name', False):
-                        details.append(line['name'])
-                    note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
-
-                if note:
-                    curr_line['name'] += "\n" + ("\n".join(map(lambda x: unicode(x) or '',note)))
-                invoice_line_obj.create(cr, uid, curr_line, context=context)
-                cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))
-
-            invoice_obj.button_reset_taxes(cr, uid, [last_invoice], context)
-        return invoices
-
-#
-# TODO: check unit of measure !!!
-#
-
 class hr_timesheet_invoice_create(osv.osv_memory):
 
     _name = 'hr.timesheet.invoice.create'
@@ -189,8 +36,8 @@ class hr_timesheet_invoice_create(osv.osv_memory):
     }
 
     _defaults = {
-         'date': lambda *args: 1,
-         'name': lambda *args: 1
+         'date':  1,
+         'name':  1,
     }
 
     def view_init(self, cr, uid, fields, context=None):
@@ -210,6 +57,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
 
     def do_create(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, [], context=context)[0]
+        # Create an invoice based on selected timesheet lines
         invs = self.pool.get('account.analytic.line').invoice_cost_create(cr, uid, context['active_ids'], data, context=context)
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index d75c159352d..e49e5fbf350 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2011-01-17 17:44+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 15:11+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:09+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0
@@ -968,7 +968,7 @@ msgstr ""
 #: view:timesheet.report:0
 #: field:timesheet.report,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
index 52b9795996f..8e6896c96a0 100644
--- a/addons/knowledge/i18n/zh_CN.po
+++ b/addons/knowledge/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-26 13:46+0000\n"
+"PO-Revision-Date: 2012-11-28 08:39+0000\n"
 "Last-Translator: hifly <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
@@ -80,17 +80,17 @@ msgstr "共享库(FTP)"
 #. module: knowledge
 #: field:knowledge.config.settings,module_document:0
 msgid "Manage documents"
-msgstr ""
+msgstr "管理文档"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "应用"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -103,16 +103,18 @@ msgid ""
 "Access your documents in OpenERP through an FTP interface.\n"
 "                This installs the module document_ftp."
 msgstr ""
+"在OpenERP里通过FTP接口访问你的文档。\n"
+"需要安装模块document_ftp。"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "或者"
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_webdav:0
 msgid "Share repositories (WebDAV)"
-msgstr ""
+msgstr "共享仓库(WebDAV)"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index ede9136c3d2..607273ed401 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -5,7 +5,6 @@
             <field name="name">Journal de frais</field>
             <field name="code">EXPF</field>
             <field name="type">purchase</field>
-            <field name="view_id" ref="account.account_journal_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -15,7 +14,6 @@
             <field name="name">Banque CHF</field>
             <field name="code">BCHF</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -26,7 +24,6 @@
             <field name="name">Banque EUR</field>
             <field name="code">BEUR</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -37,7 +34,6 @@
             <field name="name">Caisse</field>
             <field name="code">CAI</field>
             <field name="type">cash</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -47,7 +43,6 @@
             <field name="name">Opérations Diverses</field>
             <field name="code">OD</field>
             <field name="type">general</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
@@ -58,7 +53,6 @@
             <field name="code">JO</field>
             <field name="type">situation</field>
             <field name="centralisation">True</field>
-            <field name="view_id" ref="account.account_journal_view"/>
             <field name="update_posted" eval="True" />
         </record>
         
diff --git a/addons/l10n_fr/i18n/fr.po b/addons/l10n_fr/i18n/fr.po
index 7e7d8d8a3a5..15c0a260a86 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-18 23:40+0000\n"
-"Last-Translator: t.o <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 17:46+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: l10n_fr
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erreur! Vous ne pouvez pas creer de sociétés récursives"
 
 #. module: l10n_fr
 #: view:account.bilan.report:0
@@ -45,7 +45,7 @@ msgstr "Rapport Compte CDR"
 #. module: l10n_fr
 #: model:account.fiscal.position.template,note:l10n_fr.fiscal_position_template_import_export
 msgid "French VAT exemption according to articles 262 I of \"CGI\""
-msgstr ""
+msgstr "Exemption de TVA en France selon les articles 262"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,report_id:0
@@ -70,7 +70,7 @@ msgstr "Définition"
 #. module: l10n_fr
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,name:0
@@ -89,11 +89,13 @@ msgid ""
 "French VAT exemption according to articles 262 ter I (for products) and/or "
 "283-2 (for services) of \"CGI\""
 msgstr ""
+"Exemption de TVA en France selon les articles 262 ter I (pour les biens) "
+"et/ou 283-2 (pour les services) du CGI"
 
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Sociétés"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.report:0
@@ -114,7 +116,7 @@ msgstr "Rapport pour l10n_fr"
 #. module: l10n_fr
 #: field:res.company,siret:0
 msgid "SIRET"
-msgstr ""
+msgstr "SIRET"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
@@ -147,12 +149,12 @@ msgstr "Nom de la variable"
 #: view:account.bilan.report:0
 #: view:account.cdr.report:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: l10n_fr
 #: field:res.company,ape:0
 msgid "APE"
-msgstr ""
+msgstr "APE"
 
 #~ msgid "Asset"
 #~ msgstr "Actifs"
diff --git a/addons/lunch/i18n/fr.po b/addons/lunch/i18n/fr.po
index f19922787ff..536311bcdb3 100644
--- a/addons/lunch/i18n/fr.po
+++ b/addons/lunch/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-05-10 17:25+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 15:04+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -162,7 +162,7 @@ msgstr "Montant"
 #: model:ir.ui.menu,name:lunch.menu_lunch_products
 #: field:lunch.order,order_line_ids:0
 msgid "Products"
-msgstr "Produits"
+msgstr "Articles"
 
 #. module: lunch
 #: view:lunch.order.line:0
@@ -426,7 +426,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:lunch.action_lunch_product_categories
 #: model:ir.ui.menu,name:lunch.menu_lunch_product_categories
 msgid "Product Categories"
-msgstr "Catégories de produits"
+msgstr "Catégories d'articles"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_control_suppliers
@@ -749,7 +749,7 @@ msgstr "Prix unitaire"
 #: field:lunch.order.line,product_id:0
 #: field:lunch.product,name:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: lunch
 #: field:lunch.cashmove,description:0
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index 924c50893d6..bbdc5865ed5 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-26 13:13+0000\n"
-"Last-Translator: youring <youring@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 11:04+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: lunch
 #: field:lunch.product,category_id:0
@@ -47,7 +47,7 @@ msgstr "分组..."
 #. module: lunch
 #: field:lunch.alert,sunday:0
 msgid "Sunday"
-msgstr "周日"
+msgstr "星期日"
 
 #. module: lunch
 #: field:lunch.order.line,supplier:0
@@ -68,22 +68,22 @@ msgstr "3月"
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "By Employee"
-msgstr ""
+msgstr "按员工"
 
 #. module: lunch
 #: field:lunch.alert,friday:0
 msgid "Friday"
-msgstr "周五"
+msgstr "星期五"
 
 #. module: lunch
 #: view:lunch.validation:0
 msgid "validate order lines"
-msgstr ""
+msgstr "核对餐单明细"
 
 #. module: lunch
 #: view:lunch.order.line:0
 msgid "Order lines Tree"
-msgstr ""
+msgstr "餐单明细列表"
 
 #. module: lunch
 #: field:lunch.alert,specific_day:0
@@ -132,7 +132,7 @@ msgstr "订餐单（按供餐单位分）"
 #. module: lunch
 #: view:lunch.validation:0
 msgid "Receive Meals"
-msgstr ""
+msgstr "接收食品"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -184,7 +184,7 @@ msgstr ""
 #. module: lunch
 #: view:lunch.alert:0
 msgid "alert tree"
-msgstr ""
+msgstr "提醒列表"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_order_line
@@ -194,7 +194,7 @@ msgstr "午餐订单统计"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_alert
 msgid "Lunch Alert"
-msgstr ""
+msgstr "午餐提醒"
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:182
@@ -205,12 +205,12 @@ msgstr ""
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Week"
-msgstr ""
+msgstr "每周"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove
 msgid "Register Cash Moves"
-msgstr ""
+msgstr "登记现金凭证"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -230,7 +230,7 @@ msgstr "确认"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
 msgid "Your Account"
-msgstr ""
+msgstr "您的帐号"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
@@ -240,12 +240,12 @@ msgstr ""
 #. module: lunch
 #: field:lunch.alert,active_from:0
 msgid "Between"
-msgstr ""
+msgstr "介于"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_order
 msgid "Wizard to order a meal"
-msgstr ""
+msgstr "订购食品的向导"
 
 #. module: lunch
 #: selection:lunch.order,state:0
@@ -257,7 +257,7 @@ msgstr "新建"
 #: code:addons/lunch/lunch.py:179
 #, python-format
 msgid "This is the first time you order a meal"
-msgstr ""
+msgstr "这是你第一次订购食品"
 
 #. module: lunch
 #: field:report.lunch.order.line,price_total:0
@@ -267,7 +267,7 @@ msgstr "总价格"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_validation
 msgid "lunch validation for order"
-msgstr ""
+msgstr "午餐确认"
 
 #. module: lunch
 #: report:lunch.order.line:0
@@ -287,13 +287,13 @@ msgstr "7月"
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_config
 msgid "Configuration"
-msgstr ""
+msgstr "设置"
 
 #. module: lunch
 #: field:lunch.order,state:0
 #: field:lunch.order.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: lunch
 #: view:lunch.order.order:0
@@ -301,6 +301,8 @@ msgid ""
 "Order a meal doesn't mean that we have to pay it.\n"
 "                        A meal should be paid when it is received."
 msgstr ""
+"订购食品并不意味着我们必须支付。\n"
+"        食品将在收到后支付。"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_control_accounts
@@ -311,12 +313,12 @@ msgstr ""
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
 msgid "Employee's Payment"
-msgstr ""
+msgstr "员工的支付"
 
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Every Day"
-msgstr ""
+msgstr "每天"
 
 #. module: lunch
 #: field:lunch.order.line,cashmove:0
@@ -326,12 +328,12 @@ msgstr "现金划拨"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.order_order_lines
 msgid "Order meals"
-msgstr ""
+msgstr "订购食品"
 
 #. module: lunch
 #: view:lunch.alert:0
 msgid "Schedule Hour"
-msgstr ""
+msgstr "预定时间"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -362,12 +364,12 @@ msgstr ""
 #. module: lunch
 #: field:lunch.alert,tuesday:0
 msgid "Tuesday"
-msgstr ""
+msgstr "星期二"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_tree
 msgid "Your Orders"
-msgstr ""
+msgstr "你的订单"
 
 #. module: lunch
 #: field:report.lunch.order.line,month:0
@@ -391,7 +393,7 @@ msgstr ""
 #: view:lunch.alert:0
 #: field:lunch.alert,message:0
 msgid "Message"
-msgstr ""
+msgstr "消息"
 
 #. module: lunch
 #: view:lunch.order.order:0
@@ -403,7 +405,7 @@ msgstr ""
 #: view:lunch.order.order:0
 #: view:lunch.validation:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_product_categories
@@ -420,7 +422,7 @@ msgstr ""
 #. module: lunch
 #: view:lunch.order.order:0
 msgid "Order meal"
-msgstr ""
+msgstr "订购食品"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_product_categories
@@ -436,37 +438,37 @@ msgstr ""
 #. module: lunch
 #: view:lunch.alert:0
 msgid "Schedule Date"
-msgstr ""
+msgstr "预定日期"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_alert
 #: model:ir.ui.menu,name:lunch.menu_lunch_alert
 #: field:lunch.order,alerts:0
 msgid "Alerts"
-msgstr ""
+msgstr "警告"
 
 #. module: lunch
 #: field:lunch.order.line,note:0
 #: field:report.lunch.order.line,note:0
 msgid "Note"
-msgstr ""
+msgstr "说明"
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:249
 #, python-format
 msgid "Add"
-msgstr ""
+msgstr "新增"
 
 #. module: lunch
 #: view:lunch.product:0
 #: view:lunch.product.category:0
 msgid "Products Form"
-msgstr ""
+msgstr "产品表单"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.cancel_order_lines
 msgid "Cancel meals"
-msgstr ""
+msgstr "取消食品"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashmove
@@ -477,12 +479,12 @@ msgstr ""
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Are you sure you want to cancel these meals?"
-msgstr ""
+msgstr "你确信要取消这些食品？"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "My Account"
-msgstr ""
+msgstr "我的账户"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -492,17 +494,17 @@ msgstr "8月"
 #. module: lunch
 #: field:lunch.alert,monday:0
 msgid "Monday"
-msgstr ""
+msgstr "星期一"
 
 #. module: lunch
 #: field:lunch.order.line,name:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.validate_order_lines
 msgid "Receive meals"
-msgstr ""
+msgstr "收到食品"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -526,12 +528,12 @@ msgstr "午餐管理"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_order_line
 msgid "lunch order line"
-msgstr ""
+msgstr "午餐订单行"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product
 msgid "lunch product"
-msgstr ""
+msgstr "午餐产品"
 
 #. module: lunch
 #: field:lunch.order.line,user_id:0
@@ -554,18 +556,18 @@ msgstr "11月"
 #. module: lunch
 #: view:lunch.order:0
 msgid "Orders Tree"
-msgstr ""
+msgstr "订单树"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "Orders Form"
-msgstr ""
+msgstr "订单表单"
 
 #. module: lunch
 #: view:lunch.alert:0
 #: view:lunch.order.line:0
 msgid "Search"
-msgstr ""
+msgstr "查找"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -600,27 +602,27 @@ msgstr "1月"
 #. module: lunch
 #: selection:lunch.alert,alter_type:0
 msgid "Specific Day"
-msgstr ""
+msgstr "指定日"
 
 #. module: lunch
 #: field:lunch.alert,wednesday:0
 msgid "Wednesday"
-msgstr ""
+msgstr "星期三"
 
 #. module: lunch
 #: view:lunch.product.category:0
 msgid "Product Category: "
-msgstr ""
+msgstr "产品目录: "
 
 #. module: lunch
 #: field:lunch.alert,active_to:0
 msgid "And"
-msgstr ""
+msgstr "And"
 
 #. module: lunch
 #: selection:lunch.order.line,state:0
 msgid "Ordered"
-msgstr ""
+msgstr "已订购"
 
 #. module: lunch
 #: field:report.lunch.order.line,date:0
@@ -630,7 +632,7 @@ msgstr "订单日期"
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Cancel Orders"
-msgstr ""
+msgstr "取消订单"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_alert
@@ -657,17 +659,17 @@ msgstr ""
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "A cancelled meal should not be paid by employees."
-msgstr ""
+msgstr "已经取消的食品不会被员工支付。"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cash
 msgid "Administrate Cash Moves"
-msgstr ""
+msgstr "管理现金凭证"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cancel
 msgid "cancel lunch order"
-msgstr ""
+msgstr "取消午餐订单"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -699,14 +701,14 @@ msgstr ""
 #: code:addons/lunch/lunch.py:185
 #, python-format
 msgid "Your favorite meals will be created based on your last orders."
-msgstr ""
+msgstr "你食物收藏夹基于最后一次订单创建。"
 
 #. module: lunch
 #: model:ir.module.category,description:lunch.module_lunch_category
 msgid ""
 "Helps you handle your lunch needs, if you are a manager you will be able to "
 "create new products, cashmoves and to confirm or cancel orders."
-msgstr ""
+msgstr "帮你处理午餐需要的事务，如果是一个管理者，你能创建产品、现金凭证并确认或者取消餐单。"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.action_lunch_control_accounts
@@ -727,18 +729,18 @@ msgstr ""
 #. module: lunch
 #: field:lunch.alert,alter_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "循环"
 
 #. module: lunch
 #: code:addons/lunch/lunch.py:188
 #, python-format
 msgid "Don't forget the alerts displayed in the reddish area"
-msgstr ""
+msgstr "不要忘记红色区域显示的提示信息。"
 
 #. module: lunch
 #: field:lunch.alert,thursday:0
 msgid "Thursday"
-msgstr ""
+msgstr "星期四"
 
 #. module: lunch
 #: report:lunch.order.line:0
@@ -772,13 +774,13 @@ msgstr "价格"
 #. module: lunch
 #: field:lunch.cashmove,state:0
 msgid "Is an order or a Payment"
-msgstr ""
+msgstr "一个订单或者付款单"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_form
 msgid "New Order"
-msgstr ""
+msgstr "新的订单"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -788,13 +790,13 @@ msgstr ""
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "Cancel a meal means that we didn't receive it from the supplier."
-msgstr ""
+msgstr "取消我们不能从供应商出接收的食物。"
 
 #. module: lunch
 #: view:lunch.cashmove:0
 #: selection:lunch.cashmove,state:0
 msgid "Payment"
-msgstr ""
+msgstr "付款"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -809,12 +811,12 @@ msgstr "年"
 #. module: lunch
 #: view:lunch.order:0
 msgid "List"
-msgstr ""
+msgstr "列表"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_admin
 msgid "Administrate Orders"
-msgstr ""
+msgstr "订单管理"
 
 #. module: lunch
 #: selection:report.lunch.order.line,month:0
@@ -824,7 +826,7 @@ msgstr "4月"
 #. module: lunch
 #: view:lunch.order:0
 msgid "Select your order"
-msgstr ""
+msgstr "选择你的订单"
 
 #. module: lunch
 #: field:lunch.cashmove,order_id:0
@@ -845,22 +847,22 @@ msgstr "午餐订单"
 #. module: lunch
 #: view:lunch.order.order:0
 msgid "Are you sure you want to order these meals?"
-msgstr ""
+msgstr "你确信要订购这些食物？"
 
 #. module: lunch
 #: view:lunch.cancel:0
 msgid "cancel order lines"
-msgstr ""
+msgstr "取消订单行"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product_category
 msgid "lunch product category"
-msgstr ""
+msgstr "午餐产品目录"
 
 #. module: lunch
 #: field:lunch.alert,saturday:0
 msgid "Saturday"
-msgstr ""
+msgstr "星期六"
 
 #. module: lunch
 #: model:res.groups,name:lunch.group_lunch_manager
@@ -870,17 +872,17 @@ msgstr "经理"
 #. module: lunch
 #: view:lunch.validation:0
 msgid "Did your received these meals?"
-msgstr ""
+msgstr "你收到了这些食物吗?"
 
 #. module: lunch
 #: view:lunch.validation:0
 msgid "Once a meal is received a new cash move is created for the employee."
-msgstr ""
+msgstr "一旦食物被收取，这个员工的新的现金凭证被创建"
 
 #. module: lunch
 #: view:lunch.product:0
 msgid "Products Tree"
-msgstr ""
+msgstr "产品列表"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -888,12 +890,12 @@ msgstr ""
 #: field:lunch.order,total:0
 #: view:lunch.order.line:0
 msgid "Total"
-msgstr ""
+msgstr "合计"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_tree
 msgid "Previous Orders"
-msgstr ""
+msgstr "之前的订单"
 
 #~ msgid "Are you sure you want to cancel this order ?"
 #~ msgstr "您确定要取消此订单？"
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 0377a00a8cf..d0d9836ce8c 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index e357f72ba45..d19eded7a33 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-24 18:46+0000\n"
+"PO-Revision-Date: 2012-11-29 14:34+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
@@ -916,7 +916,7 @@ msgstr "Volgers toevoegen"
 #. module: mail
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr "Het gekozen bedrijf is niet toegestaan voor deze gebruiker"
+msgstr "Het gekozen bedrijf is geen toegestaan bedrijf voor deze gebruiker"
 
 #. module: mail
 #: model:mail.message.subtype,name:mail.mt_issue_closed
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 1d438ee2de0..344f85752d3 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-25 16:49+0000\n"
+"PO-Revision-Date: 2012-11-29 08:44+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-26 04:42+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
@@ -769,9 +769,9 @@ msgid ""
 "            "
 msgstr ""
 "<p>\n"
-"                    <b>幸运！</b>你的收件箱是空的.\n"
+"                    <b>你的收件箱是空的。</b>\n"
 "                </p><p>\n"
-"                    你的收件箱包含了你的私人消息或者发给你的邮件 ，包括你关注的文档或者个人的信息。\n"
+"                    你的收件箱包含了你的私人消息或者发给你的邮件 ，包括你关注的单据或者个人的信息。\n"
 "                </p>\n"
 "            "
 
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index ee0146aaeb1..fba192b18bc 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -105,7 +105,7 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                         <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group..."/>
                     </div>
                 </form>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index d4edb7616e6..edaaa3441f7 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -206,6 +206,14 @@ class mail_message(osv.Model):
             new_is_favorite = not (uid in message.get('favorite_user_ids'))
             if new_is_favorite:
                 self.write(cr, SUPERUSER_ID, message.get('id'), {'favorite_user_ids': [(4, uid)]}, context=context)
+                # when setting a favorite, set the related notification as unread, or create an unread notification if not existing
+                notification_obj = self.pool.get('mail.notification')
+                pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
+                notif_id = notification_obj.search(cr, SUPERUSER_ID, [('message_id', '=', message.get('id')), ('partner_id', '=', pid)], context=context)
+                if notif_id:
+                    notification_obj.write(cr, SUPERUSER_ID, notif_id, {'read': False}, context=context)
+                else:
+                    notification_obj.create(cr, SUPERUSER_ID, {'message_id': message.get('id'), 'partner_id': pid, 'read': False}, context=context)
             else:
                 self.write(cr, SUPERUSER_ID, message.get('id'), {'favorite_user_ids': [(3, uid)]}, context=context)
         return new_is_favorite or False
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 15bc53223ba..30954be4ed8 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -802,11 +802,12 @@ class mail_thread(osv.AbstractModel):
 
     def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
         """ Add partners to the records followers. """
-        self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
+        self.check_access_rights(cr, uid, 'read')
+        self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
         # if subtypes are not specified (and not set to a void list), fetch default ones
         if subtype_ids is None:
             subtype_obj = self.pool.get('mail.message.subtype')
-            subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
+            subtype_ids = subtype_obj.search(cr, SUPERUSER_ID, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
         # update the subscriptions
         fol_obj = self.pool.get('mail.followers')
         fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
@@ -823,7 +824,8 @@ class mail_thread(osv.AbstractModel):
 
     def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
         """ Remove partners from the records followers. """
-        return self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
+        self.check_access_rights(cr, uid, 'read')
+        return self.write(cr, SUPERUSER_ID, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
 
     #------------------------------------------------------
     # Thread state
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index a232aa12642..4106eb2e024 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -42,7 +42,8 @@
             <field name="params" eval="&quot;{
                 'domain': [('partner_ids.user_ids', 'in', [uid])],
                 'view_mailbox': True,
-                'read_action': 'read', }&quot;"/>
+                'read_action': 'read',
+                'show_compose_message': False }&quot;"/>
             <field name="help" type="html">
                 <p>
                     <b>No private message.</b>
@@ -64,7 +65,8 @@
             <field name="params" eval="&quot;{
                 'domain': [('favorite_user_ids', 'in', [uid])],
                 'view_mailbox': True,
-                'read_action': 'read', }&quot;"/>
+                'read_action': 'read',
+                'compose_as_todo': True }&quot;"/>
             <field name="help" type="html">
                 <p>
                     <b>No todo.</b>
@@ -84,7 +86,8 @@
             }</field>
             <field name="params" eval="&quot;{
                 'domain': ['|', ('notification_ids.partner_id.user_ids', 'in', [uid]), ('author_id.user_ids', 'in', [uid])],
-                'view_mailbox': True, }&quot;"/>
+                'view_mailbox': True,
+                'show_compose_message': False }&quot;"/>
             <field name="help" type="html">
                 <p>
                     No message found and no message sent yet.
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 94a5c2d1f41..638d016921b 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -48,7 +48,7 @@
 
 .openerp .oe_mail .oe_msg{
     position: relative;
-    background: #F4F5FA;
+    background: #EDEDF6;
     border-radius: 2px;
     margin-bottom: 2px;
     min-height: 42px;
@@ -70,7 +70,7 @@
     margin-left: 40px;
 }
 .openerp .oe_mail .oe_msg .oe_msg_footer{
-    padding-left: 4px;
+    margin-left: 4px;
     padding-top: 3px;
     overflow: hidden;
     margin-bottom: 4px;
@@ -94,6 +94,10 @@
 .openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p {
     margin-bottom: 0px;
 }
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body * {
+    text-overflow:ellipsis;
+    word-wrap: break-word;
+}
 
 /* a) Indented Messages */
 
@@ -380,6 +384,10 @@
     line-height: 12px;
     vertical-align: middle;
 }
+.openerp .oe_mail .oe_msg_footer button.oe_post{
+    position: relative;
+    z-index: 2;
+}
 .openerp .oe_mail .oe_msg_footer button.oe_attach{
     width: 24px;
     overflow: hidden;
@@ -387,8 +395,9 @@
 }
 .openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{
     position: relative;
-    top: -1px;
-    left: -9px;
+    top: -4px;
+    margin-left: -9px;
+    vertical-align: middle;
     filter:none;
 }
 .openerp .oe_mail .oe_hidden_input_file, .openerp .oe_mail .oe_hidden_input_file form{
@@ -402,8 +411,9 @@
 }
 .openerp .oe_mail .oe_msg_footer button.oe_full .oe_e{
     position: relative;
-    top: -1px;
-    left: -9px;
+    top: -4px;
+    margin-left: -9px;
+    vertical-align: middle;
     filter:none;
 }
 .openerp .oe_mail button.oe_attach, .openerp .oe_mail button.oe_full{
@@ -418,13 +428,17 @@
     color: #7C7BAD;
     margin-left: -3px;
 }
+.openerp .oe_mail .oe_msg_footer .oe_attachment_file{
+    cursor: pointer;
+}
 .openerp .oe_mail .oe_msg_footer .oe_attachment_file .oe_form_binary_file{
     display: inline-block;
-    margin-left: -47px;
-    height: 28px;
-    width: 52px;
-    margin-top: -6px;
+    margin-left: -122px;
+    height: 22px;
+    width: 128px;
+    margin-top: -4px;
     filter:none;
+    cursor: pointer;
 }
 .openerp .oe_mail .oe_mail_list_recipients{
     font-size: 12px;
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 44bb4e9ae09..a5beaac229f 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -204,7 +204,7 @@ openerp.mail = function (session) {
             this.subject = datasets.subject ||  false,
             this.name = datasets.name ||  false,
             this.record_name = datasets.record_name ||  false,
-            this.body = datasets.body ||  false,
+            this.body = datasets.body || '',
             this.vote_nb = datasets.vote_nb || 0,
             this.has_voted = datasets.has_voted ||  false,
             this.is_favorite = datasets.is_favorite ||  false,
@@ -508,7 +508,6 @@ openerp.mail = function (session) {
                 res_model: 'mail.compose.message',
                 view_mode: 'form',
                 view_type: 'form',
-                action_from: 'mail.ThreadComposeMessage',
                 views: [[false, 'form']],
                 target: 'new',
                 context: context,
@@ -574,12 +573,7 @@ openerp.mail = function (session) {
                             var message = thread.create_message_object( data[0] );
                             // insert the message on dom
                             thread.insert_message( message, root ? undefined : self.$el, root );
-                            if (thread.parent_message) {
-                                self.$el.remove();
-                                self.parent_thread.compose_message = null;
-                            } else {
-                                self.on_cancel();
-                            }
+                            self.on_cancel();
                         });
                         //session.web.unblockUI();
                     });
@@ -591,11 +585,11 @@ openerp.mail = function (session) {
         */
         on_compose_expandable: function (event) {
 
-            if (!this.stay_open && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
+            if ((!this.stay_open || (event && event.type == 'click')) && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
                 this.show_composer = !this.show_composer || this.stay_open;
                 this.reinit();
             }
-            if (!this.stay_open && this.show_composer) {
+            if (!this.stay_open && this.show_composer && (!event || event.type != 'blur')) {
                 this.$('textarea:not(.oe_compact):first').focus();
             }
             return true;
@@ -725,7 +719,7 @@ openerp.mail = function (session) {
         on_message_reply:function (event) {
             event.stopPropagation();
             this.create_thread();
-            this.thread.on_compose_message();
+            this.thread.on_compose_message(event);
             return false;
         },
 
@@ -833,9 +827,10 @@ openerp.mail = function (session) {
             return false;
         },
 
-        /*The selected thread and all childs (messages/thread) became read
-        * @param {object} mouse envent
-        */
+        /* Set the selected thread and all childs as read or unread, based on
+         * read parameter.
+         * @param {boolean} read_value
+         */
         on_message_read_unread: function (read_value) {
             var self = this;
             var messages = [this].concat(this.get_childs());
@@ -958,7 +953,7 @@ openerp.mail = function (session) {
 
             this.options = options.options;
             this.options.root_thread = (options.options.root_thread != undefined ? options.options.root_thread : this);
-            this.options.show_compose_message = this.options.show_compose_message && (this.options.display_indented_thread >= this.thread_level || !this.thread_level);
+            this.options.show_compose_message = this.options.show_compose_message && !this.thread_level;
             
             // record options and data
             this.parent_message= parent.thread!= undefined ? parent : false ;
@@ -995,7 +990,7 @@ openerp.mail = function (session) {
             // add message composition form view
             if (!this.compose_message) {
                 this.compose_message = new mail.ThreadComposeMessage(this, this, {
-                    'context': this.context,
+                    'context': this.options.compose_as_todo && !this.thread_level ? _.extend(this.context, { 'default_favorite_user_ids': [this.session.uid] }) : this.context,
                     'options': this.options,
                 });
                 if (!this.thread_level || this.thread_level > this.options.display_indented_thread) {
@@ -1136,9 +1131,9 @@ openerp.mail = function (session) {
         * Call the on_compose_expandable method to allow the user to write his message.
         * (Is call when a user click on "Reply" button)
         */
-        on_compose_message: function () {
+        on_compose_message: function (event) {
             this.instantiate_compose_message();
-            this.compose_message.on_compose_expandable();
+            this.compose_message.on_compose_expandable(event);
             return false;
         },
 
@@ -1241,6 +1236,7 @@ openerp.mail = function (session) {
             } else {
                 message.appendTo(self.$el);
             }
+            message.$el.hide().fadeIn(500);
 
             return message
         },
@@ -1262,6 +1258,9 @@ openerp.mail = function (session) {
                 // insert the message on dom
                 thread.insert_message( message, typeof dom_insert_after == 'object' ? dom_insert_after : false);
             });
+            if (!records.length && this.options.root_thread == this) {
+                this.no_message();
+            }
         },
 
         /**
@@ -1291,8 +1290,10 @@ openerp.mail = function (session) {
             var messages = _.sortBy( this.messages, function (val) { return val.id; });
             var it = _.indexOf( messages, message );
 
-            var msg_up = messages[it-1];
-            var msg_down = messages[it+1];
+            var msg_up = message.$el.prev('.oe_msg');
+            var msg_down = message.$el.next('.oe_msg');
+            var msg_up = msg_up.hasClass('oe_msg_expandable') ? _.find( this.messages, function (val) { return val.$el[0] == msg_up[0]; }) : false;
+            var msg_down = msg_down.hasClass('oe_msg_expandable') ? _.find( this.messages, function (val) { return val.$el[0] == msg_down[0]; }) : false;
 
             var message_dom = [ ["id", "=", message.id] ];
 
@@ -1397,6 +1398,8 @@ openerp.mail = function (session) {
          *...  @param {Array} [message_ids] List of ids to fetch by the root thread.
          *      When you use this option, the domain is not used for the fetch root.
          *     @param {String} [no_message] Message to display when there are no message
+         *     @param {Boolean} [show_link_partner] Display partner (authors, followers...) on link or not
+         *     @param {Boolean} [compose_as_todo] The root composer mark automatically the message as todo
          */
         init: function (parent, action) {
             this._super(parent, action);
@@ -1414,8 +1417,10 @@ openerp.mail = function (session) {
                 'show_compose_message' : false,
                 'show_compact_message' : false,
                 'compose_placeholder': false,
+                'show_link_partner': true,
                 'view_inbox': false,
                 'message_ids': undefined,
+                'compose_as_todo' : false,
             }, this.action.params);
 
             this.action.params.help = this.action.help || false;
@@ -1441,7 +1446,6 @@ openerp.mail = function (session) {
             });
 
             this.thread.appendTo( this.$el );
-            this.thread.no_message();
 
             if (this.action.params.show_compose_message) {
                 this.thread.instantiate_compose_message();
@@ -1632,7 +1636,7 @@ openerp.mail = function (session) {
          */
         do_searchview_search: function (domains, contexts, groupbys) {
             var self = this;
-            this.rpc('/web/session/eval_domain_and_context', {
+            session.web.pyeval.eval_domains_and_contexts({
                 domains: domains || [],
                 contexts: contexts || [],
                 group_by_seq: groupbys || []
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index bb787c9a21b..cca908a5d98 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -34,14 +34,14 @@
                     <button class="oe_post">Post</button>
                     <t t-call="mail.compose_message.add_attachment"/>
                     <!--<a class="oe_cancel oe_e">X</a>-->
-                    <button class="oe_full"><span class='oe_e'>&amp;ograve</span></button>
+                    <button class="oe_full" title="Open the full mail composer"><span class='oe_e'>&amp;ograve</span></button>
                 </div>
             </div>
         </div>
         <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
             <textarea t-if="widget.options.compose_placeholder" class="field_text oe_compact" t-att-placeholder="widget.options.compose_placeholder"/>
-            <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write an internal note..."/>
-            <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share to my followers..."/>
+            <textarea t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to the followers of this document..."/>
+            <textarea t-if="!widget.options.compose_placeholder and widget.options.view_mailbox" class="field_text oe_compact" placeholder="Share with my followers..."/>
         </div>
         <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
     </t>
@@ -75,9 +75,11 @@
         <t t-foreach='widget.attachment_ids' t-as='attachment'>
             <t t-if="attachment.filetype !== 'webimage'">
                 <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}">
-                    <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img></a>
+                    <a t-att-href='attachment.url'>
+                        <img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img>
+                        <div class='oe_name'><t t-raw='attachment.name' /></div>
+                    </a>
                     <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div>
-                    <div class='oe_name'><t t-raw='attachment.name' /></div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
@@ -85,9 +87,11 @@
             </t>
             <t t-if="attachment.filetype === 'webimage'">
                 <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}">
-                    <a t-att-href='attachment.url'><img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img></a>
+                    <a t-att-href='attachment.url'>
+                        <img t-att-src="widget.attachments_resize_image(attachment.id, [100,80])"></img>
+                        <div class='oe_name'><t t-raw='attachment.name' /></div>
+                    </a>
                     <div class='oe_delete oe_e'>[</div>
-                    <div class='oe_name'><t t-raw='attachment.name' /></div>
                     <div class='oe_progress_bar'>
                         uploading
                     </div>
@@ -111,7 +115,11 @@
             </t>
             <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
             <t t-set="inc" t-value="0"/>
-            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
+            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner">
+                <span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/>
+                    <a t-if="widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a>
+                    <t t-if="!widget.options.show_link_partner" t-raw="partner[1]"/>
+                </span><t t-set="inc" t-value="inc+1"/>
             </t>
             <t t-if="widget.partner_ids.length>=3">
                 <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
@@ -148,7 +156,7 @@
                 </td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
-            <tr class="oe_header_row" t-if="widget.action.params.view_inbox" >
+            <tr class="oe_header_row" t-if="widget.action.params.view_inbox and widget.action.params.show_compose_message" >
                 <td colspan="2">
                     <button type="button" class="oe_write_full oe_highlight">
                         Compose a new message
@@ -190,14 +198,15 @@
         <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type}">
 
             <div class='oe_msg_left'>
-                <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
+                <a t-if="widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
                     <img class="oe_msg_icon" t-att-src="widget.avatar"/>
                 </a>
+                <img t-if="!widget.options.show_link_partner" class="oe_msg_icon" t-att-src="widget.avatar"/>
             </div>
 
             <div class="oe_msg_center">
                 <div class='oe_msg_icons'>
-                    <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">X</a></span>
+                    <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">W</a></span>
                     <span class='oe_unread' t-if="widget.is_favorite and widget.options.show_unread"><a title="Set back to Todo" class="oe_e">v</a></span>
                     <span class='oe_unread' t-if="!widget.is_favorite and widget.options.show_unread"><a title="Set back to Inbox" class="oe_e">v</a></span>
                     <span class='oe_reply' t-if="widget.options.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
@@ -217,7 +226,8 @@
                     <t t-if="widget.attachment_ids.length > 0">
                         <div class="oe_msg_attachment_list"></div>
                     </t>
-                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a> 
+                    <a t-if="widget.author_id and widget.options.show_link_partner" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a>
+                    <span t-if="widget.author_id and !widget.options.show_link_partner"><t t-raw="widget.author_id[1]"/></span>
                     <span class='oe_subtle'>•</span>
                     <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
                     <span class='oe_subtle'>•</span>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 3dec4ef1dd2..11698c1fb62 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -5,7 +5,7 @@
         followers main template
         Template used to display the followers, the actions and the subtypes in a record.
         -->
-    <div t-name="mail.followers" class="oe_followers">
+    <div t-name="mail.followers" class="oe_followers">        
         <div class="oe_actions">
             <button type="button" class="oe_follower oe_notfollow">
                 <span class="oe_follow">Follow</span>
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index 6495481903d..46fc0c39014 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-23 21:46+0000\n"
-"Last-Translator: Ludovic CHEVALIER <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 15:06+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 05:45+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 "Language: \n"
 
 #. module: membership
@@ -159,7 +159,7 @@ msgstr ""
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr "Produit au membre"
+msgstr "Article vers membre"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
@@ -242,7 +242,7 @@ msgstr "De"
 #. module: membership
 #: constraint:membership.membership_line:0
 msgid "Error, this membership product is out of date"
-msgstr "Erreur, ce produit d'adhésion est expiré"
+msgstr "Erreur, cet article d'adhésion est obsolète"
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -316,12 +316,12 @@ msgstr ""
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
-msgstr "Produit pour l'adhésion"
+msgstr "Article pour l'adhésion"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr "Définissez le produit pour l'adhésion"
+msgstr "Définissez l'article pour l'adhésion"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
@@ -337,7 +337,7 @@ msgstr "Date jusqu'à laquelle l'adhésion reste active."
 #. module: membership
 #: view:product.product:0
 msgid "Membership products"
-msgstr "Produits d'adhésion"
+msgstr "Articles d'adhésion"
 
 #. module: membership
 #: field:res.partner,membership_state:0
@@ -433,7 +433,7 @@ msgstr "Facture de l'adhésion"
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
-msgstr "Définir un produit d'adhésion"
+msgstr "Définir un article d'adhésion"
 
 #. module: membership
 #: view:product.product:0
@@ -502,7 +502,7 @@ msgstr "Août"
 #: model:ir.ui.menu,name:membership.menu_membership_products
 #: view:product.product:0
 msgid "Membership Products"
-msgstr "Produits d'adhésion"
+msgstr "Articless d'adhésion"
 
 #. module: membership
 #: sql_constraint:product.product:0
@@ -697,7 +697,7 @@ msgstr ""
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -780,7 +780,7 @@ msgstr "Facture d'adhésion"
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
 msgid "Membership product"
-msgstr "Produit d'adhésion"
+msgstr "Article d'adhésion"
 
 #. module: membership
 #: help:membership.membership_line,member_price:0
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 12e1c89a04a..4ffd067d73e 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -483,16 +483,16 @@ class Invoice(osv.osv):
     '''Invoice'''
     _inherit = 'account.invoice'
 
-    def action_cancel(self, cr, uid, ids, *args):
+    def action_cancel(self, cr, uid, ids, context=None):
         '''Create a 'date_cancel' on the membership_line object'''
         member_line_obj = self.pool.get('membership.membership_line')
         today = time.strftime('%Y-%m-%d')
-        for invoice in self.browse(cr, uid, ids):
+        for invoice in self.browse(cr, uid, ids, context=context):
             mlines = member_line_obj.search(cr, uid,
                     [('account_invoice_line', 'in',
                         [l.id for l in invoice.invoice_line])])
             member_line_obj.write(cr, uid, mlines, {'date_cancel': today})
-        return super(Invoice, self).action_cancel(cr, uid, ids)
+        return super(Invoice, self).action_cancel(cr, uid, ids, context=context)
 
 Invoice()
 
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 2d3f56913e1..3cdae38fd51 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-26 14:52+0000\n"
+"PO-Revision-Date: 2012-11-29 14:30+0000\n"
 "Last-Translator: Numérigraphe <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: 2012-11-27 05:23+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uos:0
@@ -332,7 +332,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr "Production de produits"
+msgstr "Production d'articles"
 
 #. module: mrp
 #: constraint:mrp.bom:0
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 16f18fc034d..e1c5cbb92e2 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-25 16:35+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2012-11-28 14:03+0000\n"
+"Last-Translator: hifly <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: 2012-11-26 04:40+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@@ -29,13 +29,13 @@ msgid ""
 "                This installs the module mrp_repair."
 msgstr ""
 "允许管理所有的产品维修.\n"
-"                    * 添加删除要修复的产品\n"
+"                    * 添加/删除要修复的产品\n"
 "                    * 影响库存\n"
 "                    * 开票（产品和/或服务）\n"
 "                    * 保修\n"
 "                    * 修理报价单\n"
 "                    * 技术人员和最终客户的说明.\n"
-"             这需要安装模块mrp_repair."
+"             为此需要安装模块mrp_repair."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -45,12 +45,12 @@ msgstr "周期数"
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr "系统用于查找部件的位置。"
+msgstr "系统用于查找部件的库位。"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
 msgid "Work Centers Utilisation"
-msgstr "工作中心利用率"
+msgstr "工作中心效率"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -1231,6 +1231,9 @@ msgid ""
 "                cases entail a small performance impact.\n"
 "                This installs the module mrp_jit."
 msgstr ""
+"允许需求计划及时进行排程。\n"
+"                所有需求计划将被立即处理。这可能会影响一点效率。\n"
+"                为此需要安装模块 mrp_jit."
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -1491,6 +1494,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击创建一个新的属性。\n"
+"              </p><p>\n"
+"               OpenERP里的属性用于在制造同一个产品却有不同方法时，选择正确的BoM。\n"
+"                你可以为每个BoM设置多个属性。 \n"
+"                销售员创建销售订单时，可以关联多个属性，\n"
+"                这样OpenERP将根据这些属性自动匹配对应的BoM。\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@@ -1581,7 +1593,7 @@ msgid ""
 "                within your work centers in order to produce a product. They "
 "are attached to bills of materials\n"
 "                that will define the required raw materials."
-msgstr ""
+msgstr "工艺路线允许你创建并管理制造工序。为了生产产品，这些工序被分配到工作中心。我们在定义原材料的BoM里可以设置工艺路线。"
 
 #. module: mrp
 #: view:report.workcenter.load:0
@@ -2151,6 +2163,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                点击创建BoM。\n"
+"              </p><p>\n"
+"                BoM允许你为制造一个产品而定义一组原材料；\n"
+"                生产可通过生产订单或者产品包装来完成。\n"
+"              </p><p>\n"
+"                OpenERP使用这些BoM，依据需求自动给出生产订单建议。\n"
+"              </p>\n"
+"            "
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -2175,6 +2196,10 @@ msgid ""
 "                With this module: A + B + C -> D + E.\n"
 "                This installs the module mrp_byproduct."
 msgstr ""
+"你可以在BoM里配置副产品。\n"
+"                不安装该模块，只能做到: A + B + C -> D.\n"
+"                安装该模块后，可以做到: A + B + C -> D + E.\n"
+"                为此需要安装模块 mrp_byproduct."
 
 #. module: mrp
 #: field:procurement.order,bom_id:0
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 6ca9cb3d705..7a94b1a660c 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -53,7 +53,7 @@ access_stock_move_mrp_manager,stock.move mrp_manager,stock.model_stock_move,mrp.
 access_mrp_production_product_line_manager,mrp.production.product.line manager,model_mrp_production_product_line,mrp.group_mrp_manager,1,0,0,0

 access_account_sequence_fiscalyear_system,account.sequence.fiscalyear.system,account.model_account_sequence_fiscalyear,mrp.group_mrp_manager,1,0,0,0

 access_stock_production_lot_user,stock.production.lot,stock.model_stock_production_lot,mrp.group_mrp_user,1,1,1,1

-access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,mrp.group_mrp_manager,1,0,0,0

+access_stock_warehouse_orderpoint_user,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,mrp.group_mrp_user,1,0,0,0

 access_stock_picking_mrp_manager,stock.picking mrp_manager,stock.model_stock_picking,mrp.group_mrp_manager,1,0,0,0

 access_report_mrp_inout_user,report.mrp.inout user,model_report_mrp_inout,mrp.group_mrp_user,1,0,0,0

 access_report_workcenter_load_user,report.workcenter.load.user,model_report_workcenter_load,mrp.group_mrp_user,1,0,0,0

diff --git a/addons/mrp_byproduct/i18n/fr.po b/addons/mrp_byproduct/i18n/fr.po
index f615e3e76ee..a79185bffe5 100644
--- a/addons/mrp_byproduct/i18n/fr.po
+++ b/addons/mrp_byproduct/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-26 13:58+0000\n"
+"PO-Revision-Date: 2012-11-29 14:45+0000\n"
 "Last-Translator: Numérigraphe <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: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -31,7 +31,7 @@ msgstr ""
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: mrp_byproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -41,7 +41,7 @@ msgstr "Fixe"
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unité de mesure d'article"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_production
@@ -62,6 +62,9 @@ msgid ""
 "You should install the mrp_byproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"Toutes les quantités doivent être supérieures à 0.\n"
+"Vous devez installer le module mrp_byproduct si vous souhaitez gérer des "
+"produits supplémentaires dans les nomenclatures !"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
@@ -72,7 +75,7 @@ msgstr ""
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "Modifier les quantités d'articles"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -87,7 +90,7 @@ msgstr "Nomenclature"
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_qty:0
 msgid "Product Qty"
-msgstr "Qté de Produit"
+msgstr "Qté d'articles"
 
 #. module: mrp_byproduct
 #: code:addons/mrp_byproduct/mrp_byproduct.py:62
diff --git a/addons/mrp_byproduct/i18n/zh_CN.po b/addons/mrp_byproduct/i18n/zh_CN.po
index 13da473b1c9..347fe584ee8 100644
--- a/addons/mrp_byproduct/i18n/zh_CN.po
+++ b/addons/mrp_byproduct/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-06-14 05:53+0000\n"
+"PO-Revision-Date: 2012-11-28 14:12+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mrp_byproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -27,6 +27,9 @@ msgid ""
 "BoM / quantity of manufactured product set on the BoM * quantity of "
 "manufactured product in the production order.)'"
 msgstr ""
+"使用BoM定义在生产订单上有多少数量的副产品。\r\n"
+"“固定的” 描绘了生成的副产品的数量总是等于 BoM设置的，无论生产订单生产了多少产品。\r\n"
+"相对的，“可变的”意味着数量是要被计算的：BoM设置的副产品数量 / BoM 上设置的产品生产数量 * 在生产订单中的成品数量。)'"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_id:0
@@ -41,7 +44,7 @@ msgstr "固定的"
 #. module: mrp_byproduct
 #: field:mrp.subproduct,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "产品计量单位"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_production
@@ -60,17 +63,19 @@ msgid ""
 "You should install the mrp_byproduct module if you want to manage extra "
 "products on BoMs !"
 msgstr ""
+"所有的产品数量必须大于0。\n"
+"如果你要在BOM上面管理额外的产品，你要安装mrp_byproduct模块。"
 
 #. module: mrp_byproduct
 #: view:mrp.bom:0
 #: field:mrp.bom,sub_products:0
 msgid "Byproducts"
-msgstr ""
+msgstr "副产品"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_change_production_qty
 msgid "Change Quantity of Products"
-msgstr ""
+msgstr "修改产成品数量"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -91,7 +96,7 @@ msgstr "产品数量"
 #: code:addons/mrp_byproduct/mrp_byproduct.py:62
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: mrp_byproduct
 #: field:mrp.subproduct,bom_id:0
@@ -124,9 +129,9 @@ msgstr "错误！你不能创建循环引用的物料清单。"
 msgid ""
 "The Product Unit of Measure you chose has a different category than in the "
 "product form."
-msgstr ""
+msgstr "你选择的计量单位跟产品表单的计量单位在不同的类别。"
 
 #. module: mrp_byproduct
 #: model:ir.model,name:mrp_byproduct.model_mrp_subproduct
 msgid "Byproduct"
-msgstr ""
+msgstr "副产品"
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index 352f8d3a8a7..d30f692fbbd 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-01-13 02:59+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 14:28+0000\n"
+"Last-Translator: TeMPO <openerp@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: 2012-11-25 06:13+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -46,6 +46,7 @@ msgstr "mrp_operations.operation.code"
 msgid ""
 "Work order has been <b>cancelled</b> for production order <em>%s</em>."
 msgstr ""
+"L'ordre de travail de l'ordre de fabrication <em>%s</em> a été <b>annulé</b>."
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -83,12 +84,12 @@ msgstr "Résumer"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Product to Produce"
-msgstr "Produit à fabriquer"
+msgstr "Article à produire"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation:0
 msgid "Production Operation"
-msgstr "Opération de Production"
+msgstr "Opération de production"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -100,6 +101,7 @@ msgstr ""
 #, python-format
 msgid "Work order is <b>pending</b> for production order <em>%s</em>."
 msgstr ""
+"L'ordre de travail de l'ordre de fabrication <em>%s</em> est en attente."
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
@@ -130,7 +132,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
 msgid "Production Order"
-msgstr "Ordre de Production"
+msgstr "Ordre de fabrication"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -145,7 +147,7 @@ msgstr "Création de l'ordre de travail"
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr "Les ordres de travail sont créés à partir de l'ordre de fabrication"
+msgstr "Les ordres de travail sont créés à partir de l'ordre de fabrication."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:122
@@ -210,7 +212,7 @@ msgstr "Brouillon"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
-msgstr ""
+msgstr "Poste de charge"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
@@ -258,7 +260,7 @@ msgstr "Date planifiée"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr "Qté de produit"
+msgstr "Qté d'articles"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:122
@@ -352,6 +354,8 @@ msgstr "Décembre"
 #, python-format
 msgid "Work order has been <b>done</b> for production order <em>%s</em>."
 msgstr ""
+"L'ordre de travail est <b>terminé</b> pour l'ordre de fabrication "
+"<em>%s</em>."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -388,7 +392,7 @@ msgstr "Date de Début"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Waiting Goods"
-msgstr "Produits en attente"
+msgstr "En attente de marchandises"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
@@ -458,7 +462,7 @@ msgstr "En attente"
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
 msgid "Production Operation Code"
-msgstr "Code d'Opération de Production"
+msgstr "Code d'opération de production"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:504
@@ -481,7 +485,7 @@ msgstr "Démarré"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production started late"
-msgstr ""
+msgstr "Production démarrée en retard"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -528,7 +532,7 @@ msgstr "Novembre"
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Vous devez attribuer un numéro de série pour cet article."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -549,6 +553,8 @@ msgstr "Janvier"
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
 msgstr ""
+"Il  est impossible de déplacer des articles depuis ou vers un emplacement de "
+"type \"vue\"."
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -652,6 +658,7 @@ msgstr ""
 #, python-format
 msgid "Work order has been <b>created</b> for production order <em>%s</em>."
 msgstr ""
+"L'ordre de travail a été <b>crée</b> pour l'ordre de fabrication <em>%s</em>."
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -701,7 +708,7 @@ msgstr "Délai"
 #: field:mrp.workorder,production_id:0
 #: field:mrp_operations.operation,production_id:0
 msgid "Production"
-msgstr "Production"
+msgstr "Fabrication"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -732,12 +739,12 @@ msgstr "Date planifiée"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Vous tentez d'assigner un lot qui n'appartient pas au même article."
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -817,6 +824,8 @@ msgstr "Nb. de ligne d'ordre"
 #, python-format
 msgid "Work order has been <b>started</b> for production order <em>%s</em>."
 msgstr ""
+"L'ordre de travail a été <b>démarré</b> pour l'ordre de fabrication "
+"<em>%s</em>."
 
 #. module: mrp_operations
 #: view:mrp.production:0
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index aee98502367..c21999ea788 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 09:39+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 09:53+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -45,7 +45,7 @@ msgstr "mrp_operations.operation.code"
 #, python-format
 msgid ""
 "Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
+msgstr "生产订单 <em>%s</em>的工单被 <b>取消</b>。"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -61,7 +61,7 @@ msgstr "信息来源于工艺定义"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "计量单位"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -99,7 +99,7 @@ msgstr "设为草稿"
 #: code:addons/mrp_operations/mrp_operations.py:238
 #, python-format
 msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
+msgstr "生产订单 <em>%s</em>的工单被 <b>挂起</b>。"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
@@ -185,7 +185,7 @@ msgstr "库存调拨"
 #: code:addons/mrp_operations/mrp_operations.py:524
 #, python-format
 msgid "No operation to cancel."
-msgstr ""
+msgstr "没有操作被取消"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:517
@@ -210,7 +210,7 @@ msgstr "草稿"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production Workcenter"
-msgstr ""
+msgstr "生成工作中心"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
@@ -245,7 +245,7 @@ msgstr "工票分析"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_action_planning
 msgid "Work Orders By Resource"
-msgstr ""
+msgstr "工单通过资源"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -319,6 +319,15 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            单击创建一个新的工单。\n"
+"          </p><p>\n"
+"           工单是每个生产订单要被执行的操作的列表。\n"
+"            一旦你的启动生产订单的第一个工单，生产订单将被自动标记为启动。\n"
+"            一旦你完成了生成订单最后的操作，生成订单被自动完成。\n"
+"            并且相关的产品被制造完成。\n"
+"          </p>\n"
+"        "
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
@@ -349,7 +358,7 @@ msgstr "12月"
 #: code:addons/mrp_operations/mrp_operations.py:230
 #, python-format
 msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
+msgstr "生产订单 <em>%s</em>的工单被 <b>完成</b>。"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -391,7 +400,7 @@ msgstr "等待原料"
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production Status"
-msgstr ""
+msgstr "生产状态"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,state:0
@@ -462,7 +471,7 @@ msgstr "工单编号"
 msgid ""
 "Operation has already started! You can either Pause/Finish/Cancel the "
 "operation."
-msgstr ""
+msgstr "操作已经开始！你可以 暂停/完成/取消 这个操作。"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -524,7 +533,7 @@ msgstr "11月"
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "你必须为这个产品指定序列号"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -544,7 +553,7 @@ msgstr "1月"
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
-msgstr ""
+msgstr "你不能从视图类型的库位移动"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -642,12 +651,17 @@ msgid ""
 "* When order is completely processed that time it is set in 'Finished' "
 "status."
 msgstr ""
+"* 工单被创建时，“草稿“状态。\n"
+"* 从工单被用户进入开始模式后，设为”在进行中“模式。\n"
+"* 当工单是运行模式，在此期间，如果用户要停止或作出改变，可设置为”挂起“状态。\n"
+"* 当用户取消工单，设置为”取消状态“。\n"
+"* 从工单被完成的时候开始，设置为”完成“状态。"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:214
 #, python-format
 msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
+msgstr "生产订单 <em>%s</em>的工单被 <b>创建</b>。"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_startoperation0
@@ -675,6 +689,14 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            单击启动一个新的工单。\n"
+"          </p><p>\n"
+"            要生产或者组装产品，并且使用原料，也必须处理生产操作完成产品。\n"
+"            生产操作经常被叫做 工单。\n"
+"            各种操作对生产成本有不同的影响，计划取决于可用的工作负荷上面。\n"
+"          </p>\n"
+"        "
 
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
@@ -733,7 +755,7 @@ msgstr "产品"
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "您企图为不一样的产品创建批号"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -746,7 +768,7 @@ msgstr "总小时数"
 msgid ""
 "Check this to be able to move independently all production orders, without "
 "moving dependent ones."
-msgstr "勾上这个勾就不会按工作中心工作时间重排生产单日期。"
+msgstr "选中这里就不会按工作中心工作时间重排生产单日期。"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -810,7 +832,7 @@ msgstr "明细"
 #: code:addons/mrp_operations/mrp_operations.py:222
 #, python-format
 msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
+msgstr "生产订单 <em>%s</em>的工单已经 <b>开始</b>。"
 
 #. module: mrp_operations
 #: view:mrp.production:0
diff --git a/addons/mrp_repair/i18n/fr.po b/addons/mrp_repair/i18n/fr.po
index 1cf385ecf00..37fda3d8203 100644
--- a/addons/mrp_repair/i18n/fr.po
+++ b/addons/mrp_repair/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-05-10 17:18+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 14:41+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -75,7 +75,7 @@ msgstr ""
 #: code:addons/mrp_repair/mrp_repair.py:440
 #, python-format
 msgid "No product defined on Fees!"
-msgstr "Aucun produit défini avec des frais !"
+msgstr "Aucun article défini avec des frais !"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -451,7 +451,7 @@ msgstr "Facturée"
 #: field:mrp.repair.fee,product_uom:0
 #: field:mrp.repair.line,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Unité de mesure d'article"
 
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
@@ -537,7 +537,7 @@ msgstr "inconnue"
 #: field:mrp.repair,product_id:0
 #: report:repair.order:0
 msgid "Product to Repair"
-msgstr "Produit à Réparer"
+msgstr "Article à réparer"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
@@ -608,7 +608,7 @@ msgstr "Terminer la Réparation"
 #: code:addons/mrp_repair/mrp_repair.py:447
 #, python-format
 msgid "No account defined for product \"%s\"."
-msgstr "Pas de compte défini pour le produit \"%s\"."
+msgstr "Pas de compte défini pour l'article \"%s\"."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -626,7 +626,7 @@ msgstr "Quantité"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Product Information"
-msgstr ""
+msgstr "Information de l'article"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.act_mrp_repair_invoice
@@ -732,7 +732,7 @@ msgstr "Lignes d'Opérations"
 #: field:mrp.repair.fee,product_id:0
 #: field:mrp.repair.line,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 00c68186108..088aa35e915 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -191,7 +191,6 @@
             <field name="name">Sales Journal - (OpenERP IN)</field>
             <field name="code">SAJ-OpenERP IN</field>
             <field name="type">sale</field>
-            <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
@@ -204,7 +203,6 @@
             <field name="name">Sales Credit Note Journal - (OpenERP IN)</field>
             <field name="code">SCNJ-OpenERP IN</field>
             <field name="type">sale_refund</field>
-            <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
@@ -217,7 +215,6 @@
             <field name="name">Expenses Journal - (OpenERP IN)</field>
             <field name="code">EXJ-OpenERP IN</field>
             <field name="type">purchase</field>
-            <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
@@ -230,7 +227,6 @@
             <field name="name">Expenses Credit Notes Journal - (OpenERP IN)</field>
             <field name="code">ECNJ-OpenERP IN</field>
             <field name="type">purchase_refund</field>
-            <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
@@ -243,7 +239,6 @@
             <field name="name">Bank Journal - (OpenERP IN)</field>
             <field name="code">BNK-OpenERP IN</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
@@ -256,7 +251,6 @@
             <field name="name">Checks Journal - (OpenERP IN)</field>
             <field name="code">CHK-OpenERP IN</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
@@ -269,7 +263,6 @@
             <field name="name">Cash Journal - (OpenERP IN)</field>
             <field name="code">CSH-OpenERP IN</field>
             <field name="type">cash</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
@@ -283,7 +276,6 @@
             <field name="name">Sales Journal - (OpenERP US)</field>
             <field name="code">SAJ-OpenERP US</field>
             <field name="type">sale</field>
-            <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
@@ -296,7 +288,6 @@
             <field name="name">Sales Credit Note Journal - (OpenERP US)</field>
             <field name="code">SCNJ-OpenERP US</field>
             <field name="type">sale_refund</field>
-            <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
@@ -309,7 +300,6 @@
             <field name="name">Expenses Journal - (OpenERP US)</field>
             <field name="code">EXJ-OpenERP US</field>
             <field name="type">purchase</field>
-            <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
@@ -322,7 +312,6 @@
             <field name="name">Expenses Credit Notes Journal - (OpenERP US)</field>
             <field name="code">ECNJ-OpenERP US</field>
             <field name="type">purchase_refund</field>
-            <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
@@ -335,7 +324,6 @@
             <field name="name">Bank Journal - (OpenERP US)</field>
             <field name="code">BNK-OpenERP US</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
@@ -348,7 +336,6 @@
             <field name="name">Checks Journal - (OpenERP US)</field>
             <field name="code">CHK-OpenERP US</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
@@ -361,7 +348,6 @@
             <field name="name">Cash Journal - (OpenERP US)</field>
             <field name="code">CSH-OpenERP US</field>
             <field name="type">cash</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
@@ -376,7 +362,6 @@
             <field name="name">Sales Journal - (OpenERP BE)</field>
             <field name="code">SAJ-OpenERP BE</field>
             <field name="type">sale</field>
-            <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_sale_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
@@ -389,7 +374,6 @@
             <field name="name">Sales Credit Note Journal - (OpenERP BE)</field>
             <field name="code">SCNJ-OpenERP BE</field>
             <field name="type">sale_refund</field>
-            <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_sales_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_sale"/>
@@ -402,7 +386,6 @@
             <field name="name">Expenses Journal - (OpenERP BE)</field>
             <field name="code">EXJ-OpenERP BE</field>
             <field name="type">purchase</field>
-            <field name="view_id" ref="account.account_sp_journal_view"/>
             <field name="sequence_id" ref="account.sequence_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
@@ -415,7 +398,6 @@
             <field name="name">Expenses Credit Notes Journal - (OpenERP BE)</field>
             <field name="code">ECNJ-OpenERP BE</field>
             <field name="type">purchase_refund</field>
-            <field name="view_id" ref="account.account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="account.sequence_refund_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="account.a_expense"/>
@@ -428,7 +410,6 @@
             <field name="name">Bank Journal - (OpenERP BE)</field>
             <field name="code">BNK-OpenERP BE</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_bank_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
@@ -441,7 +422,6 @@
             <field name="name">Checks Journal - (OpenERP BE)</field>
             <field name="code">CHK-OpenERP BE</field>
             <field name="type">bank</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_check_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
@@ -454,7 +434,6 @@
             <field name="name">Cash Journal - (OpenERP BE)</field>
             <field name="code">CSH-OpenERP BE</field>
             <field name="type">cash</field>
-            <field name="view_id" ref="account.account_journal_bank_view"/>
             <field name="sequence_id" ref="account.sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="account.cash"/>
             <field model="account.account" name="default_credit_account_id" ref="account.cash"/>
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
index 8f6aa5b3d01..9d45b6233ef 100644
--- a/addons/note/security/note_security.xml
+++ b/addons/note/security/note_security.xml
@@ -6,10 +6,5 @@
         <field name="name">Notes / Fancy mode</field>

 	<field name="category_id" ref="base.module_category_hidden"/>

     </record>

-

-    <record id="base.group_user" model="res.groups">

-	<field name="implied_ids" eval="[(4, ref('group_note_fancy'))]"/>

-    </record>

-

 </data>

 </openerp>

diff --git a/addons/pad/i18n/zh_CN.po b/addons/pad/i18n/zh_CN.po
index 5a329c44078..08ed2ebf7ba 100644
--- a/addons/pad/i18n/zh_CN.po
+++ b/addons/pad/i18n/zh_CN.po
@@ -8,26 +8,26 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 09:50+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 08:20+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: pad
 #. openerp-web
 #: code:addons/pad/static/src/xml/pad.xml:27
 #, python-format
 msgid "&Ntilde;"
-msgstr ""
+msgstr "&Ntilde;"
 
 #. module: pad
 #: model:ir.model,name:pad.model_pad_common
 msgid "pad.common"
-msgstr ""
+msgstr "pad.common"
 
 #. module: pad
 #: sql_constraint:res.company:0
@@ -37,7 +37,7 @@ msgstr "公司名称必须唯一！"
 #. module: pad
 #: help:res.company,pad_key:0
 msgid "Etherpad lite api key."
-msgstr ""
+msgstr "Etherpad lite api key."
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -56,27 +56,27 @@ msgstr "错误！您不能创建递归公司."
 msgid ""
 "You must configure the etherpad through the menu Setting > Companies > "
 "Companies, in the configuration tab of your company."
-msgstr ""
+msgstr "你必须通过菜单 设置->公司->公司,配置 etherpad ,在你的公司的 配置标签中。"
 
 #. module: pad
 #: view:res.company:0
 msgid "Pads"
-msgstr ""
+msgstr "Pads"
 
 #. module: pad
 #: field:res.company,pad_server:0
 msgid "Pad Server"
-msgstr ""
+msgstr "Pad 服务器"
 
 #. module: pad
 #: field:res.company,pad_key:0
 msgid "Pad Api Key"
-msgstr ""
+msgstr "Pad Api Key"
 
 #. module: pad
 #: help:res.company,pad_server:0
 msgid "Etherpad lite server. Example: beta.primarypad.com"
-msgstr ""
+msgstr "Etherpad lite服务器，例如 beta.primarypad.com"
 
 #, python-format
 #~ msgid "Ok"
diff --git a/addons/pad_project/i18n/zh_CN.po b/addons/pad_project/i18n/zh_CN.po
index a560305a73c..bd6c2d03e02 100644
--- a/addons/pad_project/i18n/zh_CN.po
+++ b/addons/pad_project/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 09:54+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:49+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
@@ -25,7 +25,7 @@ msgstr "错误！任务结束日期必须大于任务开始日期"
 #. module: pad_project
 #: field:project.task,description_pad:0
 msgid "Description PAD"
-msgstr ""
+msgstr "PAD 说明"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
diff --git a/addons/plugin_outlook/i18n/zh_CN.po b/addons/plugin_outlook/i18n/zh_CN.po
index 4a108f01ede..49dbb66611a 100644
--- a/addons/plugin_outlook/i18n/zh_CN.po
+++ b/addons/plugin_outlook/i18n/zh_CN.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 09:56+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 07:53+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:29+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin32:0
 msgid "Outlook Plug-in 32bits"
-msgstr ""
+msgstr "32位Outlook 插件"
 
 #. module: plugin_outlook
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "下载并安装插件"
 
 #. module: plugin_outlook
 #: model:ir.model,name:plugin_outlook.model_outlook_installer
@@ -35,7 +35,7 @@ msgstr "outlook.installer"
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "MS .Net Framework 3.5 or above."
-msgstr ""
+msgstr "MS  .net 框架3.5 或以上"
 
 #. module: plugin_outlook
 #: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer
@@ -48,7 +48,7 @@ msgstr "安装Outlook插件"
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "System requirements:"
-msgstr ""
+msgstr "系统要求"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -60,22 +60,22 @@ msgstr "标题"
 msgid ""
 "Click on the link above to download the installer for either 32 or 64 bits, "
 "and execute it."
-msgstr ""
+msgstr "在链接上面单击 下载32位或64位安装文件，然后执行。"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "MS Outlook 2005 or above."
-msgstr ""
+msgstr "MS Outlook 2005 或以上"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #. module: plugin_outlook
 #: field:outlook.installer,plugin64:0
 msgid "Outlook Plug-in 64bits"
-msgstr ""
+msgstr "64位Outlook 插件"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -86,7 +86,7 @@ msgstr "安装和设置步骤"
 #: help:outlook.installer,plugin32:0
 #: help:outlook.installer,plugin64:0
 msgid "Outlook plug-in file. Save this file and install it in Outlook."
-msgstr ""
+msgstr "Outlook 插件文件，保存，然后在Outlook中安装"
 
 #~ msgid "Outlook Plug-in"
 #~ msgstr "Outlook插件"
diff --git a/addons/plugin_thunderbird/i18n/zh_CN.po b/addons/plugin_thunderbird/i18n/zh_CN.po
index d7d758a373d..4581f592c4d 100644
--- a/addons/plugin_thunderbird/i18n/zh_CN.po
+++ b/addons/plugin_thunderbird/i18n/zh_CN.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-14 10:00+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 13:58+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Restart Thunderbird."
-msgstr ""
+msgstr "重启Thunderbird。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Thunderbird 插件安装："
 
 #. module: plugin_thunderbird
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "下载并安装插件"
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
@@ -43,7 +43,7 @@ msgstr "安装 Thunderbird 插件"
 #: help:plugin_thunderbird.installer,plugin_file:0
 msgid ""
 "Thunderbird plug-in file. Save this file and install it in Thunderbird."
-msgstr ""
+msgstr "Thunderbird 插件的文件file。保存此文件，然后在Thunderbird 中安装。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -63,7 +63,7 @@ msgstr "文件名"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "单击“现在安装”"
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
@@ -79,7 +79,7 @@ msgstr "Thunderbird 插件"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Configure your openerp server."
-msgstr ""
+msgstr "配置你的 openerp 服务器"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -91,17 +91,17 @@ msgstr "允许你选择一个你想链接到你电子邮件和它的附件的对
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "保存 Thunderbird 插件。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Select the plug-in (the file named openerp_plugin.xpi)."
-msgstr ""
+msgstr "选择插件（文件名是 openerp_plugin.xpi ）。"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -109,11 +109,13 @@ msgid ""
 "From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> "
 "Install add-on from file..."
 msgstr ""
+"从 Thunderbird 的菜单条：Tools ­> Add-ons -> Screwdriver/Wrench Icon ->  Install "
+"add-on from file..."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "From the Thunderbird menubar: OpenERP -> Configuration."
-msgstr ""
+msgstr "从 Thunderbird  的菜单条 : OpenERP -> Configuration."
 
 #~ msgid "Description"
 #~ msgstr "描述"
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index 8bbc8f67a01..3d47ee53823 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-05-10 18:18+0000\n"
+"PO-Revision-Date: 2012-11-28 18:29+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:45+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr "Numéro du Produit"
+msgstr "N° article"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
@@ -130,7 +130,7 @@ msgstr "Jour"
 #: field:report.sales.by.margin.pos,product_name:0
 #: field:report.sales.by.margin.pos.month,product_name:0
 msgid "Product Name"
-msgstr "Nom du Produit"
+msgstr "Nom de l'article"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pamplemousse_rouge_pamplemousse_product_template
@@ -787,7 +787,7 @@ msgstr "Pizza"
 #: code:addons/point_of_sale/wizard/pos_return.py:240
 #, python-format
 msgid "Add Product"
-msgstr "Ajouter un produit"
+msgstr "Ajouter un article"
 
 #. module: point_of_sale
 #: field:pos.config,name:0
@@ -992,7 +992,7 @@ msgstr "Mars"
 #: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
 #: report:pos.user.product:0
 msgid "User's Product"
-msgstr "Produit utilisateur"
+msgstr "Articles utilisateur"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:1141
@@ -1002,7 +1002,7 @@ msgid ""
 "Please set one before choosing a product."
 msgstr ""
 "Vous devez sélectionner une liste de prix dans le formulaire de vente !\n"
-"Veuillez en choisir une avant de choisir un produit"
+"Veuillez en choisir une avant de choisir un article"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
@@ -1449,7 +1449,7 @@ msgstr "Dr. Oetker Restaurant Funghi"
 #: model:ir.actions.act_window,name:point_of_sale.pos_category_action
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_category
 msgid "Product Categories"
-msgstr ""
+msgstr "Catégories d'articles"
 
 #. module: point_of_sale
 #: help:pos.config,journal_id:0
@@ -1581,7 +1581,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/xml/pos.xml:348
 #, python-format
 msgid "The scanned product was not recognized"
-msgstr ""
+msgstr "L'article scanné n'a pas été reconnu"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
@@ -1690,7 +1690,7 @@ msgstr "Annuler"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:306
 #, python-format
 msgid "Please put your product on the scale"
-msgstr ""
+msgstr "Veuillez placer l'article sur la balance"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
@@ -1725,7 +1725,7 @@ msgstr "Prix unitaire"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:184
 #, python-format
 msgid "Product Weighting"
-msgstr ""
+msgstr "Pesée des articles"
 
 #. module: point_of_sale
 #. openerp-web
@@ -1866,7 +1866,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.unreferenced_product_product_template
 msgid "Unreferenced Products"
-msgstr ""
+msgstr "Article inconnu"
 
 #. module: point_of_sale
 #: view:pos.ean_wizard:0
@@ -1949,6 +1949,8 @@ msgstr ""
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
+"Indique l'ordre d'affichage lorsqu'une liste de catégories d'articles est "
+"affichée."
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -2099,7 +2101,7 @@ msgstr ""
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_products
 #: view:pos.order:0
 msgid "Products"
-msgstr "Produits"
+msgstr "Articles"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
@@ -2283,7 +2285,7 @@ msgstr ""
 #: report:pos.details:0
 #: report:pos.details_summary:0
 msgid "Qty of product"
-msgstr "Qté de Produits"
+msgstr "Qté d'articles"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pomme_golden_perlim_product_template
@@ -2323,7 +2325,7 @@ msgstr "Coca-Cola Light 50cl"
 #: code:addons/point_of_sale/static/src/xml/pos.xml:472
 #, python-format
 msgid "Unknown Product"
-msgstr ""
+msgstr "Article inconnu"
 
 #. module: point_of_sale
 #. openerp-web
@@ -2754,7 +2756,7 @@ msgstr "Statistiques des commandes du point de vente"
 #: view:report.pos.order:0
 #: field:report.pos.order,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_pollo_product_template
diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 74b4bbf5753..1d2c22053fb 100644
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -42,12 +42,8 @@ access_account_move,account.move,account.model_account_move,group_pos_manager,1,
 access_account_journal,account.journal,account.model_account_journal,group_pos_user,1,1,1,0

 access_account_journal_period_user,account.journal.period user,account.model_account_journal_period,group_pos_user,1,1,1,1

 access_account_journal_period_manager,account.journal.period manager,account.model_account_journal_period,group_pos_manager,1,0,0,0

-access_account_journal_view,account.journal.view,account.model_account_journal_view,group_pos_user,1,1,1,0

-access_account_journal_view_manager,account.journal.view manager,account.model_account_journal_view,group_pos_manager,1,0,0,0

 access_account_analytic_line,account.analytic.line,analytic.model_account_analytic_line,group_pos_user,1,1,1,0

 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,group_pos_user,1,1,1,0

-access_account_journal_column,account.journal.column,account.model_account_journal_column,group_pos_user,1,1,1,0

-access_account_journal_column_manager,account.journal.column manager,account.model_account_journal_column,group_pos_manager,1,0,0,0

 access_ir_property_pos_manager,ir.property manager,base.model_ir_property,group_pos_manager,1,1,1,1

 access_account_bank_statement_line_manager,account.bank.statement.line manager,account.model_account_bank_statement_line,group_pos_manager,1,1,1,1

 access_account_invoice_manager,account.invoice manager,account.model_account_invoice,group_pos_manager,1,1,1,1

diff --git a/addons/portal/i18n/zh_CN.po b/addons/portal/i18n/zh_CN.po
index 34543664081..ad4cb4b2155 100644
--- a/addons/portal/i18n/zh_CN.po
+++ b/addons/portal/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-29 15:52+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -52,7 +52,7 @@ msgstr ""
 #. module: portal
 #: view:portal.wizard.user:0
 msgid "Contacts"
-msgstr ""
+msgstr "联系人"
 
 #. module: portal
 #: view:share.wizard:0
@@ -63,27 +63,27 @@ msgstr "现有的组"
 #. module: portal
 #: view:res.groups:0
 msgid "Portal Groups"
-msgstr ""
+msgstr "门户组"
 
 #. module: portal
 #: field:portal.wizard,welcome_message:0
 msgid "Invitation Message"
-msgstr ""
+msgstr "邀请消息"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_company
 msgid "Our company"
-msgstr ""
+msgstr "我们公司"
 
 #. module: portal
 #: view:res.groups:0
 msgid "Non-Portal Groups"
-msgstr ""
+msgstr "非门户组"
 
 #. module: portal
 #: view:share.wizard:0
 msgid "Details"
-msgstr ""
+msgstr "详情"
 
 #. module: portal
 #: help:portal.payment.acquirer,visible:0
@@ -100,23 +100,23 @@ msgstr "共享向导"
 #. module: portal
 #: sql_constraint:res.groups:0
 msgid "The name of the group must be unique !"
-msgstr ""
+msgstr "群组名必须唯一！"
 
 #. module: portal
 #: field:portal.wizard.user,email:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: portal
 #: view:portal.wizard:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: portal
 #: model:ir.actions.act_window,name:portal.action_jobs
 #: model:ir.ui.menu,name:portal.portal_jobs
 msgid "Jobs"
-msgstr ""
+msgstr "作业"
 
 #. module: portal
 #: field:portal.wizard,user_ids:0
@@ -127,7 +127,7 @@ msgstr "用户"
 #: code:addons/portal/acquirer.py:74
 #, python-format
 msgid "Pay safely online"
-msgstr ""
+msgstr "安全在线支付"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -145,7 +145,7 @@ msgstr ""
 #: code:addons/portal/wizard/share_wizard.py:38
 #, python-format
 msgid "Users you already shared with"
-msgstr ""
+msgstr "你已经分享的用户"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
@@ -169,22 +169,22 @@ msgstr "你在 %(company)s 的OpenERP帐号"
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "cr: the current database cursor"
-msgstr ""
+msgstr "cr: 当前数据库游标"
 
 #. module: portal
 #: field:portal.wizard.user,in_portal:0
 msgid "In Portal"
-msgstr ""
+msgstr "在门户中"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_invoices_payements
 msgid "Invoices and Payments"
-msgstr ""
+msgstr "开票和支付"
 
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_after_sales
 msgid "After Sale Services"
-msgstr ""
+msgstr "售后服务"
 
 #. module: portal
 #: model:res.groups,comment:portal.group_portal
@@ -203,7 +203,7 @@ msgstr ""
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_projects
 msgid "Projects"
-msgstr ""
+msgstr "项目"
 
 #. module: portal
 #: view:share.wizard:0
@@ -226,17 +226,17 @@ msgstr ""
 #. module: portal
 #: field:portal.payment.acquirer,name:0
 msgid "Name"
-msgstr ""
+msgstr "姓名"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "访问用户组"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
 msgid "uid: the current user id"
-msgstr ""
+msgstr "uid: 当前用户 id"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -263,12 +263,12 @@ msgstr ""
 #. module: portal
 #: field:portal.wizard.user,partner_id:0
 msgid "Contact"
-msgstr ""
+msgstr "联系人"
 
 #. module: portal
 #: model:ir.model,name:portal.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "发出邮件"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:199
@@ -280,7 +280,7 @@ msgstr "必须输入邮件地址"
 #: model:ir.actions.act_window,name:portal.action_news
 #: model:ir.ui.menu,name:portal.portal_company_news
 msgid "News"
-msgstr ""
+msgstr "新闻"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -387,13 +387,13 @@ msgstr ""
 #. module: portal
 #: field:portal.payment.acquirer,visible:0
 msgid "Visible"
-msgstr ""
+msgstr "可见性"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:39
 #, python-format
 msgid "Existing Groups (e.g Portal Groups)"
-msgstr ""
+msgstr "已经存在组（例如 门户组）"
 
 #. module: portal
 #: view:portal.wizard:0
@@ -403,7 +403,7 @@ msgstr "取消"
 #. module: portal
 #: view:portal.wizard:0
 msgid "Apply"
-msgstr ""
+msgstr "应用"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index d7550e0f2b4..9e2bff2b962 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -8,11 +8,29 @@
             <field name="public">public</field>
         </record>
 
-        <record id="action_news" model="ir.actions.act_window">
+        <record id="action_news" model="ir.actions.client">
             <field name="name">News</field>
-            <field name="res_model">mail.group</field>
-            <field name="res_id" ref="company_news_feed"/>
-            <field name="view_mode">form</field>
+            <field name="tag">mail.wall</field>
+            <field name="model">mail.group</field>
+            <field name="params" eval="{
+                'domain': [
+                    ('model', '=', 'mail.group'),
+                    ('res_id', '=', ref('company_news_feed'))
+                ],
+                'context':{
+                    'search_default_message_unread': False,
+                    'default_model': 'mail.group',
+                    'default_res_id': ref('company_news_feed'),
+                },
+                'show_link_partner': False,
+                'res_model': 'mail.message',
+                'thread_level': 1,
+            }"/>
+            <field name="help" type="html">
+                <p>
+                    Youd don't have unread company's news.
+                </p>
+            </field>
         </record>
 
         <!-- Mail group for the company's jobs -->
@@ -21,11 +39,30 @@
             <field name="public">public</field>
         </record>
 
-        <record id="action_jobs" model="ir.actions.act_window">
+        <record id="action_jobs" model="ir.actions.client">
             <field name="name">Jobs</field>
-            <field name="res_model">mail.group</field>
+            <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
             <field name="res_id" ref="company_jobs"/>
-            <field name="view_mode">form</field>
+            <field name="params" eval="{
+                'domain':[
+                    ('model', '=', 'mail.group'),
+                    ('res_id', '=', ref('company_jobs'))
+                ],
+                'context':{
+                    'search_default_message_unread': False,
+                    'default_model': 'mail.group',
+                    'default_res_id': ref('company_jobs'),
+                },
+                'show_link_partner': False,
+                'res_model': 'mail.message',
+                'thread_level': 1,
+            }"/>
+            <field name="help" type="html">
+                <p>
+                    Youd don't have unread job offers.
+                </p>
+            </field>
         </record>
         
 
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index a5b35a069b1..b7765e63ffd 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -8,18 +8,18 @@
             groups="base.group_no_one,portal.group_portal"
             sequence="15"/>
 
-            <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
-                <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
-                <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
-
-            <!--
-                Create menu items that we'll leave empty for now - they'll be
-                filled up by other portal modules.
-            -->
-            <menuitem name="Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
-            <menuitem name="Invoices and Payments" id="portal_invoices_payements" parent="portal_menu" sequence="30"/>
-            <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
-            <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
+        <menuitem name="Messaging" id="portal_messages" parent="portal_menu" sequence="10"/>
+        <menuitem name="About Us" id="portal_company" parent="portal_menu" sequence="200"/>
+        <menuitem name="News" id="portal_company_news" parent="portal_company" sequence="10" action="action_news"/>
+        <menuitem name="Jobs" id="portal_jobs" parent="portal_company" sequence="20" action="action_jobs"/>
+
+        <!--
+            Create menu items that we'll leave empty for now - they'll be
+            filled up by other portal modules.
+        -->
+        <menuitem name="Quotations and Sales Orders" id="portal_orders" parent="portal_menu" sequence="20"/>
+        <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="30"/>
+        <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>        
 
         <!-- extend res.groups search view -->
         <record id="group_search_view" model="ir.ui.view">
@@ -47,5 +47,39 @@
             </field>
         </record>
 
+        <record id="action_mail_inbox_feeds_portal" model="ir.actions.client">
+            <field name="name">Inbox</field>
+            <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid,
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [
+                  ('notification_ids.partner_id.user_ids', 'in', [uid]),
+                  ('to_read', '=', True),
+                  ('favorite_user_ids', 'not in', [uid])
+                ],
+                'show_compose_message': False,
+                'show_link_partner': False,
+                'view_mailbox': True,
+                'view_inbox': True,
+                'read_action': 'read'
+            }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>Good Job!</b> Your inbox is empty.
+                </p><p>
+                    Your inbox contains private messages or emails sent to you
+                    as well as information related to documents or people you
+                    follow.
+                </p>
+            </field>
+        </record>
+
+        <menuitem name="Inbox" id="portal_inbox" parent="portal_messages"
+            action="action_mail_inbox_feeds_portal" sequence="10"/>
+
     </data>
 </openerp>
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index b6d932bf7ee..b9f98f81fd7 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mail_message_portal,mail.message.portal,mail.model_mail_message,group_portal,1,0,1,1
+access_mail_notification_portal,mail.notification.portal,mail.model_mail_notification,group_portal,1,1,1,0
 access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
 access_res_partner_address,res.partner_address,base.model_res_partner_address,portal.group_portal,1,0,0,0
 access_res_partner_category,res.partner_category,base.model_res_partner_category,portal.group_portal,1,0,0,0
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index bf8353c92c1..48bb0f94858 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -50,10 +50,6 @@ OpenERP - Open Source Business Applications
 http://www.openerp.com
 """)
 
-def random_password():
-    # temporary random stuff; user password is reset by signup process
-    chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
-    return ''.join(random.choice(chars) for i in xrange(12))
 
 def extract_email(email):
     """ extract the email address from a user-friendly email address """
@@ -180,7 +176,6 @@ class wizard_user(osv.osv_memory):
         create_context = dict(context or {}, noshortcut=True)       # to prevent shortcut creation
         values = {
             'login': extract_email(wizard_user.email),
-            'password': random_password(),
             'partner_id': wizard_user.partner_id.id,
             'groups_id': [(6, 0, [])],
             'share': True,
@@ -219,6 +214,7 @@ class wizard_user(osv.osv_memory):
             'body_html': '<pre>%s</pre>' % (_(WELCOME_EMAIL_BODY) % data),
             'state': 'outgoing',
         }
-        return mail_mail.create(cr, uid, mail_values, context=this_context)
+        mail_id = mail_mail.create(cr, uid, mail_values, context=this_context)
+        return mail_mail.send(cr, uid, [mail_id], context=this_context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_claim/portal_claim_view.xml b/addons/portal_claim/portal_claim_view.xml
index e08b39e476b..cd0e4941286 100644
--- a/addons/portal_claim/portal_claim_view.xml
+++ b/addons/portal_claim/portal_claim_view.xml
@@ -6,10 +6,11 @@
             <field name="name">Claims</field>
             <field name="res_model">crm.claim</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,calendar,form</field>
+            <field name="view_mode">tree,form,calendar</field>
             <field name="view_id" ref="crm_claim.crm_case_claims_tree_view"/>
-            <field name="context">{"search_default_user_id":'', "stage_type":'claim'}</field>
+            <field name="context">{"search_default_user_id":'', "stage_type":'claim', "portal":'True'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
+            <field name="target">current</field>
             <field name="help"  type="html">
               <p class="oe_view_nocontent_create">
                 Click to register a new claim. 
diff --git a/addons/portal_claim/security/ir.model.access.csv b/addons/portal_claim/security/ir.model.access.csv
index ab2a2f66770..4fcfd0f947f 100644
--- a/addons/portal_claim/security/ir.model.access.csv
+++ b/addons/portal_claim/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_crm_claim,crm.claim,crm_claim.model_crm_claim,portal.group_portal,1,0,0,0
+access_crm_claim,crm.claim,crm_claim.model_crm_claim,portal.group_portal,1,0,1,0
 access_crm_claim_stage,crm.claim.stage,crm_claim.model_crm_claim_stage,portal.group_portal,1,0,0,0
diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml
index 3742765f795..af5261c408b 100644
--- a/addons/portal_claim/security/portal_security.xml
+++ b/addons/portal_claim/security/portal_security.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="portal_stock_picking_user_rule" model="ir.rule">
+        <record id="portal_claim_rule" model="ir.rule">
             <field name="name">Portal Personal Claims</field>
             <field ref="crm_claim.model_crm_claim" name="model_id"/>
             <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
diff --git a/addons/portal_crm/__init__.py b/addons/portal_crm/__init__.py
index 6b791be9f25..92b3ac62321 100644
--- a/addons/portal_crm/__init__.py
+++ b/addons/portal_crm/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,4 +19,4 @@
 #
 ##############################################################################
 
-import wizard
+import contact
diff --git a/addons/portal_crm/__openerp__.py b/addons/portal_crm/__openerp__.py
index 1516ab13961..2eaa829e88a 100644
--- a/addons/portal_crm/__openerp__.py
+++ b/addons/portal_crm/__openerp__.py
@@ -31,7 +31,9 @@ This module adds a contact page (with a contact form creating a lead when submit
     """,
     'author': 'OpenERP SA',
     'depends': ['crm','portal'],
-    'data': ['wizard/contact_view.xml'],
+    'data': [
+        'contact_view.xml',
+    ],
     'test': [
         'test/contact_form.yml',
     ],
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/contact.py
index a0f0d952a66..132f4db34d5 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/contact.py
@@ -83,7 +83,7 @@ class crm_contact_us(osv.TransientModel):
         Since they are potentially sensitive, we don't want any user to be able
         to read datas generated through this module.  Therefore we'll write
         these information directly in the crm.lead table and leave blank
-        entries in the portal_crm.crm_contact_us table.
+        entries in the contact table.
         This is why the create() method is overwritten.
         """
         crm_lead = self.pool.get('crm.lead')
@@ -95,11 +95,11 @@ class crm_contact_us(osv.TransientModel):
         it is quite complicated to set proper rights for this object.
         Therefore, user SUPERUSER_ID will perform the creation.
         """
-        values['contact_name'] = values['name']
+        values['contact_name'] = values['partner_name']
         crm_lead.create(cr, SUPERUSER_ID, dict(values,user_id=False), context)
 
         """
-        Create an empty record in the portal_crm.crm_contact_us table.
+        Create an empty record in the contact table.
         Since the 'name' field is mandatory, give an empty string to avoid an integrity error.
         """
         empty_values = dict((k, False) if k != 'name' else (k, '') for k, v in values.iteritems())
@@ -114,7 +114,7 @@ class crm_contact_us(osv.TransientModel):
             'res_model': self._name,
             'res_id': ids[0],
             'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1],
-            'target': 'inline',
+            'target': 'new',
         }
 
     def _needaction_domain_get(self, cr, uid, context=None):
diff --git a/addons/portal_crm/contact_view.xml b/addons/portal_crm/contact_view.xml
new file mode 100644
index 00000000000..8fcd2e9b08f
--- /dev/null
+++ b/addons/portal_crm/contact_view.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="contact_form_view" model="ir.ui.view">
+            <field name="name">Contact form</field>
+            <field name="model">portal_crm.crm_contact_us</field>
+            <field name="arch" type="xml">
+                <form string="Contact form" version="7.0" class="oe_portal_crm_contact">
+                    <h1>Contact us</h1>
+                    <div style="width: 300px; float:right;">
+                        <field name="company_ids" nolabel="1" widget="many2many_kanban" class="oe_portal_crm_office" colspan="2">
+                            <kanban>
+                                <field name="name"/>
+                                <field name="email"/>
+                                <field name="phone"/>
+                                <field name="street"/>
+                                <field name="street2"/>
+                                <field name="zip"/>
+                                <field name="city"/>
+                                <field name="country_id" options='{"no_open": True}'/>
+                                <field name="state_id" options='{"no_open": True}'/>
+                                <templates>
+                                    <t t-name="kanban-box">
+                                        <h4><field name="name"/></h4>
+                                        <ul class="oe_portal_crm_address">
+                                            <li t-if="record.street"><field name="street"/></li>
+                                            <li t-if="record.street2"><field name="street2"/></li>
+                                            <li t-if="record.zip"><field name="zip"/></li>
+                                            <li t-if="record.city"><field name="city"/></li>
+                                            <li t-if="record.country_id"><field name="country_id"/></li>
+                                        </ul>
+                                        <ul class="oe_portal_crm_contact_info">
+                                            <li t-if="record.phone"><field name="phone"/></li>
+                                            <li t-if="record.email.raw_value">
+                                                <a title="Mail" t-att-href="'mailto:'+record.email.value">
+                                                <field name="email"/>
+                                                </a>
+                                            </li>
+                                        </ul>
+                                    </t>
+                                </templates>
+                            </kanban>
+                        </field>
+                        <div class="oe_portal_crm_team">
+                        
+                        </div>
+                    </div>
+                    <div  style="margin-right: 320px; max-width: 900px;">
+                        <group>
+                            <group>
+                                <field name="partner_name" string="Name" placeholder="Your name..."/>
+                                <field name="email_from" placeholder="Your email..."/>
+                                <field name="phone" placeholder="Your phone number..."/>                                
+                            </group>
+                            <field name="name" placeholder="Subject..." nolabel="1" colspan="2"/>
+                            <field name="description" String="Content" placeholder="Content..." nolabel="1" colspan="2"/>
+                        </group>
+                    </div>
+                    <div>
+                        <button string="Submit" name="submit" type="object" class="oe_highlight"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <!-- wizard thanks message (shows after submitting the form) -->
+        <record id="wizard_contact_form_view_thanks" model="ir.ui.view">
+            <field name="name">Wizard thanks message</field>
+            <field name="model">portal_crm.crm_contact_us</field>
+            <!-- give it a low priority to ensure this won't be the default view -->
+            <field name="priority">99</field>
+            <field name="arch" type="xml">
+                <form string="Thank you" version="7.0">
+                    <!--
+                        make sure there is at least one field in the view,
+                        otherwise the orm will try to select all the model's
+                        records and this will result in a permission denied error
+                    -->
+                    <field name="partner_name" invisible="1"/>
+                    <label string="Thank you for your interest, we'll respond to your request shortly."/>
+                    <footer>
+                        <button string="Close" class="oe_link" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_contact_us" model="ir.actions.act_window">
+            <field name="name">Contact Us</field>
+            <field name="res_model">portal_crm.crm_contact_us</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="contact_form_view"/>
+            <field name="target">inline</field>
+        </record>
+
+        <!-- attach it to the portal menu -->
+        <menuitem name="Contact" id="portal_company_contact"
+            parent="portal.portal_company" action="action_contact_us" sequence="40"/>
+
+    </data>
+</openerp>
diff --git a/addons/portal_crm/i18n/zh_CN.po b/addons/portal_crm/i18n/zh_CN.po
new file mode 100644
index 00000000000..9a9ba1cd7b6
--- /dev/null
+++ b/addons/portal_crm/i18n/zh_CN.po
@@ -0,0 +1,538 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-29 08:12+0000\n"
+"Last-Translator: mrshelly <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Lead"
+msgstr "线索"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,title:0
+msgid "Title"
+msgstr "职位"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,probability:0
+msgid "Success Rate (%)"
+msgstr "成功率(%)"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact us"
+msgstr "联系我们"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,fax:0
+msgid "Fax"
+msgstr "传真"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,zip:0
+msgid "Zip"
+msgstr "邮政编码"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_unread:0
+msgid "Unread Messages"
+msgstr "未读消息"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_id:0
+msgid "Salesperson"
+msgstr "销售员"
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you for your interest, we'll respond to your request shortly."
+msgstr "感谢你的关注, 我们会尽快给您回复."
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,mobile:0
+msgid "Mobile"
+msgstr "手机"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,description:0
+msgid "Notes"
+msgstr "备注"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages"
+msgstr "消息"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,color:0
+msgid "Color Index"
+msgstr "颜色索引"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "地理纬度"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_name:0
+msgid "Customer Name"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "如果要求你关注新消息，勾选此项"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,channel_id:0
+msgid "Communication channel (mail, direct, phone, ...)"
+msgstr "联系方式（电子邮件，面谈，电话等）"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type_id:0
+msgid "Campaign"
+msgstr "营销活动"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref:0
+msgid "Reference"
+msgstr "参考"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_next:0
+#: field:portal_crm.crm_contact_us,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_id:0
+msgid "Partner"
+msgstr "业务伙伴"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,name:0
+msgid "Subject"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,opt_out:0
+msgid "Opt-Out"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,priority:0
+msgid "Priority"
+msgstr "优先级"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state_id:0
+msgid "State"
+msgstr "省/ 州"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_follower_ids:0
+msgid "Followers"
+msgstr "关注者"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_id:0
+msgid "Linked partner (optional). Usually created when converting the lead."
+msgstr "关联业务伙伴(可选), 通常用于在线索转换时自动创建业务伙伴."
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,payment_mode:0
+msgid "Payment Mode"
+msgstr "付款方式"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "New"
+msgstr "新建"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,type:0
+msgid "Type"
+msgstr "类别"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,channel_id:0
+msgid "Channel"
+msgstr "渠道"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,create_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "类型用于区分销售线索和商机"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,categ_ids:0
+msgid "Categories"
+msgstr "类别"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,stage_id:0
+msgid "Stage"
+msgstr "阶段"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_login:0
+msgid "User Login"
+msgstr "用户名"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,opt_out:0
+msgid ""
+"If opt-out is checked, this contact has refused to receive emails or "
+"unsubscribed to a campaign."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,contact_name:0
+msgid "Contact Name"
+msgstr "联系人姓名"
+
+#. module: portal_crm
+#: model:ir.actions.act_window,name:portal_crm.action_wizard_contact_us
+#: model:ir.ui.menu,name:portal_crm.portal_company_contact
+msgid "Contact"
+msgstr "联系人"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_email:0
+msgid "Partner Contact Email"
+msgstr "合作伙伴邮箱"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_revenue:0
+msgid "Expected Revenue"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,task_ids:0
+msgid "Tasks"
+msgstr "任务"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_deadline:0
+msgid "Expected Closing"
+msgstr "预期结束"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,ref2:0
+msgid "Reference 2"
+msgstr "参考2"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,user_email:0
+msgid "User Email"
+msgstr "用户电子邮件"
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_open:0
+msgid "Opened"
+msgstr "已打开"
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "In Progress"
+msgstr "进行中"
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_name:0
+msgid ""
+"The name of the future partner company that will be created while converting "
+"the lead into opportunity"
+msgstr "在销售线索转化为商机时对应创建业务伙伴的公司名称."
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,planned_cost:0
+msgid "Planned Costs"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_deadline:0
+msgid "Estimate of the date on which the opportunity will be won."
+msgstr "预计商机落单日期."
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_closed:0
+#: selection:portal_crm.crm_contact_us,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,state:0
+msgid "Status"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,email_cc:0
+msgid "Global CC"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street2:0
+msgid "Street2"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,id:0
+msgid "ID"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,active:0
+msgid "Active"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_comment_ids:0
+#: help:portal_crm.crm_contact_us,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Contact wizard view"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_ids:0
+msgid "Companies"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,section_id:0
+msgid ""
+"When sending mails, the default email address is taken from the sales team."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_address_name:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,city:0
+msgid "City"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Submit"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,function:0
+msgid "Function"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,company_currency:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,referred:0
+msgid "Referred By"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: portal_crm
+#: view:portal_crm.crm_contact_us:0
+msgid "Thank you"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,state:0
+msgid ""
+"The Status is set to 'Draft', when a case is created. If the case is in "
+"progress the Status is set to 'Open'. When the case is over, the Status is "
+"set to 'Done'. If the case needs to be reviewed then the Status is  set to "
+"'Pending'."
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: portal_crm
+#: help:portal_crm.crm_contact_us,type_id:0
+msgid ""
+"From which campaign (seminar, marketing campaign, mass mailing, ...) did "
+"this contact come from?"
+msgstr ""
+
+#. module: portal_crm
+#: selection:portal_crm.crm_contact_us,priority:0
+msgid "High"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,street:0
+msgid "Street"
+msgstr ""
+
+#. module: portal_crm
+#: field:portal_crm.crm_contact_us,date_action_last:0
+msgid "Last Action"
+msgstr ""
+
+#. module: portal_crm
+#: model:ir.model,name:portal_crm.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr ""
diff --git a/addons/portal_crm/static/src/css/portal_crm.css b/addons/portal_crm/static/src/css/portal_crm.css
index 0589eb92e71..e322f1cb9da 100644
--- a/addons/portal_crm/static/src/css/portal_crm.css
+++ b/addons/portal_crm/static/src/css/portal_crm.css
@@ -1,8 +1,6 @@
  /* Root container */
 .openerp .oe_portal_crm_contact {
-    width: 800px;
-    margin: auto;
-    padding: 8px 0 0 0;
+    min-width: 960px;
 }
 
 /* Contact form section */
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
deleted file mode 100644
index 778e7f9562e..00000000000
--- a/addons/portal_crm/wizard/contact_view.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-        <!-- wizard form view -->
-        <record id="wizard_contact_form_view" model="ir.ui.view">
-            <field name="name">Wizard form view</field>
-            <field name="model">portal_crm.crm_contact_us</field>
-            <field name="arch" type="xml">
-                <form string="Contact wizard view" version="7.0">
-                    <div class="oe_portal_crm_contact">
-                        <h1>Contact us</h1>
-                        <table>
-                          <tr>
-                            <td width="70%%">
-                                <div class="oe_portal_crm_contact_form">
-                                    <group>
-                                        <field name="name"/>
-                                        <field name="partner_name"/>
-                                        <field name="email_from"/>
-                                        <field name="phone"/>
-                                        <field name="description"/>
-                                        <button string="Submit" name="submit" type="object"/>
-                                    </group>
-                                </div>
-                            </td>
-                            <td>
-                                <div class="oe_portal_crm_office">
-                                    <field name="company_ids" widget="many2many_kanban">
-                                        <kanban>
-                                            <field name="name"/>
-                                            <field name="email"/>
-                                            <field name="phone"/>
-                                            <field name="street"/>
-                                            <field name="street2"/>
-                                            <field name="zip"/>
-                                            <field name="city"/>
-                                            <field name="country_id" options='{"no_open": True}'/>
-                                            <field name="state_id" options='{"no_open": True}'/>
-                                            <templates>
-                                                <t t-name="kanban-box">
-                                                    <h4><field name="name"/></h4>
-                                                    <ul class="oe_portal_crm_address">
-                                                        <li t-if="record.street"><field name="street"/></li>
-                                                        <li t-if="record.street2"><field name="street2"/></li>
-                                                        <li t-if="record.zip"><field name="zip"/></li>
-                                                        <li t-if="record.city"><field name="city"/></li>
-                                                        <li t-if="record.country_id"><field name="country_id"/></li>
-                                                    </ul>
-                                                    <ul class="oe_portal_crm_contact_info">
-                                                        <li t-if="record.phone"><field name="phone"/></li>
-                                                        <li t-if="record.email.raw_value">
-                                                            <a title="Mail" t-att-href="'mailto:'+record.email.value">
-                                                            <field name="email"/>
-                                                            </a>
-                                                        </li>
-                                                    </ul>
-                                                </t>
-                                            </templates>
-                                        </kanban>
-                                    </field>
-                                </div>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td colspan="2">
-                                <div class="oe_portal_crm_team">
-
-                                </div>
-                            </td>
-                          </tr>
-                        </table>
-                    </div>
-                </form>
-            </field>
-        </record>
-
-        <!-- wizard thanks message (shows after submitting the form) -->
-        <record id="wizard_contact_form_view_thanks" model="ir.ui.view">
-            <field name="name">Wizard thanks message</field>
-            <field name="model">portal_crm.crm_contact_us</field>
-            <!-- give it a low priority to ensure this won't be the default view -->
-            <field name="priority">99</field>
-            <field name="arch" type="xml">
-                <form string="Thank you">
-                    <!--
-                        make sure there is at least one field in the view,
-                        otherwise the orm will try to select all the model's
-                        records and this will result in a permission denied error
-                    -->
-                    <field name="name" invisible="1"/>
-                    <label string="Thank you for your interest, we'll respond to your request shortly."/>
-                </form>
-            </field>
-        </record>
-
-        <!-- wizard action -->
-        <record id="action_wizard_contact_us" model="ir.actions.act_window">
-            <field name="name">Contact</field>
-            <field name="res_model">portal_crm.crm_contact_us</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-
-        <!-- attach it to the portal menu -->
-        <menuitem name="Contact" id="portal_company_contact"
-            parent="portal.portal_company" action="action_wizard_contact_us" sequence="30"/>
-
-    </data>
-</openerp>
diff --git a/addons/portal_event/i18n/zh_CN.po b/addons/portal_event/i18n/zh_CN.po
new file mode 100644
index 00000000000..31eb1eaf09b
--- /dev/null
+++ b/addons/portal_event/i18n/zh_CN.po
@@ -0,0 +1,64 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-28 12:36+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_event
+#: view:event.event:0
+msgid "Portal Settings"
+msgstr "门户设置"
+
+#. module: portal_event
+#: model:ir.actions.act_window,help:portal_event.action_event_view
+msgid "There are no public events."
+msgstr "没有公共的活动。"
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Public"
+msgstr "公共的"
+
+#. module: portal_event
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "错误！结束日期不能在开始日期前。"
+
+#. module: portal_event
+#: selection:event.event,visibility:0
+msgid "Private"
+msgstr "私有的"
+
+#. module: portal_event
+#: model:ir.model,name:portal_event.model_event_event
+msgid "Event"
+msgstr "活动"
+
+#. module: portal_event
+#: field:event.event,visibility:0
+msgid "Visibility"
+msgstr "可见性"
+
+#. module: portal_event
+#: help:event.event,visibility:0
+msgid "Event's visibility in the portal's contact page"
+msgstr "活动在门户联系人页面的可见性"
+
+#. module: portal_event
+#: model:ir.actions.act_window,name:portal_event.action_event_view
+#: model:ir.ui.menu,name:portal_event.portal_company_events
+msgid "Events"
+msgstr "活动"
diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml
index 5d2397f6148..0a0f59d7857 100755
--- a/addons/portal_event/portal_event_view.xml
+++ b/addons/portal_event/portal_event_view.xml
@@ -10,14 +10,14 @@
             <field name="name">Events</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">event.event</field>
-            <field name="view_mode">kanban,calendar,tree,form,graph</field>
+            <field name="view_mode">kanban,calendar,tree,form</field>
             <field name="context">{"search_default_upcoming":1}</field>
             <field name="search_view_id" ref="event.view_event_search"/>
             <field name="help">There are no public events.</field>
         </record>
 
         <menuitem name="Events" id="portal_company_events" parent="portal.portal_company"
-            action="action_event_view" sequence="40"/>
+            action="action_event_view" sequence="30"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index 8f17808345b..22e630f33ef 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -5,7 +5,7 @@
         <record id="portal_event_rule" model="ir.rule">
             <field name="name">Portal Visible Events</field>
             <field ref="event.model_event_event" name="model_id"/>
-            <field name="domain_force">[('visibility', '=', 'public')]</field>
+            <field name="domain_force">['|', ('visibility', '=', 'public'), ('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
diff --git a/addons/portal_hr_employees/hr_employee.py b/addons/portal_hr_employees/hr_employee.py
index b54e544a744..94acea8c4aa 100644
--- a/addons/portal_hr_employees/hr_employee.py
+++ b/addons/portal_hr_employees/hr_employee.py
@@ -23,8 +23,8 @@ from osv import osv, fields
 
 class crm_contact_us(osv.TransientModel):
     """ Add employees list to the portal's contact page """
-    _description = 'Contact form for the portal'
     _inherit = 'portal_crm.crm_contact_us'
+    _description = 'Contact form for the portal'
     _columns = {
         'employee_ids' : fields.many2many('hr.employee', string='Employees', readonly=True),
     }
@@ -51,6 +51,7 @@ class hr_employee(osv.osv):
     _columns = {
         'visibility': fields.selection([('public', 'Public'),('private', 'Private')],
             string='Visibility', help='Employee\'s visibility in the portal\'s contact page'),
+        'public_info': fields.text(),
     }
     _defaults = {
         'visibility': 'private',
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index 4e133061da6..4ffca098c55 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -1,56 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data>        
 
         <!-- add visibility field to the employee form view -->
         <record id="view_employee_form" model="ir.ui.view">
-            <field name="name">portal_hr_employees.employee.form</field>
+            <field name="name">portal_hr_employees_form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='active']" position="before">
+                <xpath expr="//field[@name='user_id']" position="after">
                     <field name="visibility"/>
+                    <field name="public_info" String="Public Notes" placeholder="Here you can write information about you to be shown in the portal..." attrs='{"invisible":[("visibility", "=", "private")]}'/>
                 </xpath>
             </field>
         </record>
 
-        <!-- a kanban view of the employees to the portal's contact page -->
-        <record id="wizard_contact_form_view_employees_list" model="ir.ui.view">
-            <field name="name">portal_hr_employees.employees_list</field>
+        <record id="portal_view_employee_filter" model="ir.ui.view">
+            <field name="name">Employees</field>
+            <field name="model">hr.employee</field>
+            <field name="arch" type="xml">
+                <search string="Employees">
+                    <field name="name" string="Employees"/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Coach" icon="terp-personal" domain="[]" context="{'group_by':'coach_id'}"/>
+                        <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
+                        <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
+                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_team" model="ir.actions.act_window">
+            <field name="name">Meet the team</field>
+            <field name="res_model">hr.employee</field>
+            <field name="view_id" ref="hr.hr_kanban_view_employees"/>
+            <field name="view_mode">kanban</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('visibility','!=','private')]</field>
+            <field name="search_view_id" ref="portal_view_employee_filter"/>
+            <field name="target">current</field>
+        </record>
+
+        <record id="crm_contact_us" model="ir.ui.view">
+            <field name="name">crm_contact_us</field>
             <field name="model">portal_crm.crm_contact_us</field>
-            <field name="inherit_id" ref="portal_crm.wizard_contact_form_view"/>
+            <field name="inherit_id" ref="portal_crm.contact_form_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_portal_crm_team']" position="inside">
-                    <h1>Meet the team</h1>
-                    <field name="employee_ids" widget="many2many_kanban">
-                        <kanban>
-                            <field name="visibility"/>
-
-                            <templates>
-                                <t t-name="kanban-box">
-                                    <div class="oe_employee_vignette">
-                                        <div class="oe_employee_image">
-                                            <img t-att-src="kanban_image('hr.employee', 'photo', record.id.value)" class="oe_employee_picture"/>
-                                        </div>
-                                        <div class="oe_employee_details">
-                                            <h4>
-                                                <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
-                                            </h4>
-                                            <ul>
-                                                <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
-                                                <li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
-                                                <li t-if="record.mobile_phone.raw_value">Mobile: <field name="mobile_phone"/></li>
-                                                <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
-                                            </ul>
-                                        </div>
-                                    </div>
-                                </t>
-                            </templates>
-                        </kanban>
-                    </field>
+                    <a href="#action=portal_hr_employees.action_team">Meet the team</a>
                 </xpath>
             </field>
         </record>
 
+        
     </data>
 </openerp>
diff --git a/addons/portal_hr_employees/i18n/zh_CN.po b/addons/portal_hr_employees/i18n/zh_CN.po
new file mode 100644
index 00000000000..33f22506e78
--- /dev/null
+++ b/addons/portal_hr_employees/i18n/zh_CN.po
@@ -0,0 +1,73 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-28 14:15+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_hr_employees
+#: view:portal_crm.crm_contact_us:0
+msgid "Tel:"
+msgstr "电话:"
+
+#. module: portal_hr_employees
+#: field:portal_crm.crm_contact_us,employee_ids:0
+msgid "Employees"
+msgstr "员工"
+
+#. module: portal_hr_employees
+#: view:portal_crm.crm_contact_us:0
+msgid "Mobile:"
+msgstr "手机："
+
+#. module: portal_hr_employees
+#: help:hr.employee,visibility:0
+msgid "Employee's visibility in the portal's contact page"
+msgstr "员工的可见性在门户联系人页面"
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Private"
+msgstr "私有的"
+
+#. module: portal_hr_employees
+#: selection:hr.employee,visibility:0
+msgid "Public"
+msgstr "公共的"
+
+#. module: portal_hr_employees
+#: field:hr.employee,visibility:0
+msgid "Visibility"
+msgstr "可见性"
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
+msgid "Contact form for the portal"
+msgstr "来自门户的联系方式"
+
+#. module: portal_hr_employees
+#: model:ir.model,name:portal_hr_employees.model_hr_employee
+msgid "Employee"
+msgstr "员工"
+
+#. module: portal_hr_employees
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr "错误！，你不能创建循环的员工层次"
+
+#. module: portal_hr_employees
+#: view:portal_crm.crm_contact_us:0
+msgid "Meet the team"
+msgstr "团队集会"
diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
index 5fa658de8c1..da511eaf2c0 100644
--- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
+++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
@@ -3,14 +3,13 @@
     width: 100%;
 }
 .openerp .oe_portal_crm_contact .oe_portal_crm_team {
-    padding: 8px 0 0 0;
+    margin-top: 30px;
+    padding-top: 30px;
 }
 .openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_details {
     width: 170px;
 }
 .openerp .oe_portal_crm_contact .oe_portal_crm_team .oe_employee_image {
-    width: 65px;
-    height: 65px;
 }
 
 .openerp .oe_employee_vignette ul, .openerp .oe_employee_vignette li {
diff --git a/addons/portal_project/i18n/zh_CN.po b/addons/portal_project/i18n/zh_CN.po
new file mode 100644
index 00000000000..a695b514412
--- /dev/null
+++ b/addons/portal_project/i18n/zh_CN.po
@@ -0,0 +1,23 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-28 09:37+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_project
+#: model:ir.ui.menu,name:portal_project.portal_services_tasks
+msgid "Tasks"
+msgstr "任务"
diff --git a/addons/portal_project/portal_project_view.xml b/addons/portal_project/portal_project_view.xml
index 51f6683382a..b7f3568545b 100644
--- a/addons/portal_project/portal_project_view.xml
+++ b/addons/portal_project/portal_project_view.xml
@@ -2,8 +2,24 @@
 <openerp>
     <data>
 
-        <menuitem name="Tasks" id="portal_services_tasks" parent="portal.portal_projects"
-            action="project.action_view_task" sequence="20"/>
+        <record id="open_view_project" model="ir.actions.act_window">
+            <field name="name">Projects</field>
+            <field name="res_model">project.project</field>
+            <field name="view_type">form</field>
+            <field name="domain">[]</field>
+            <field name="view_mode">kanban,gantt</field>
+            <field name="view_id" ref="project.view_project_kanban"/>
+            <field name="search_view_id" ref="project.view_project_project_filter"/>
+            <field name="context">{}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                  Click to start a new project.
+                </p>
+            </field>
+        </record>
+
+        <menuitem name="Projects" id="portal_services_projects" parent="portal.portal_projects"
+            action="open_view_project" sequence="10"/>
 
     </data>
 </openerp>
diff --git a/addons/portal_project/security/ir.model.access.csv b/addons/portal_project/security/ir.model.access.csv
index 85463868ee1..0e743050568 100644
--- a/addons/portal_project/security/ir.model.access.csv
+++ b/addons/portal_project/security/ir.model.access.csv
@@ -1,5 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_task,tasks,project.model_project_task,portal.group_portal,1,0,0,0
+access_project,project,project.model_project_project,portal.group_portal,1,0,0,0
+access_task,task,project.model_project_task,portal.group_portal,1,0,0,0
 access_task_type,task_type,project.model_project_task_type,portal.group_portal,1,0,0,0
 access_task_work,task_work,project.model_project_task_work,portal.group_portal,1,0,0,0
 access_project_category,project_category,project.model_project_category,portal.group_portal,1,0,0,0
+access_account_analytic_account,account_analytic_account,analytic.model_account_analytic_account,portal.group_portal,1,0,0,0
diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml
index ba686f72db4..0d995cfd70b 100644
--- a/addons/portal_project/security/portal_security.xml
+++ b/addons/portal_project/security/portal_security.xml
@@ -2,15 +2,18 @@
 <openerp>
     <data noupdate="1">
 
+        <record id="portal_project_rule" model="ir.rule">
+            <field name="name">Portal Projects</field>
+            <field ref="project.model_project_project" name="model_id"/>
+            <field name="domain_force">['|', ('privacy_visibility', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+        </record>
+
         <record id="portal_task_rule" model="ir.rule">
-            <field name="name">Portal Personal Task</field>
+            <field name="name">Portal Tasks</field>
             <field ref="project.model_project_task" name="model_id"/>
             <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-            <field eval="1" name="perm_unlink"/>
-            <field eval="1" name="perm_write"/>
-            <field eval="1" name="perm_read"/>
-            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_project_issue/__init__.py b/addons/portal_project_issue/__init__.py
index 26c654db9dd..45de899ed49 100644
--- a/addons/portal_project_issue/__init__.py
+++ b/addons/portal_project_issue/__init__.py
@@ -18,4 +18,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
diff --git a/addons/portal_project_issue/i18n/zh_CN.po b/addons/portal_project_issue/i18n/zh_CN.po
new file mode 100644
index 00000000000..e8f5cc093da
--- /dev/null
+++ b/addons/portal_project_issue/i18n/zh_CN.po
@@ -0,0 +1,48 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-11-28 14:20+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_project_issue
+#: view:project.issue:0
+msgid "Creation:"
+msgstr "创建："
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,name:portal_project_issue.project_issue_categ_act0
+#: model:ir.ui.menu,name:portal_project_issue.portal_after_sales_issues
+msgid "Issues"
+msgstr "问题"
+
+#. module: portal_project_issue
+#: model:ir.actions.act_window,help:portal_project_issue.project_issue_categ_act0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create an issue.\n"
+"              </p><p>\n"
+"                OpenERP's kanban view will help you track easily your "
+"current \n"
+"                pipeline of issues to fix.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建一个问题.\n"
+"              </p><p>\n"
+"                OpenERP的看板视图将帮助你更便于跟踪你的当前问题被修复的途径。\n"
+"              </p>\n"
+"            "
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 6502d92b4dc..2750edf300f 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -18,18 +18,24 @@
                         <t t-name="kanban-box">
                             <div class="oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_kanban_content">
+                                    <div class="oe_portal_project_issue">
+                                        <div><h1><field name="name"/></h1></div>
+                                        <div class="oe_kanban_footer_left">
+                                            <field name="partner_id" context="{'portal':1}"/> <br/>
+                                            <field name="version_id"/>                                            
+                                        </div>
+                                        <div><field name="categ_ids" widget="many2many_tags" class="oe_left"/></div>
+                                        <div class="oe_text_right">
+                                            <h1><field name="state" readonly="1"/></h1>
+                                        </div>
+                                    </div>
                                     <div>
                                         <h1><a type="open"><field name="name"/></a></h1>
                                         <field name="partner_id"/> <br/>
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <div class="oe_left oe_tags">
-                                            <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                                <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
-                                            </t>
-                                            <field name="categ_ids"/>
-                                        </div>
+                                        <field name="categ_ids"/>
                                         <div class="oe_right">
                                             Creation: <field name="create_date"/>
                                             <span class="oe_kanban_highlight">
@@ -54,7 +60,7 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="oe_clear"></div>
+                                <div class="oe_clear"/>
                             </div>
                         </t>
                     </templates>
@@ -69,20 +75,18 @@
             <field name="view_mode">kanban,form</field>
             <field name="view_id" ref="portal_project_issue_kanban_view"/>
             <field name="domain" eval=""/>
-            <field name="context">{"search_default_user_id":'', "search_default_draft":'', "search_default_todo":''}</field>
+            <field name="context">{"search_default_user_id":'', "search_default_draft":'', "search_default_todo":'', "portal":'True'}</field>
             <field name="search_view_id" ref="project_issue.view_project_issue_filter"/>
+            <field name="target">current</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to create an issue.
               </p><p>
-                OpenERP's kanban view will help you track easily your current 
-                pipeline of issues to fix.
+                You can track your issues from this menu and the action we
+                will take.
               </p>
             </field>
         </record>
 
-        <menuitem name="Issues" id="portal_after_sales_issues" parent="portal.portal_projects"
-            action="project_issue_categ_act0" sequence="10"/>
-
     </data>
 </openerp>
diff --git a/addons/portal_project_issue/static/src/css/portal_project_issue.css b/addons/portal_project_issue/static/src/css/portal_project_issue.css
index 39c12c6076d..983b7d6804f 100644
--- a/addons/portal_project_issue/static/src/css/portal_project_issue.css
+++ b/addons/portal_project_issue/static/src/css/portal_project_issue.css
@@ -1,5 +1,4 @@
 .oe_portal_project_issue {
-    width: 960px;
     margin: 0 auto;
 }
 
@@ -10,7 +9,6 @@
 .oe_portal_project_issue .oe_fold_column.oe_kanban_record {
     float: none;
     display: block;
-    width: 100%;
     border-width: 1px;
     border-radius: 4px;
     border-style: solid;
@@ -27,6 +25,6 @@
 
 .oe_portal_project_issue .oe_fold_column.oe_kanban_record h1 {
     margin: 0;
-    font-size: 1.2em;
+    font-size: 1.1em;
     font-weight: bold;
 }
diff --git a/addons/portal_sale/__init__.py b/addons/portal_sale/__init__.py
index f8c8c7d6446..296de46594a 100644
--- a/addons/portal_sale/__init__.py
+++ b/addons/portal_sale/__init__.py
@@ -19,5 +19,7 @@
 #
 ##############################################################################
 
+import account_invoice
+import sale
 import portal_sale
-import res_config
\ No newline at end of file
+import res_config
diff --git a/addons/portal_sale/__openerp__.py b/addons/portal_sale/__openerp__.py
index a993ab9c462..b8ce9165283 100644
--- a/addons/portal_sale/__openerp__.py
+++ b/addons/portal_sale/__openerp__.py
@@ -44,7 +44,7 @@ pay online on their Sale Orders and Invoices that are not paid yet. Paypal is in
 by default, you simply need to configure a Paypal account in the Accounting/Invoicing settings.
     """,
     'author': 'OpenERP SA',
-    'depends': ['sale_stock','portal'],
+    'depends': ['sale','portal'],
     'data': [
         'security/portal_security.xml',
         'portal_sale_view.xml',
diff --git a/addons/portal_sale/account_invoice.py b/addons/portal_sale/account_invoice.py
new file mode 100644
index 00000000000..fa81b2049e0
--- /dev/null
+++ b/addons/portal_sale/account_invoice.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields,osv
+
+class account_invoice(osv.osv):
+    _inherit = 'account.invoice'
+
+    def invoice_validate(self, cr, uid, ids, context=None):
+        # fetch the partner's id and subscribe the partner to the sale order
+        partner = self.browse(cr, uid, ids[0], context=context)['partner_id']
+        if partner.id not in self.browse(cr, uid, ids[0], context=context)['message_follower_ids']:
+            self.message_subscribe(cr, uid, ids, [partner.id], context=context)
+            document = self.browse(cr, uid, ids[0], context=context)
+            mail_values = {
+                'email_from': self.pool.get('res.users').browse(cr, uid, uid, context=context)['partner_id']['email'],
+                'email_to': partner.email,
+                'subject': 'Invitation to follow %s' % document.name_get()[0][1],
+                'body_html': 'You have been invited to follow %s' % document.name_get()[0][1],
+                'auto_delete': True,
+            }
+            mail_obj = self.pool.get('mail.mail')
+            mail_id = mail_obj.create(cr, uid, mail_values, context=context)
+            mail_obj.send(cr, uid, [mail_id], recipient_ids=[partner.id], context=context)
+        return super(account_invoice, self).invoice_validate(cr, uid, ids, context=context)
\ No newline at end of file
diff --git a/addons/portal_sale/i18n/fr.po b/addons/portal_sale/i18n/fr.po
new file mode 100644
index 00000000000..bf7b1b04f6a
--- /dev/null
+++ b/addons/portal_sale/i18n/fr.po
@@ -0,0 +1,432 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-29 15:36+0000\n"
+"Last-Translator: Numérigraphe <Unknown>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.product_normal_action
+msgid "There are no public products."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_picking_tree
+msgid "You don't have any delivery order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "You don't have any sale order."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.product_normal_action
+#: model:ir.ui.menu,name:portal_sale.portal_products
+msgid "Products"
+msgstr "Articles"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "You don't have any invoice."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr ""
+
+#. module: portal_sale
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr ""
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "You don't have any quotation."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_vouchers
+#: model:ir.ui.menu,name:portal_sale.portal_payments
+msgid "Refunds/Payments"
+msgstr ""
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_vouchers
+msgid "You don't have any refunds or payments."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sale Orders"
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_picking_tree
+#: model:ir.ui.menu,name:portal_sale.portal_delivery
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: portal_sale
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
diff --git a/addons/portal_sale/i18n/zh_CN.po b/addons/portal_sale/i18n/zh_CN.po
new file mode 100644
index 00000000000..b3836cb632d
--- /dev/null
+++ b/addons/portal_sale/i18n/zh_CN.po
@@ -0,0 +1,438 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-29 13:54+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: portal_sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "订单号必须在一个公司范围内唯一"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.product_normal_action
+msgid "There are no public products."
+msgstr "没有公共产品"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_picking_tree
+msgid "You don't have any delivery order."
+msgstr "你没有任何发运单"
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
+msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and '草稿' "
+"or ''}"
+
+#. module: portal_sale
+#: model:res.groups,name:portal_sale.group_payment_options
+msgid "View Online Payment Options"
+msgstr "查看在线支付选项"
+
+#. module: portal_sale
+#: field:account.config.settings,group_payment_options:0
+msgid "Show payment buttons to employees too"
+msgstr "也显示支付按钮给员工"
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_sale
+msgid ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and '报价单' or "
+"'订单'} (Ref ${object.name or 'n/a' })"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access the invoice document and pay online via our Customer "
+"Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View Invoice</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid ""
+"Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers "
+"who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,report_name:portal_sale.email_template_edi_invoice
+msgid ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
+msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and '草稿' or ''}"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "You don't have any sale order."
+msgstr "你还没有任何销售订单"
+
+#. module: portal_sale
+#: model:email.template,subject:portal_sale.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr "${object.company_id.name} 发票 (编号 ${object.number or 'n/a' })"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.product_normal_action
+#: model:ir.ui.menu,name:portal_sale.portal_products
+msgid "Products"
+msgstr "产品"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
+msgid "You don't have any invoice."
+msgstr "你没有任何发票"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_quotations_portal
+#: model:ir.ui.menu,name:portal_sale.portal_quotations
+msgid "Quotations"
+msgstr "报价单"
+
+#. module: portal_sale
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "发票号必须在公司范围内唯一"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_sale_order
+msgid "Sales Order"
+msgstr "销售订单"
+
+#. module: portal_sale
+#: field:account.invoice,portal_payment_options:0
+#: field:sale.order,portal_payment_options:0
+msgid "Portal Payment Options"
+msgstr "门户支付选项"
+
+#. module: portal_sale
+#: help:account.config.settings,group_payment_options:0
+msgid ""
+"Show online payment options on Sale Orders and Customer Invoices to "
+"employees. If not checked, these options are only visible to portal users."
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
+msgid "You don't have any quotation."
+msgstr "你没有任何报价单"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_invoices
+#: model:ir.ui.menu,name:portal_sale.portal_invoices
+msgid "Invoices"
+msgstr "发票列表"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.portal_action_vouchers
+#: model:ir.ui.menu,name:portal_sale.portal_payments
+msgid "Refunds/Payments"
+msgstr "退款/支付"
+
+#. module: portal_sale
+#: view:account.config.settings:0
+msgid "Configure payment acquiring methods"
+msgstr "配置支付收购办法"
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    You can access this document and pay online via our Customer Portal:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.portal_action_vouchers
+msgid "You don't have any refunds or payments."
+msgstr "你没有任何退款或者支付"
+
+#. module: portal_sale
+#: model:ir.model,name:portal_sale.model_account_invoice
+msgid "Invoice"
+msgstr "发票"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_orders_portal
+#: model:ir.ui.menu,name:portal_sale.portal_sales_orders
+msgid "Sale Orders"
+msgstr "销售订单"
+
+#. module: portal_sale
+#: model:ir.actions.act_window,name:portal_sale.action_picking_tree
+#: model:ir.ui.menu,name:portal_sale.portal_delivery
+msgid "Delivery Orders"
+msgstr "送货单"
+
+#. module: portal_sale
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "BBA传输结构有误！"
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index d6c2f288205..0a10c80e3ef 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -33,59 +33,39 @@
             <field name="name">Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="context">{"search_default_draft":1}</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
-            <field name="help">You don't have any quotation.</field>
+            <field name="help">We haven't sent you any quotation.</field>
         </record>
 
         <record id="action_orders_portal" model="ir.actions.act_window">
             <field name="name">Sale Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
             <field name="context">{"search_default_sales":1}</field>
-            <field name="help">You don't have any sale order.</field>
-        </record>
-
-        <record id="action_picking_tree" model="ir.actions.act_window">
-            <field name="name">Delivery Orders</field>
-            <field name="res_model">stock.picking.out</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('type','=','out')]</field>
-            <field name="context">{'default_type': 'out', 'contact_display': 'partner_address'}</field>
-            <field name="search_view_id" ref="stock.view_picking_out_search"/>
-            <field name="help">You don't have any delivery order.</field>
-        </record>
-
-        <record id="product_normal_action" model="ir.actions.act_window">
-            <field name="name">Products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.product</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">kanban,tree,form</field>
-            <field name="view_id" ref="product.product_kanban_view"/>
-            <field name="search_view_id" ref="product.product_search_form_view"/>
-            <field name="help">There are no public products.</field>
+            <field name="help">We haven't sent you any sale order.</field>
         </record>
 
         <record id="portal_action_invoices" model="ir.actions.act_window">
             <field name="name">Invoices</field>
             <field name="res_model">account.invoice</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('type','=','out_invoice')]</field>
-            <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">[('type','in',['out_invoice','out_refund'])]</field>
+            <field name="context">{'type':['out_invoice','out_refund'], 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">You don't have any invoice.</field>
+            <field name="help">We haven't sent you any invoice.</field>
         </record>
+
         <record id="portal_action_invoices_tree_spec" model="ir.actions.act_window.view">
             <field name="act_window_id" ref="portal_action_invoices"/>
             <field name="view_id" ref="account.invoice_tree"/>
             <field name="view_mode">tree</field>
             <field name="sequence" eval="0"/>
         </record>
+
         <record id="portal_action_invoices_form_spec" model="ir.actions.act_window.view">
             <field name="act_window_id" ref="portal_action_invoices"/>
             <field name="view_id" ref="account.invoice_form"/>
@@ -93,27 +73,12 @@
             <field name="sequence" eval="1"/>
         </record>
 
-        <record id="portal_action_vouchers" model="ir.actions.act_window">
-            <field name="name">Refunds/Payments</field>
-            <field name="res_model">account.voucher</field>
-            <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
-            <field name="context">{'type':'receipt'}</field>
-            <field name="search_view_id" ref="account_voucher.view_voucher_filter_customer_pay"/>
-            <field name="target">current</field>
-            <field name="help">You don't have any refunds or payments.</field>
-        </record>
-
-        <menuitem id="portal_quotations" parent="portal.portal_orders"
+        <menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders"
             action="action_quotations_portal" sequence="10"/>
-        <menuitem id="portal_sales_orders" parent="portal.portal_orders"
+        <menuitem name="Sales Orders" id="portal_sales_orders" parent="portal.portal_orders"
             action="action_orders_portal" sequence="20"/>
-        <menuitem id="portal_delivery" parent="portal.portal_orders"
-            action="action_picking_tree" sequence="30"/>
-        <menuitem id="portal_products" parent="portal.portal_orders"
-            action="product_normal_action" sequence="40"/>
-        <menuitem id="portal_invoices" parent="portal.portal_invoices_payements"
-            action="portal_action_invoices" sequence="10"/>
-        <menuitem id="portal_payments" parent="portal.portal_invoices_payements"
-            action="portal_action_vouchers" sequence="20"/>
+        <menuitem name="Invoices" id="portal_invoices" parent="portal.portal_orders"
+            action="portal_action_invoices" sequence="30"/>
+
     </data>
 </openerp>
diff --git a/addons/portal_sale/sale.py b/addons/portal_sale/sale.py
new file mode 100644
index 00000000000..aa8b6e57689
--- /dev/null
+++ b/addons/portal_sale/sale.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+
+class sale_order(osv.osv):
+    _inherit = 'sale.order'
+
+    def action_button_confirm(self, cr, uid, ids, context=None):
+        # fetch the partner's id and subscribe the partner to the sale order
+        partner = self.browse(cr, uid, ids[0], context=context)['partner_id']
+        if partner.id not in self.browse(cr, uid, ids[0], context=context)['message_follower_ids']:
+            self.message_subscribe(cr, uid, ids, [partner.id], context=context)
+            document = self.browse(cr, uid, ids[0], context=context)
+            mail_values = {
+                'email_from': self.pool.get('res.users').browse(cr, uid, uid, context=context)['partner_id']['email'],
+                'email_to': partner.email,
+                'subject': 'Invitation to follow %s' % document.name_get()[0][1],
+                'body_html': 'You have been invited to follow %s' % document.name_get()[0][1],
+                'auto_delete': True,
+            }
+            mail_obj = self.pool.get('mail.mail')
+            mail_id = mail_obj.create(cr, uid, mail_values, context=context)
+            mail_obj.send(cr, uid, [mail_id], recipient_ids=[partner.id], context=context)
+        return super(sale_order, self).action_button_confirm(cr, uid, ids, context=context)
+
+sale_order()
+
+class mail_mail(osv.osv):
+    _inherit = 'mail.mail'
+
+    def _postprocess_sent_message(self, cr, uid, mail, context=None):
+        if mail.model == 'sale.order':
+            so_obj = self.pool.get('sale.order')
+            partner = so_obj.browse(cr, uid, mail.res_id, context=context)['partner_id']
+            if partner.id not in so_obj.browse(cr, uid, mail.res_id, context=context)['message_follower_ids']:
+                so_obj.message_subscribe(cr, uid, [mail.res_id], [partner.id], context=context)
+        return super(mail_mail, self)._postprocess_sent_message(cr, uid, mail=mail, context=context)
+
+mail_mail()
\ No newline at end of file
diff --git a/addons/portal_sale/security/ir.model.access.csv b/addons/portal_sale/security/ir.model.access.csv
index 751c0b9baff..c73be67e8c9 100644
--- a/addons/portal_sale/security/ir.model.access.csv
+++ b/addons/portal_sale/security/ir.model.access.csv
@@ -1,10 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sale_order,sale.order,sale.model_sale_order,portal.group_portal,1,0,0,0
 access_sale_order_line,sale.order.line,sale.model_sale_order_line,portal.group_portal,1,0,0,0
-access_stock_picking,stock.picking,stock.model_stock_picking,portal.group_portal,1,0,0,0
-access_stock_picking.out,stock.picking.out,stock.model_stock_picking_out,portal.group_portal,1,0,0,0
-access_stock_move,stock.move,stock.model_stock_move,portal.group_portal,1,0,0,0
-access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,portal.group_portal,1,0,0,0
 access_account_invoice,account.invoice,account.model_account_invoice,portal.group_portal,1,0,0,0
 access_account_invoice_tax,account.invoice.tax,account.model_account_invoice_tax,portal.group_portal,1,0,0,0
 access_account_invoice_line,account.invoice.line,account.model_account_invoice_line,portal.group_portal,1,0,0,0
@@ -17,17 +13,9 @@ access_account_move_reconcile,account.move.reconcile,account.model_account_move_
 access_account_fiscalyear,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,portal.group_portal,1,0,0,0
 access_sale_shop,sale.shop,sale.model_sale_shop,portal.group_portal,1,0,0,0
 access_product_list,product.pricelist,product.model_product_pricelist,portal.group_portal,1,0,0,0
-access_product,product.product,product.model_product_product,portal.group_portal,1,0,0,0
 access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
-access_product_uom,product.uom,product.model_product_uom,portal.group_portal,1,0,0,0
 access_account_tax,account.tax,account.model_account_tax,portal.group_portal,1,0,0,0
-access_mrp_property,mrp.property,procurement.model_mrp_property,portal.group_portal,1,0,0,0
-access_product_template,product.template,product.model_product_template,portal.group_portal,1,0,0,0
-access_stock_warehouse,stock.warehouse,stock.model_stock_warehouse,portal.group_portal,1,0,0,0
-access_stock_location,stock.location,stock.model_stock_location,portal.group_portal,1,0,0,0
 access_account_fiscalyear,account.fiscalyear,account.model_account_fiscalyear,portal.group_portal,1,0,0,0
 access_res_partner_category,res.partner.category,base.model_res_partner_category,portal.group_portal,1,0,0,0
-access_product_supplierinfo,product.supplierinfo,product.model_product_supplierinfo,portal.group_portal,1,0,0,0
-access_product_packaging,product.packaging,product.model_product_packaging,portal.group_portal,1,0,0,0
 access_account_period,account.period,account.model_account_period,portal.group_portal,1,0,0,0
 access_account_account,account.account,account.model_account_account,portal.group_portal,1,0,0,0
diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index e86258dcdd2..428474487fe 100644
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -26,20 +26,6 @@ their documents through the portal.</field>
             <field eval="0" name="perm_create"/>
         </record>
 
-        <record id="portal_stock_picking_user_rule" model="ir.rule">
-            <field name="name">Portal Personal Delivery Orders</field>
-            <field name="model_id" ref="stock.model_stock_picking"/>
-            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-        </record>
-
-        <record id="portal_stock_picking_user_rule" model="ir.rule">
-            <field name="name">Portal Personal Delivery Orders Out</field>
-            <field name="model_id" ref="stock.model_stock_picking_out"/>
-            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-        </record>
-
         <record id="portal_account_invoice_user_rule" model="ir.rule">
             <field name="name">Portal Personal Account Invoices</field>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -47,13 +33,6 @@ their documents through the portal.</field>
             <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
-        <record id="portal_personal_payment" model="ir.rule">
-            <field name="name">Portal Personal Payments</field>
-            <field name="model_id" ref="account_voucher.model_account_voucher"/>
-            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
-        </record>
-
         <record id="portal_personal_contact" model="ir.rule">
             <field name="name">Portal Personal Contacts</field>
             <field name="model_id" ref="base.model_res_partner"/>
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index dd650aa85e5..b102f8279d3 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -7,28 +7,28 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-12-31 10:31+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-28 09:53+0000\n"
+"Last-Translator: ccdos <ccdos@163.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: 2012-11-25 05:51+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Node"
-msgstr "处理节点"
+msgstr "流程节点"
 
 #. module: process
 #: help:process.process,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the process "
 "without removing it."
-msgstr "此字段设为 False 将隐藏流程而不是删除它。"
+msgstr "如果活动字段设为 False 将隐藏流程而无需删除。"
 
 #. module: process
 #: field:process.node,menu_id:0
@@ -38,7 +38,7 @@ msgstr "相关菜单"
 #. module: process
 #: selection:process.node,kind:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: process
 #: field:process.transition,action_ids:0
@@ -72,7 +72,7 @@ msgstr "启动流程"
 #: view:process.node:0
 #: view:process.process:0
 msgid "Process Nodes"
-msgstr "处理节点"
+msgstr "流程节点"
 
 #. module: process
 #: view:process.process:0
@@ -136,7 +136,7 @@ msgstr "工作流迁移"
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "Last modified by:"
-msgstr ""
+msgstr "最后修改者:"
 
 #. module: process
 #: field:process.transition.action,action:0
@@ -148,7 +148,7 @@ msgstr "动作ID"
 #: code:addons/process/static/src/xml/process.xml:7
 #, python-format
 msgid "Process View"
-msgstr ""
+msgstr "业务流程视图"
 
 #. module: process
 #: model:ir.model,name:process.model_process_transition
@@ -196,7 +196,7 @@ msgstr "启动迁移"
 #: code:addons/process/static/src/xml/process.xml:54
 #, python-format
 msgid "Related:"
-msgstr ""
+msgstr "相关的："
 
 #. module: process
 #: view:process.node:0
@@ -212,14 +212,14 @@ msgstr "备注"
 #: code:addons/process/static/src/xml/process.xml:88
 #, python-format
 msgid "Edit Process"
-msgstr ""
+msgstr "编辑业务流程"
 
 #. module: process
 #. openerp-web
 #: code:addons/process/static/src/xml/process.xml:39
 #, python-format
 msgid "N/A"
-msgstr ""
+msgstr "无"
 
 #. module: process
 #: view:process.process:0
@@ -251,7 +251,7 @@ msgstr "动作"
 #: code:addons/process/static/src/xml/process.xml:67
 #, python-format
 msgid "Select Process"
-msgstr ""
+msgstr "选择业务流程"
 
 #. module: process
 #: field:process.condition,model_states:0
@@ -338,7 +338,7 @@ msgstr "节点类型"
 #: code:addons/process/static/src/xml/process.xml:42
 #, python-format
 msgid "Subflows:"
-msgstr ""
+msgstr "子工作流："
 
 #. module: process
 #: view:process.node:0
@@ -351,7 +351,7 @@ msgstr "迁移出口"
 #: code:addons/process/static/src/xml/process.xml:36
 #, python-format
 msgid "Notes:"
-msgstr ""
+msgstr "备注："
 
 #. module: process
 #: selection:process.node,kind:0
@@ -375,7 +375,7 @@ msgstr "对象方法"
 #: code:addons/process/static/src/xml/process.xml:77
 #, python-format
 msgid "Select"
-msgstr ""
+msgstr "选择"
 
 #~ msgid "State"
 #~ msgstr "状态"
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index f3f1876a431..9a2d19629eb 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-26 14:06+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 22:56+0000\n"
+"Last-Translator: Christophe Chauvet - http://www.syleam.fr/ <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #~ msgid "Second UoM"
 #~ msgstr "UdM secondaire"
@@ -64,7 +64,7 @@ msgstr "Jour"
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
-msgstr ""
+msgstr "Webcam"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -79,7 +79,7 @@ msgstr "Nom de l'article"
 #. module: product
 #: view:product.template:0
 msgid "Second Unit of Measure"
-msgstr ""
+msgstr "Unité de mesure secondaire"
 
 #. module: product
 #: help:res.partner,property_product_pricelist:0
@@ -103,7 +103,7 @@ msgstr "Fixé"
 #. module: product
 #: model:product.template,name:product.product_product_10_product_template
 msgid "Mouse, Optical"
-msgstr ""
+msgstr "Souris optique"
 
 #. module: product
 #: view:product.template:0
@@ -124,7 +124,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_3_product_template
 msgid "PC Assemble SC234"
-msgstr ""
+msgstr "PC Assemblé SC234"
 
 #. module: product
 #: help:product.product,message_summary:0
@@ -138,7 +138,7 @@ msgstr ""
 #: code:addons/product/product.py:206
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Avertissement !"
 
 #. module: product
 #: field:product.product,image_small:0
@@ -173,7 +173,7 @@ msgstr "Nom explicite pour cette ligne de la liste de prix"
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "Unit of Measure -> UOS Coeff"
-msgstr ""
+msgstr "Coeff. unité de mesure -> UdV"
 
 #. module: product
 #: field:product.price_list,price_list:0
@@ -183,7 +183,7 @@ msgstr "Liste de prix"
 #. module: product
 #: model:product.template,name:product.product_product_4_product_template
 msgid "PC Assemble SC349"
-msgstr ""
+msgstr "PC Assemble SC349"
 
 #. module: product
 #: help:product.product,seller_delay:0
@@ -272,6 +272,16 @@ msgid ""
 "Otherwise, this includes goods leaving any Stock Location with 'internal' "
 "type."
 msgstr ""
+"Quantité de cet article dont l'envoi est prévu.\n"
+"Dans le contexte d'un emplacement de stock, cela tient compte des articles "
+"sortant de cet emplacement ou de ses enfants.\n"
+"Dans le contexte d'un entrepôt, cela tient compte des articles sortant de "
+"l'emplacement de stock de cet entrepôt ou de l'un de ses enfants.\n"
+"Dans le contexte d'une boutique, cela tient compte des articles sortant de "
+"l'emplacement de stock de l'entrepôt de cette boutique, ou de l'un de ses "
+"enfants.\n"
+"Dans les autres cas, cela tient compte de tous les articles sortant des "
+"emplacements de type \"interne\"."
 
 #. module: product
 #: model:product.template,description_sale:product.product_product_42_product_template
@@ -313,12 +323,12 @@ msgstr "Catégorie"
 #. module: product
 #: model:product.uom,name:product.product_uom_litre
 msgid "Litre"
-msgstr ""
+msgstr "Litre"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Laptop E5023"
-msgstr ""
+msgstr "Portable E5023"
 
 #. module: product
 #: help:product.packaging,ul_qty:0
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 3a5321c3756..3688a8fa226 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-08-30 18:22+0000\n"
+"PO-Revision-Date: 2012-11-29 11:06+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:05+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -24,7 +24,7 @@ msgstr "Количество уровней"
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "Base price for computation."
-msgstr ""
+msgstr "Базовая цена для вычислений."
 
 #. module: product
 #: help:product.product,seller_qty:0
@@ -39,7 +39,7 @@ msgstr "День"
 #. module: product
 #: model:product.template,name:product.product_product_34_product_template
 msgid "Webcam"
-msgstr ""
+msgstr "Веб-камера"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -49,12 +49,12 @@ msgstr "Входящие"
 #. module: product
 #: view:product.product:0
 msgid "Product Name"
-msgstr ""
+msgstr "Наименование товара"
 
 #. module: product
 #: view:product.template:0
 msgid "Second Unit of Measure"
-msgstr ""
+msgstr "Вторая единица измерения"
 
 #. module: product
 #: help:res.partner,property_product_pricelist:0
@@ -78,7 +78,7 @@ msgstr "Фиксированный"
 #. module: product
 #: model:product.template,name:product.product_product_10_product_template
 msgid "Mouse, Optical"
-msgstr ""
+msgstr "Мышь, оптическая"
 
 #. module: product
 #: view:product.template:0
@@ -95,6 +95,7 @@ msgstr "Название правила"
 msgid ""
 "Base price to compute the customer price. Sometimes called the catalog price."
 msgstr ""
+"Базовая цена для расчета цены заказчику. Так называемая прайсовая цена."
 
 #. module: product
 #: model:product.template,name:product.product_product_3_product_template
@@ -107,18 +108,20 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: product
 #: code:addons/product/pricelist.py:177
 #: code:addons/product/product.py:206
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Внимание!"
 
 #. module: product
 #: field:product.product,image_small:0
 msgid "Small-sized image"
-msgstr ""
+msgstr "Маленькое изображение"
 
 #. module: product
 #: code:addons/product/product.py:174
@@ -148,7 +151,7 @@ msgstr "Название явного правила для позиции пр�
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "Unit of Measure -> UOS Coeff"
-msgstr ""
+msgstr "Коэффициент Ед.изм -> Ед.прод."
 
 #. module: product
 #: field:product.price_list,price_list:0
@@ -275,6 +278,7 @@ msgstr "Упаковка"
 msgid ""
 "If unchecked, it will allow you to hide the product without removing it."
 msgstr ""
+"Если не установлено, это позволит вам скрыть продукт, не удаляя его ."
 
 #. module: product
 #: view:product.product:0
@@ -286,7 +290,7 @@ msgstr "Категория"
 #. module: product
 #: model:product.uom,name:product.product_uom_litre
 msgid "Litre"
-msgstr ""
+msgstr "Литр"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
@@ -339,7 +343,7 @@ msgstr "Открытый каталог"
 #. module: product
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Ошибка! Конечная дата не может быть установлена ​​ранее даты начала."
 
 #. module: product
 #: field:product.price_list,qty5:0
@@ -369,7 +373,7 @@ msgstr "Менеджер продукции"
 #. module: product
 #: model:product.template,name:product.product_product_7_product_template
 msgid "17” LCD Monitor"
-msgstr ""
+msgstr "17” LCD Monitor"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
@@ -395,7 +399,7 @@ msgstr "Длина пакета"
 #. module: product
 #: field:product.product,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итого"
 
 #. module: product
 #: help:product.template,weight_net:0
@@ -447,12 +451,12 @@ msgstr "Высота"
 #. module: product
 #: view:product.product:0
 msgid "Procurements"
-msgstr ""
+msgstr "Снабжение"
 
 #. module: product
 #: model:res.groups,name:product.group_mrp_properties
 msgid "Manage Properties of Product"
-msgstr ""
+msgstr "Управление свойствами товара"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -505,7 +509,7 @@ msgstr "Время работы"
 #. module: product
 #: model:product.template,name:product.product_product_42_product_template
 msgid "Office Suite"
-msgstr ""
+msgstr "Набор офисных приложений"
 
 #. module: product
 #: field:product.template,mes_type:0
@@ -515,7 +519,7 @@ msgstr "Тип измерения"
 #. module: product
 #: model:product.template,name:product.product_product_32_product_template
 msgid "Headset standard"
-msgstr ""
+msgstr "Наушники стандартные"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -551,7 +555,7 @@ msgstr "Ящик 20x20x40"
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty"
-msgstr ""
+msgstr "Гарантия"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -564,11 +568,13 @@ msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
 msgstr ""
+"Вы ввели недопустимую ссылку на баркод EAN13. Вы можете использовать поле "
+"\"Внутренняя ссылка\"."
 
 #. module: product
 #: model:res.groups,name:product.group_purchase_pricelist
 msgid "Purchase Pricelists"
-msgstr ""
+msgstr "Прайс-лист закупок"
 
 #. module: product
 #: model:product.template,name:product.product_product_5_product_template
@@ -593,12 +599,12 @@ msgstr "Ширина пакета"
 #: code:addons/product/product.py:359
 #, python-format
 msgid "Unit of Measure categories Mismatch!"
-msgstr ""
+msgstr "Несоответствие категорий единиц измерения!"
 
 #. module: product
 #: model:product.template,name:product.product_product_36_product_template
 msgid "Blank DVD-RW"
-msgstr ""
+msgstr "Чистый DVD-RW"
 
 #. module: product
 #: selection:product.category,type:0
@@ -618,7 +624,7 @@ msgstr ""
 #. module: product
 #: help:product.pricelist.item,price_max_margin:0
 msgid "Specify the maximum amount of margin over the base price."
-msgstr ""
+msgstr "Определите максимальную наценку сверх базовой цены."
 
 #. module: product
 #: constraint:product.pricelist.item:0
@@ -630,7 +636,7 @@ msgstr ""
 #. module: product
 #: view:product.price_list:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: product
 #: constraint:product.packaging:0
@@ -646,7 +652,7 @@ msgstr "Мин. кол-во"
 #. module: product
 #: model:product.template,name:product.product_product_12_product_template
 msgid "Mouse, Wireless"
-msgstr ""
+msgstr "Мышь, беспроводная"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
@@ -720,12 +726,12 @@ msgstr "Название цены"
 #. module: product
 #: help:product.product,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если установлено, новые сообщения требуют вашего внимания"
 
 #. module: product
 #: model:product.category,name:product.product_category_1
 msgid "Saleable"
-msgstr ""
+msgstr "Продаваемое"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -739,17 +745,17 @@ msgstr "Каталог"
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Forecasted Quantity"
-msgstr ""
+msgstr "Прогнозируемое количество"
 
 #. module: product
 #: view:product.product:0
 msgid "Purchase"
-msgstr ""
+msgstr "Закупка"
 
 #. module: product
 #: model:product.template,name:product.product_product_33_product_template
 msgid "Headset USB"
-msgstr ""
+msgstr "USB наушники"
 
 #. module: product
 #: view:product.template:0
@@ -759,7 +765,7 @@ msgstr "Поставщики"
 #. module: product
 #: model:res.groups,name:product.group_sale_pricelist
 msgid "Sales Pricelists"
-msgstr ""
+msgstr "Прайс-лист продаж"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -779,7 +785,7 @@ msgstr "Поставщик ТМЦ"
 #. module: product
 #: model:product.template,name:product.product_product_28_product_template
 msgid "External Hard disk"
-msgstr ""
+msgstr "Внешний жесткий диск"
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -870,7 +876,7 @@ msgstr ""
 #. module: product
 #: view:product.template:0
 msgid "days"
-msgstr ""
+msgstr "дней"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
@@ -908,7 +914,7 @@ msgstr "Категории ТМЦ"
 #. module: product
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "Код валюты должен быть уникальным в компании!"
 
 #. module: product
 #: view:product.template:0
@@ -943,7 +949,7 @@ msgstr "Тип цены продукции"
 #. module: product
 #: field:product.product,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -984,7 +990,7 @@ msgstr ""
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "First valid date for the version."
-msgstr ""
+msgstr "Первая допустимая дата для версии."
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -1029,7 +1035,7 @@ msgstr "Единица поставки"
 #. module: product
 #: model:product.template,name:product.product_product_35_product_template
 msgid "Blank CD"
-msgstr ""
+msgstr "Чистый CD"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
@@ -1101,7 +1107,7 @@ msgstr "Цена за ед."
 #. module: product
 #: field:product.category,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Правый источник"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
@@ -1112,17 +1118,17 @@ msgstr "Надбавка к цене"
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "Внутренняя ссылка"
 
 #. module: product
 #: model:product.template,name:product.product_product_8_product_template
 msgid "USB Keyboard, QWERTY"
-msgstr ""
+msgstr "USB клавиатура, QWERTY"
 
 #. module: product
 #: model:product.category,name:product.product_category_9
 msgid "Softwares"
-msgstr ""
+msgstr "Программное обеспечение"
 
 #. module: product
 #: field:product.product,packaging:0
@@ -1144,12 +1150,12 @@ msgstr "Название"
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Computers"
-msgstr ""
+msgstr "Компьютеры"
 
 #. module: product
 #: help:product.product,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
@@ -1169,7 +1175,7 @@ msgstr "км"
 #. module: product
 #: field:product.template,standard_price:0
 msgid "Cost"
-msgstr ""
+msgstr "Стоимость"
 
 #. module: product
 #: help:product.category,sequence:0
@@ -1214,13 +1220,13 @@ msgstr "Единица продажи"
 #. module: product
 #: field:product.product,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные сообщения"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr ""
+msgstr "Категории единиц измерения"
 
 #. module: product
 #: help:product.product,seller_id:0
@@ -1286,7 +1292,7 @@ msgstr "Количество слоев на поддоне или в короб
 #. module: product
 #: help:product.pricelist.item,price_min_margin:0
 msgid "Specify the minimum amount of margin over the base price."
-msgstr ""
+msgstr "Укажите минимальную наценку к базовой цене."
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -1327,12 +1333,12 @@ msgstr ""
 #: code:addons/product/product.py:736
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (копия)"
 
 #. module: product
 #: model:product.template,name:product.product_product_2_product_template
 msgid "On Site Assistance"
-msgstr ""
+msgstr "Помощь на сайте"
 
 #. module: product
 #: model:product.template,name:product.product_product_39_product_template
@@ -1401,7 +1407,7 @@ msgstr "Вес брутто в килограммах."
 #. module: product
 #: model:product.template,name:product.product_product_37_product_template
 msgid "Printer, All-in-one"
-msgstr ""
+msgstr "Принтер, все в одном"
 
 #. module: product
 #: view:product.template:0
@@ -1411,7 +1417,7 @@ msgstr "Снабжение"
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Processor AMD 8-Core"
-msgstr ""
+msgstr "Процессор AMD 8-Core"
 
 #. module: product
 #: view:product.product:0
@@ -1422,7 +1428,7 @@ msgstr "Вес"
 #. module: product
 #: view:product.product:0
 msgid "Description for Quotations"
-msgstr ""
+msgstr "Описание предложения"
 
 #. module: product
 #: help:pricelist.partnerinfo,price:0
@@ -1444,7 +1450,7 @@ msgstr "Объединять по..."
 #. module: product
 #: field:product.product,image_medium:0
 msgid "Medium-sized image"
-msgstr ""
+msgstr "Среднее изображение"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1457,7 +1463,7 @@ msgstr "Ед."
 #: code:addons/product/product.py:588
 #, python-format
 msgid "Product has been <b>created</b>."
-msgstr ""
+msgstr "Товар <b>создан</b>."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1467,7 +1473,7 @@ msgstr "Дата начала"
 #. module: product
 #: model:product.template,name:product.product_product_38_product_template
 msgid "Ink Cartridge"
-msgstr ""
+msgstr "Чернила в картридже"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
@@ -1506,7 +1512,7 @@ msgstr ""
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price"
-msgstr ""
+msgstr "Цены товаров"
 
 #. module: product
 #: model:product.template,description:product.product_product_26_product_template
@@ -1525,7 +1531,7 @@ msgstr "Точность округления"
 #. module: product
 #: view:product.product:0
 msgid "Consumable products"
-msgstr ""
+msgstr "Расходные материалы"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
@@ -1541,7 +1547,7 @@ msgstr ""
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Last valid date for the version."
-msgstr ""
+msgstr "Последняя допустимая дата для версии."
 
 #. module: product
 #: model:product.template,name:product.product_product_19_product_template
@@ -1570,7 +1576,7 @@ msgstr "Название прайс-листа"
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13 Barcode"
-msgstr ""
+msgstr "Баркод EAN13"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1581,7 +1587,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Graphics Card"
-msgstr ""
+msgstr "Графическая плата"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1601,7 +1607,7 @@ msgstr "Вес пустого пакета"
 #. module: product
 #: model:product.template,name:product.product_product_41_product_template
 msgid "Windows Home Server 2011"
-msgstr ""
+msgstr "Windows Home Server 2011"
 
 #. module: product
 #: field:product.price.type,field:0
@@ -1628,7 +1634,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Sales"
-msgstr ""
+msgstr "Продажи"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_categ_form_action
@@ -1655,7 +1661,7 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference Unit of Measure"
-msgstr ""
+msgstr "Меньше, чем базовая единица измерения"
 
 #. module: product
 #: model:product.pricelist,name:product.list0
@@ -1698,7 +1704,7 @@ msgstr "ТМЦ"
 #. module: product
 #: view:product.product:0
 msgid "Price:"
-msgstr ""
+msgstr "Цена:"
 
 #. module: product
 #: field:product.template,weight:0
@@ -1740,12 +1746,12 @@ msgstr "Назначает приоритет в списке поставщик
 #. module: product
 #: constraint:product.pricelist.item:0
 msgid "Error! The minimum margin should be lower than the maximum margin."
-msgstr ""
+msgstr "Ошибка! Минимальная наценка должна быть меньше , чем максимальная."
 
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Manage Secondary Unit of Measure"
-msgstr ""
+msgstr "Управление второй единицей измерения"
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -1777,7 +1783,7 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference Unit of Measure"
-msgstr ""
+msgstr "Больше, чем базовая единица измерения"
 
 #. module: product
 #: model:product.template,name:product.product_product_consultant_product_template
@@ -1788,12 +1794,12 @@ msgstr "Услуга"
 #. module: product
 #: view:product.template:0
 msgid "Internal Description"
-msgstr ""
+msgstr "Внутреннее описание"
 
 #. module: product
 #: model:product.template,name:product.product_product_48_product_template
 msgid "USB Adapter"
-msgstr ""
+msgstr "USB Adapter"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -1806,7 +1812,7 @@ msgstr ""
 #: code:addons/product/product.py:206
 #, python-format
 msgid "Cannot change the category of existing Unit of Measure '%s'."
-msgstr ""
+msgstr "Невозможно изменить категорию существующие единицы измерения '%s'."
 
 #. module: product
 #: help:product.packaging,height:0
@@ -1862,13 +1868,13 @@ msgstr "Этот товар сконфигурирован с примером �
 #. module: product
 #: field:product.product,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: product
 #: code:addons/product/product.py:174
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1883,7 +1889,7 @@ msgstr "Длинна / Расстояние"
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Components"
-msgstr ""
+msgstr "Компоненты"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
@@ -1894,7 +1900,7 @@ msgstr "Тип каталога"
 #. module: product
 #: model:product.category,name:product.product_category_6
 msgid "External Devices"
-msgstr ""
+msgstr "Внешние устройства"
 
 #. module: product
 #: field:product.product,color:0
@@ -1904,7 +1910,7 @@ msgstr "Цветовая палитра"
 #. module: product
 #: help:product.template,sale_ok:0
 msgid "Specify if the product can be selected in a sales order line."
-msgstr ""
+msgstr "Укажите , если продукт может быть выбран в заказе продажи."
 
 #. module: product
 #: view:product.product:0
@@ -1988,12 +1994,12 @@ msgstr ""
 #. module: product
 #: field:product.product,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: product
 #: view:product.product:0
 msgid "Sale Conditions"
-msgstr ""
+msgstr "Условия продажи"
 
 #. module: product
 #: view:product.packaging:0
@@ -2009,7 +2015,7 @@ msgstr "Название каталога"
 #. module: product
 #: view:product.product:0
 msgid "Description for Suppliers"
-msgstr ""
+msgstr "Описание для поставщиков"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
@@ -2019,7 +2025,7 @@ msgstr "Время выполнения доставки"
 #. module: product
 #: view:product.product:0
 msgid "months"
-msgstr ""
+msgstr "месяцы"
 
 #. module: product
 #: help:product.uom,active:0
@@ -2038,7 +2044,7 @@ msgstr "Время поставки"
 #. module: product
 #: model:ir.model,name:product.model_decimal_precision
 msgid "decimal.precision"
-msgstr ""
+msgstr "decimal.precision"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -2157,12 +2163,12 @@ msgstr "Описания"
 #. module: product
 #: model:res.groups,name:product.group_stock_packaging
 msgid "Manage Product Packaging"
-msgstr ""
+msgstr "Управление упаковкой товаров"
 
 #. module: product
 #: model:product.category,name:product.product_category_2
 msgid "Internal"
-msgstr ""
+msgstr "Внутренний"
 
 #. module: product
 #: model:product.template,name:product.product_product_45_product_template
@@ -2241,7 +2247,7 @@ msgstr "Переменный"
 #: field:product.product,message_comment_ids:0
 #: help:product.product,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Комментарии и эл. письма"
 
 #. module: product
 #: field:product.template,rental:0
@@ -2261,7 +2267,7 @@ msgstr "Минимальная маржа цены"
 #. module: product
 #: model:res.groups,name:product.group_uom
 msgid "Manage Multiple Units of Measure"
-msgstr ""
+msgstr "Управление несколькими единицами измерения"
 
 #. module: product
 #: help:product.packaging,weight:0
@@ -2271,7 +2277,7 @@ msgstr "Вес полной упаковки, коробки или поддон
 #. module: product
 #: view:product.uom:0
 msgid "e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "прим.: 1 * (эта единица) = коэффициент * (базовая единица)"
 
 #. module: product
 #: model:product.template,description:product.product_product_25_product_template
@@ -2322,7 +2328,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_11_product_template
 msgid "Mouse, Laser"
-msgstr ""
+msgstr "Мышь, лазерная"
 
 #. module: product
 #: view:product.template:0
@@ -2375,17 +2381,17 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_40_product_template
 msgid "Windows 7 Professional"
-msgstr ""
+msgstr "Windows 7 Professional"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference Unit of Measure for this category"
-msgstr ""
+msgstr "Базовая единица измерения для этой категории"
 
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier Unit of Measure"
-msgstr ""
+msgstr "Единица измерения поставщика"
 
 #. module: product
 #: view:product.product:0
@@ -2510,6 +2516,8 @@ msgid ""
 "Conversion between Units of Measure can only occur if they belong to the "
 "same category. The conversion will be made based on the ratios."
 msgstr ""
+"Преобразование между единицами измерения возможно если они принадлежат одной "
+"категории. Преобразование будет сделано на основе коэффициентов."
 
 #. module: product
 #: constraint:product.category:0
@@ -2532,7 +2540,7 @@ msgstr ""
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid "This is a quantity which is converted into Default Unit of Measure."
-msgstr ""
+msgstr "Это величина, которая превращается в единицу измерения по умолчанию."
 
 #. module: product
 #: sql_constraint:decimal.precision:0
diff --git a/addons/product/product.py b/addons/product/product.py
index 1333c9581a7..fb28f85b10f 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -546,7 +546,7 @@ class product_product(osv.osv):
         'default_code' : fields.char('Internal Reference', size=64, select=True),
         'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
-        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
+        'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade", select=True),
         'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
         '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_compute=dp.get_precision('Product Price')),
diff --git a/addons/product_expiry/i18n/fr.po b/addons/product_expiry/i18n/fr.po
index 42f326a08ee..1439b719bc7 100644
--- a/addons/product_expiry/i18n/fr.po
+++ b/addons/product_expiry/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-10-18 13:58+0000\n"
+"PO-Revision-Date: 2012-11-29 14:56+0000\n"
 "Last-Translator: Numérigraphe <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: 2012-11-25 06:21+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
@@ -29,7 +29,7 @@ msgstr "Lait de vache"
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
-msgstr "Durée de vie du produit"
+msgstr "Durée de vie de l'article"
 
 #. module: product_expiry
 #: help:stock.production.lot,removal_date:0
@@ -48,7 +48,7 @@ msgstr ""
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
-msgstr "Durée d'utilisation du produit"
+msgstr "Durée d'utilisation de l'article"
 
 #. module: product_expiry
 #: sql_constraint:stock.production.lot:0
@@ -59,7 +59,7 @@ msgstr ""
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: product_expiry
 #: help:product.product,use_time:0
@@ -76,7 +76,7 @@ msgstr ""
 #. module: product_expiry
 #: field:product.product,removal_time:0
 msgid "Product Removal Time"
-msgstr "Durée avant retrait du produit"
+msgstr "Durée avant retrait de l'article"
 
 #. module: product_expiry
 #: help:stock.production.lot,alert_date:0
@@ -163,7 +163,7 @@ msgstr ""
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
-msgstr "Durée avant alerte sur le produit"
+msgstr "Durée avant alerte sur l'article"
 
 #~ msgid "Product lifetime"
 #~ msgstr "Durée limite de consommation"
diff --git a/addons/product_expiry/i18n/zh_CN.po b/addons/product_expiry/i18n/zh_CN.po
index 1ac781b3549..e11740cf750 100644
--- a/addons/product_expiry/i18n/zh_CN.po
+++ b/addons/product_expiry/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-07-13 15:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-30 02:54+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:21+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
@@ -72,7 +72,7 @@ msgstr ""
 #. module: product_expiry
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
@@ -89,7 +89,7 @@ msgstr ""
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
 msgid "Serial Number"
-msgstr ""
+msgstr "序列号"
 
 #. module: product_expiry
 #: help:product.product,alert_time:0
@@ -108,7 +108,7 @@ msgstr "移除日期"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_pain_product_template
diff --git a/addons/product_margin/i18n/fr.po b/addons/product_margin/i18n/fr.po
index 731bee53b36..8e9be9cc311 100644
--- a/addons/product_margin/i18n/fr.po
+++ b/addons/product_margin/i18n/fr.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-18 16:44+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2012-11-28 17:23+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -74,7 +73,7 @@ msgstr "Prix Unitaire Moyen"
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_product
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: product_margin
 #: sql_constraint:product.product:0
@@ -243,7 +242,7 @@ msgstr "Ventes"
 #: view:product.product:0
 #, python-format
 msgid "Product Margins"
-msgstr "Marges par produits"
+msgstr "Marges par articles"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -288,7 +287,7 @@ msgstr ""
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
-msgstr "Marge du produit"
+msgstr "Marge de l'article"
 
 #~ msgid ""
 #~ "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
diff --git a/addons/product_margin/i18n/ru.po b/addons/product_margin/i18n/ru.po
index a1d8f58d579..0111106d690 100644
--- a/addons/product_margin/i18n/ru.po
+++ b/addons/product_margin/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-20 14:47+0000\n"
+"PO-Revision-Date: 2012-11-29 11:11+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -78,7 +78,7 @@ msgstr "Продукция"
 #. module: product_margin
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Ошибка! Конечная дата не может быть установлена ​​ранее даты начала."
 
 #. module: product_margin
 #: view:product.product:0
@@ -128,6 +128,8 @@ msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
 msgstr ""
+"Вы ввели недопустимую ссылку на баркод EAN13. Вы можете использовать поле "
+"\"Внутренняя ссылка\"."
 
 #. module: product_margin
 #: view:product.product:0
@@ -282,7 +284,7 @@ msgstr "Суммарное количество в счетах заказчик
 #. module: product_margin
 #: view:product.margin:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 635ccf2469c..178a8b15dbf 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -7,20 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-02-06 16:52+0000\n"
-"Last-Translator: Lorenzo Battistini - Agile BG - Domsense "
-"<lorenzo.battistini@agilebg.com>\n"
+"PO-Revision-Date: 2012-11-28 23:08+0000\n"
+"Last-Translator: Sergio Corato <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: 2012-11-25 05:35+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: project
 #: view:project.project:0
 msgid "Email Interface"
-msgstr ""
+msgstr "Interfaccia Email"
 
 #. module: project
 #: help:account.analytic.account,use_tasks:0
@@ -86,7 +85,7 @@ msgstr "Inizia Attività"
 #: code:addons/project/project.py:962
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Attenzione !"
 
 #. module: project
 #: help:project.project,message_unread:0
@@ -137,7 +136,7 @@ msgstr ""
 #: code:addons/project/project.py:1416
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Attenzione!"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner
@@ -147,7 +146,7 @@ msgstr "Partner"
 #. module: project
 #: field:project.config.settings,group_manage_delegation_task:0
 msgid "Allow task delegation"
-msgstr ""
+msgstr "Permette la delega delle attività"
 
 #. module: project
 #: field:project.task.delegate,planned_hours:0
@@ -164,7 +163,7 @@ msgstr "Reimpostare come Progetto"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Attività in corso"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -174,7 +173,7 @@ msgstr "Percentuale di attività chiuse in base alle attività da completare."
 #. module: project
 #: model:ir.actions.client,name:project.action_client_project_menu
 msgid "Open Project Menu"
-msgstr ""
+msgstr "Apre Menu del Progetto"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_project_task_user_tree
@@ -196,12 +195,12 @@ msgstr "Titolo attività di convalida"
 #. module: project
 #: model:res.groups,name:project.group_delegate_task
 msgid "Task Delegation"
-msgstr ""
+msgstr "Delega Attività"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
+msgstr "Errore! Non è possibile creare conti analitici ricorsivi."
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -233,7 +232,7 @@ msgstr "Assegnato a"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Molto importante"
 
 #. module: project
 #: view:project.project:0
@@ -274,7 +273,7 @@ msgstr "Delega attività progetto"
 #: code:addons/project/project.py:551
 #, python-format
 msgid "Project has been <b>created</b>."
-msgstr ""
+msgstr "Il progetto è stato <b>creato</b>."
 
 #. module: project
 #: view:project.config.settings:0
@@ -506,7 +505,7 @@ msgstr "Ri-include la descrizione dell'attività nell'attività dell'utente"
 #. module: project
 #: view:project.project:0
 msgid "Project Settings"
-msgstr ""
+msgstr "Impostazioni del progetto"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -821,7 +820,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Close Project"
-msgstr ""
+msgstr "Chiudi il progetto"
 
 #. module: project
 #: field:project.project,tasks:0
@@ -914,7 +913,7 @@ msgstr ""
 #: code:addons/project/project.py:560
 #, python-format
 msgid "Project has been <b>canceled</b>."
-msgstr ""
+msgstr "Il progetto è stato <b>annullato</b>."
 
 #. module: project
 #: help:project.project,analytic_account_id:0
@@ -941,7 +940,7 @@ msgstr "Annulla"
 #: code:addons/project/project.py:563
 #, python-format
 msgid "Project has been <b>closed</b>."
-msgstr ""
+msgstr "Il progetto è stato <b>chiuso</b>."
 
 #. module: project
 #: view:project.project:0
@@ -1053,13 +1052,13 @@ msgstr "Cronologia Lavoro"
 #: code:addons/project/project.py:557
 #, python-format
 msgid "Project is now <b>pending</b>."
-msgstr ""
+msgstr "Il Progetto adesso è <b>sospeso</b>."
 
 #. module: project
 #: code:addons/project/project.py:554
 #, python-format
 msgid "Project has been <b>opened</b>."
-msgstr ""
+msgstr "Il progetto è stato <b>aperto</b>."
 
 #. module: project
 #: view:project.project:0
@@ -1077,7 +1076,7 @@ msgstr "Template"
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Riaprire il progetto"
 
 #. module: project
 #: help:project.project,priority:0
@@ -1278,7 +1277,7 @@ msgstr ""
 #. module: project
 #: help:project.config.settings,time_unit:0
 msgid "This will set the unit of measure used in projects and tasks."
-msgstr ""
+msgstr "Imposta l'unità di misura usata nei progetti e nelle attività."
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1330,7 +1329,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "Progetti dei quali sono un membro."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1460,6 +1459,9 @@ msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
 "project's tasks and then delete the project or simply deactivate the project."
 msgstr ""
+"Non è possibile cancellare un progetto contenente attività. E' possibile sia "
+"cancellare tutte le attività del progetto e successivamente cancellare il "
+"progetto o semplicemente disattivare il progetto."
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@@ -1524,7 +1526,7 @@ msgstr "Ore Totali"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project
 #: view:project.project:0
@@ -1643,12 +1645,12 @@ msgstr "CONTROLLA: "
 #: code:addons/project/project.py:434
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "E' necessario assegnare i membri del progetto '%s' !"
 
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "Progetti In Sospeso"
 
 #. module: project
 #: view:project.task:0
diff --git a/addons/project/project.py b/addons/project/project.py
index 68122d1a614..12d7cada034 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -49,11 +49,17 @@ class project_task_type(osv.osv):
         'fold': fields.boolean('Hide in views if empty',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
+    def _get_default_project_id(self, cr, uid, ctx={}):
+        proj = ctx.get('default_project_id', False)
+        if type(proj) is int:
+            return [proj]
+        return proj
     _defaults = {
         'sequence': 1,
         'state': 'open',
         'fold': False,
         'case_default': True,
+        'project_ids': _get_default_project_id
     }
     _order = 'sequence'
 
@@ -532,7 +538,7 @@ def Project():
         # Prevent double project creation when 'use_tasks' is checked!
         context = dict(context, project_creation_in_progress=True)
         mail_alias = self.pool.get('mail.alias')
-        if not vals.get('alias_id'):
+        if not vals.get('alias_id') and vals.get('name', False):
             vals.pop('alias_name', None) # prevent errors during copy()
             alias_id = mail_alias.create_unique_alias(cr, uid,
                           # Using '+' allows using subaddressing for those who don't
@@ -603,18 +609,13 @@ class task(base_stage, osv.osv):
         stage_obj = self.pool.get('project.task.type')
         order = stage_obj._order
         access_rights_uid = access_rights_uid or uid
-        # lame way to allow reverting search, should just work in the trivial case
         if read_group_order == 'stage_id desc':
             order = '%s desc' % order
-        # retrieve section_id from the context and write the domain
-        # - ('id', 'in', 'ids'): add columns that should be present
-        # - OR ('case_default', '=', True), ('fold', '=', False): add default columns that are not folded
-        # - OR ('project_ids', 'in', project_id), ('fold', '=', False) if project_id: add project columns that are not folded
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
             search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
+        search_domain += [('id', 'in', ids)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
@@ -750,7 +751,7 @@ class task(base_stage, osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage',
-                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_TASK_STATE, string="Status", readonly=True,
                 help='The status is set to \'Draft\', when a case is created.\
@@ -936,14 +937,11 @@ class task(base_stage, osv.osv):
         for task in cases:
             if task.project_id:
                 section_ids.append(task.project_id.id)
-        # OR all section_ids and OR with case_default
         search_domain = []
         if section_ids:
-            search_domain += [('|')] * len(section_ids)
+            search_domain = [('|')] * (len(section_ids)-1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
-        search_domain.append(('case_default', '=', True))
-        # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
         stage_ids = self.pool.get('project.task.type').search(cr, uid, search_domain, order=order, context=context)
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index ee887c2728c..f5fbf878fd0 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -36,7 +36,11 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
+        </record>
+
+        <!-- We assign after so that default values applies -->
+        <record id="project_project_1" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_analysis')) ,(4,ref('project_tt_specification')), (4,ref('project_tt_development')), (4,ref('project_tt_testing')), (4,ref('project_tt_deployment'))]"/>
         </record>
 
         <record id="project_project_2" model="project.project">
@@ -45,7 +49,11 @@
             <field name="privacy_visibility">public</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
+        </record>
+
+        <!-- We assign after so that default values applies -->
+        <record id="project_project_2" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_specification')),(4,ref('project_tt_development')),(4,ref('project_tt_testing')),(4,ref('project_tt_merge')),(4,ref('project_tt_deployment'))]"/>
         </record>
 
         <record id="project_project_3" model="project.project">
@@ -55,10 +63,11 @@
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="privacy_visibility">public</field>
-            <field name="members" eval="[(6, 0, [
-                    ref('base.user_root'),
-                    ref('base.user_demo')])]"/>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
+            <field name="members" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
+        </record>
+
+        <record id="project_project_3" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_specification')),(4,ref('project_tt_development')),(4,ref('project_tt_testing')),(4,ref('project_tt_merge')),(4,ref('project_tt_deployment'))]"/>
         </record>
 
         <record id="project_project_4" model="project.project">
@@ -67,10 +76,11 @@
             <field name="name">Website Design Templates</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_design'),ref('project_tt_development'),ref('project_tt_testing')])]"/>
-            <field name="members" eval="[(6, 0, [
-                    ref('base.user_root'),
-                    ref('base.user_demo')])]"/>
+            <field name="members" eval="[(4, ref('base.user_root')), (4,ref('base.user_demo'))]"/>
+        </record>
+
+        <record id="project_project_4" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_design')),(4,ref('project_tt_development')),(4,ref('project_tt_testing'))]"/>
         </record>
 
         <record id="project_project_5" model="project.project">
@@ -79,12 +89,15 @@
             <field name="partner_id" ref="base.res_partner_7"/>
             <field name="name">Data Import/Export Plugin</field>
             <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_development')])]"/>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
         </record>
 
+        <record id="project_project_5" model="project.project">
+            <field name="type_ids" eval="[(4, ref('project_tt_development'))]"/>
+        </record>
+
 
         <!-- Tasks -->
         <record id="project_task_1" model="project.task">
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8bb45ca6738..840d9b47ae0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,7 +21,7 @@
 
         <!-- Project Read/Unread actions -->
         <record id="actions_server_project_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Project: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
@@ -39,7 +39,7 @@
         </record>
 
         <record id="actions_server_project_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Project: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
@@ -63,14 +63,14 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
-                    <button name="set_done" string="Close Project" type="object" states="open,pending"/>
-                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close"/>
-                    <button name="set_pending" string="Pending" type="object" states="open"/>
-                    <button name="set_template" string="Set as Template" type="object" states="open"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight"/>
-                    <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight" groups="base.group_user"/>
+                    <button name="set_done" string="Close Project" type="object" states="open,pending" groups="base.group_user"/>
+                    <button name="set_open" string="Re-open project" type="object" states="cancelled,close" groups="base.group_user"/>
+                    <button name="set_pending" string="Pending" type="object" states="open" groups="base.group_user"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open" groups="base.group_user"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}" class="oe_highlight" groups="base.group_user"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template" class="oe_highlight" groups="base.group_user"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" groups="base.group_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' readonly="1"/>
                 </header>
                 <sheet string="Project">
@@ -85,7 +85,7 @@
                             <label for="use_tasks"/>
                         </div>
                     </div>
-                    <div class="oe_right oe_button_box" name="buttons">
+                    <div class="oe_right oe_button_box" name="buttons" groups="base.group_user">
                         <button name="%(act_project_project_2_project_task_all)d" string="Tasks"
                             type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
                         <button name="attachment_tree_view" string="Documents" type="object"/>
@@ -152,7 +152,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" help="Follow this project to automatically follow all related tasks and issues."/>
+                    <field name="message_follower_ids" widget="mail_followers" help="Follow this project to automatically follow all related tasks and issues." groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
@@ -227,7 +227,7 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
                                         <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Project Settings</a></li></t>
@@ -344,7 +344,7 @@
 
         <!-- Task Read/Unread actions -->
         <record id="actions_server_project_task_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Task: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>
@@ -362,7 +362,7 @@
         </record>
 
         <record id="actions_server_project_task_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Task: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>
@@ -474,7 +474,7 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                         <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
@@ -488,7 +488,7 @@
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id" >
                     <field name="color"/>
-                    <field name="priority" groups="base.group_user"/>
+                    <field name="priority"/>
                     <field name="stage_id"/>
                     <field name="user_id"/>
                     <field name="user_email"/>
@@ -504,7 +504,7 @@
                     <templates>
                     <t t-name="kanban-box">
                         <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
-                            <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                            <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
                                 <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
                                     <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
@@ -531,12 +531,14 @@
                                     <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span>
                                 </div>
                                 <div class="oe_kanban_bottom_right">
-                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
-                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
-                                    <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
-                                    <a t-if="record.priority.raw_value == 2" type="object" string="Important" name="set_very_high_priority" class="oe_e oe_star_on">7</a>
-                                    <a t-if="record.priority.raw_value == 1 or record.priority.raw_value == 3 or record.priority.raw_value == 4" type="object" string="Normal" name="set_normal_priority" class="oe_e oe_star_off">7</a>
-                                    <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_high_priority" class="oe_e oe_star_very_high_priority">7</a>
+                                    <div groups="base.group_user">
+                                        <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
+                                        <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
+                                        <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
+                                        <a t-if="record.priority.raw_value == 2" type="object" string="Important" name="set_very_high_priority" class="oe_e oe_star_on">7</a>
+                                        <a t-if="record.priority.raw_value == 1 or record.priority.raw_value == 3 or record.priority.raw_value == 4" type="object" string="Normal" name="set_normal_priority" class="oe_e oe_star_off">7</a>
+                                        <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_high_priority" class="oe_e oe_star_very_high_priority">7</a>
+                                    </div>
                                     <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
                                 <div class="oe_kanban_footer_left">
@@ -546,11 +548,7 @@
                                     </span>
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
-                                    <div class="oe_left oe_tags">
-                                        <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                            <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
-                                        </t>
-                                    </div>
+                                    <field name="categ_ids"/>
                                 </div>
                             </div>
                             <div class="oe_clear"></div>
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index 38578a6226e..ce8be146e54 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -25,37 +25,12 @@ openerp.project = function(openerp) {
                 });
             });
         },
-        project_display_categ_names: function() {
-            /*
-             * Set proper names to project categories.
-             * In kanban views, many2many fields only return a list of ids.
-             * Therefore, we have to fetch the matching data by ourselves.
-             */
-            var self = this;
-            var categ_ids = [];
-
-            // Collect categories ids
-            self.$el.find('span[data-categ_id]').each(function() {
-                categ_ids.push($(this).data('categ_id'));
-            });
-
-            // Find their matching names
-            var dataset = new openerp.web.DataSetSearch(self, 'project.category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
-            dataset.read_slice(['id', 'name']).done(function(result) {
-                _.each(result, function(v, k) {
-                    // Set the proper value in the DOM and display the element
-                    self.$el.find('span[data-categ_id=' + v.id + ']').text(v.name);
-                });
-            });
-        },
         on_groups_started: function() {
             var self = this;
             self._super.apply(self, arguments);
 
             if (self.dataset.model === 'project.project') {
                 self.project_display_members_names();
-            } else if (self.dataset.model === 'project.task') {
-                self.project_display_categ_names();
             }
         },
         on_record_moved: function(record, old_group, old_index, new_group, new_index){
@@ -74,9 +49,5 @@ openerp.project = function(openerp) {
                 this._super.apply(this, arguments);
             }
         },
-        bind_events: function() {
-            this._super();
-            this.view.project_display_categ_names();
-        },
     });
 };
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index b2e9197cefd..2c5f311c044 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -61,7 +61,6 @@ It allows the manager to quickly check the issues, assign them and decide on the
     'installable': True,
     'auto_install': False,
     'application': True,
-    'js': ['static/src/js/project_issue.js'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 90640363906..55aa0fd557b 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -89,7 +89,7 @@ class project_issue(base_stage, osv.osv):
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
             search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
+        search_domain += [('id', 'in', ids)]
         # perform search
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
@@ -225,7 +225,7 @@ class project_issue(base_stage, osv.osv):
                              Define Responsible user and Email account for mail gateway.'),
         'partner_id': fields.many2one('res.partner', 'Contact', select=1),
         'company_id': fields.many2one('res.company', 'Company'),
-        'description': fields.text('Description'),
+        'description': fields.text('Private Note'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
                 selection=_ISSUE_STATE, string="Status", readonly=True,
                 help='The status is set to \'Draft\', when a case is created.\
@@ -244,7 +244,7 @@ class project_issue(base_stage, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
-                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), ('project_ids', '=', project_id)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -442,11 +442,9 @@ class project_issue(base_stage, osv.osv):
         # OR all section_ids and OR with case_default
         search_domain = []
         if section_ids:
-            search_domain += [('|')] * len(section_ids)
+            search_domain += [('|')] * (len(section_ids)-1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
-        search_domain.append(('case_default', '=', True))
-        # AND with the domain in parameter
         search_domain += list(domain)
         # perform search, return the first found
         stage_ids = self.pool.get('project.task.type').search(cr, uid, search_domain, order=order, context=context)
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index e3105127c5d..60cc6448a46 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -6,7 +6,7 @@
 
         <!-- Project issue Read/Unread actions -->
         <record id="actions_server_project_issue_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Issue: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
@@ -24,7 +24,7 @@
         </record>
 
         <record id="actions_server_project_issue_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Issue: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
@@ -107,30 +107,30 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
                     <group>
-                        <group>
+                        <group groups="base.group_user">
                             <field name="user_id"/>
                             <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                             <field name="email_from"/>
+                            <label for="project_id" groups="base.group_user"/>
+                            <div groups="base.group_user">
+                                <field name="project_id" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
+                                <button name="case_escalate" string="⇒ Escalate" type="object" states="draft,open,pending" class="oe_link"/>
+                            </div>
                         </group>
                         <group>
-                            <field name="priority"/>
-                            <label for="project_id"/>
-                            <div>
-                                <field name="project_id" required="True" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
-                                <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" class="oe_inline"/>
-                            </div>
-                            <label for="task_id"/>
-                            <div>
+                            <field name="categ_ids" widget="many2many_tags"/>
+                            <field name="version_id" groups="base.group_user"/>
+                            <field name="priority" groups="base.group_user"/>
+                            <label for="task_id" groups="base.group_user"/>
+                            <div groups="base.group_user">
                                 <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
                                 <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
                             </div>
-                            <field name="categ_ids" widget="many2many_tags"/>
-                            <field name="version_id"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
-                            <field name="description" placeholder="Add a description..."/>
+                            <field name="description" placeholder="Add an internal note..." groups="base.group_user"/>
                         </page>
                         <page string="Extra Info" groups="base.group_no_one">
                             <group col="4" colspan="4">
@@ -155,7 +155,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
@@ -249,7 +249,7 @@
                         </t>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
-                                <div class="oe_dropdown_toggle oe_dropdown_kanban">
+                                <div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
                                         <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
@@ -264,11 +264,9 @@
                                         <field name="version_id"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <div class="oe_left oe_tags">
-                                            <field name="categ_ids"/>
-                                        </div>
+                                        <field name="categ_ids"/>
                                         <div class="oe_right">
-                                            <span class="oe_kanban_highlight">
+                                            <span class="oe_kanban_highlight" groups="base.group_user">
                                                 <t t-set="priority" t-value="record.priority.raw_value || 5"/>
                                                 <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority">
                                                    <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
diff --git a/addons/project_issue/static/src/js/project_issue.js b/addons/project_issue/static/src/js/project_issue.js
deleted file mode 100644
index 24e5ff7cc49..00000000000
--- a/addons/project_issue/static/src/js/project_issue.js
+++ /dev/null
@@ -1,13 +0,0 @@
-openerp.portal_project_issue = function(openerp) {
-    openerp.web_kanban.KanbanView.include({
-        on_groups_started: function() {
-            var self = this;
-            self._super.apply(this, arguments);
-
-            if (self.dataset.model === 'project.issue') {
-                // Load project's categories names from m2m field
-                self.project_display_categ_names();
-            }
-        }
-    });
-};
diff --git a/addons/project_issue_sheet/i18n/zh_CN.po b/addons/project_issue_sheet/i18n/zh_CN.po
index 11147a226dc..8d721dc7ee5 100644
--- a/addons/project_issue_sheet/i18n/zh_CN.po
+++ b/addons/project_issue_sheet/i18n/zh_CN.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-02-14 10:03+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 13:52+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:25+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
 #, python-format
 msgid "The Analytic Account is pending !"
-msgstr ""
+msgstr "这个辅助核算项 被挂起的"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
@@ -41,12 +41,12 @@ msgstr "计工单明细"
 #. module: project_issue_sheet
 #: view:project.issue:0
 msgid "on_change_project(project_id)"
-msgstr ""
+msgstr "on_change_project(project_id)"
 
 #. module: project_issue_sheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
-msgstr ""
+msgstr "你不能修改在已经确认/完成的计工单的分录。"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
@@ -74,7 +74,7 @@ msgstr "计工单"
 #. module: project_issue_sheet
 #: constraint:account.analytic.line:0
 msgid "You cannot create analytic line on view account."
-msgstr ""
+msgstr "你不能视图科目上面创建辅助核算行。"
 
 #. module: project_issue_sheet
 #: field:hr.analytic.timesheet,issue_id:0
diff --git a/addons/project_mrp/i18n/fr.po b/addons/project_mrp/i18n/fr.po
index 87fc650d0dc..7167a1ccffe 100644
--- a/addons/project_mrp/i18n/fr.po
+++ b/addons/project_mrp/i18n/fr.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-13 19:59+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
+"PO-Revision-Date: 2012-11-29 15:22+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
@@ -25,12 +24,12 @@ msgstr "La référence de commande doit être unique par société !"
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
 msgid "For each product, on type service and on order"
-msgstr "Pour chaque produit, de type service et sur commande"
+msgstr "Pour chaque article, de type service et sur commande"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
 msgid "Product type is service, then its creates the task."
-msgstr "Si le type de produit est 'service', alors cela crée une tâche."
+msgstr "Si le type d'article est\"service\", alors cela crée une tâche."
 
 #. module: project_mrp
 #: constraint:project.task:0
@@ -58,12 +57,12 @@ msgstr "Ligne de commande client"
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
-msgstr "Si le produit est de type 'service' alors il crée la tâche."
+msgstr "Si l'article est de type 'service' alors cela crée la tâche."
 
 #. module: project_mrp
 #: constraint:project.task:0
diff --git a/addons/project_mrp/i18n/ru.po b/addons/project_mrp/i18n/ru.po
index 4d06a002c44..ef8d78b2473 100644
--- a/addons/project_mrp/i18n/ru.po
+++ b/addons/project_mrp/i18n/ru.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2010-08-03 09:35+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 09:49+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:08+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -35,12 +35,13 @@ msgstr ""
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"Ошибка! Дата завершения задачи должна быть позднее чем дата начала задачи"
 
 #. module: project_mrp
 #: code:addons/project_mrp/project_procurement.py:93
 #, python-format
 msgid "Task created"
-msgstr ""
+msgstr "Задача создана"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
@@ -50,12 +51,12 @@ msgstr ""
 #. module: project_mrp
 #: field:project.task,sale_line_id:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Позиция заказа продажи"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Товар"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
@@ -65,7 +66,7 @@ msgstr ""
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные задачи."
 
 #. module: project_mrp
 #: sql_constraint:product.product:0
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index d344a9bd1df..1245cb699f6 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-27 15:29+0000\n"
+"PO-Revision-Date: 2012-11-28 07:56+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -100,6 +100,12 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"               单击添加 客户合同 联系人。\n"
+"              </p><p>\n"
+"                为了跟踪开票进程，你将在这里找到跟客户项目相关的合同.\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index b8f5675891c..0f6c8f3340b 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -98,7 +98,8 @@
             sequence="5" groups="base.group_hr_attendance" />
 
         <menuitem id="menu_project_billing" name="Invoicing"
-                  parent="base.menu_main_pm" sequence="5"/>
+                  parent="base.menu_main_pm" sequence="5"
+                  groups="project.group_project_manager"/>
         <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
             parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
 
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 56c46da341e..84e9c357b46 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2011-11-07 12:56+0000\n"
+"PO-Revision-Date: 2012-11-29 13:12+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 05:43+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
 msgid "Analytic Accounting for Purchases"
-msgstr ""
+msgstr "Аналитический учет закупок"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: purchase
 #: view:board.board:0
@@ -131,7 +131,7 @@ msgstr "Прайс-лист закупок по умолчанию"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tel :"
-msgstr ""
+msgstr "Тел :"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -156,7 +156,7 @@ msgstr "Заказ дня"
 #. module: purchase
 #: help:purchase.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если установлено, новые сообщения требуют вашего внимания"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
@@ -181,6 +181,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:956
@@ -189,7 +191,7 @@ msgstr ""
 #: code:addons/purchase/wizard/purchase_order_group.py:47
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Внимание!"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:556
@@ -240,7 +242,7 @@ msgstr "Средняя цена"
 #: code:addons/purchase/purchase.py:813
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "Счет <b>оплачен</b>."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -274,12 +276,12 @@ msgstr "Адрес доставки:"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Confirm Order"
-msgstr ""
+msgstr "Подтвердить заказ"
 
 #. module: purchase
 #: field:purchase.config.settings,module_warning:0
 msgid "Alerts by products or supplier"
-msgstr ""
+msgstr "Оповещения по товарам или поставщикам"
 
 #. module: purchase
 #: field:purchase.order,name:0
@@ -291,7 +293,7 @@ msgstr "Ссылка на заказ"
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "Выставление счетов"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
@@ -303,6 +305,7 @@ msgstr "Утверждение"
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Позволяет выбирать и поддерживать различные единицы измерения товаров."
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -316,7 +319,7 @@ msgstr ""
 #: code:addons/purchase/purchase.py:252
 #, python-format
 msgid "In order to delete a purchase order, you must cancel it first."
-msgstr ""
+msgstr "Для того, чтобы удалить заказ, сначала вы должны отменить его."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
@@ -341,7 +344,7 @@ msgstr "Итого без налога"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "Unit of Measure Categories"
-msgstr ""
+msgstr "Категории единиц измерения"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -352,14 +355,14 @@ msgstr "Категория"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "Предложение "
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:793
 #, python-format
 msgid ""
 "Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
+msgstr "Предложение <em>%s</em> <b>преобразовано</b> в заказ закупки %s %s."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -379,7 +382,7 @@ msgstr ""
 #: field:purchase.order.line,state:0
 #: view:purchase.report:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -389,7 +392,7 @@ msgstr "Август"
 #. module: purchase
 #: view:product.product:0
 msgid "to"
-msgstr ""
+msgstr "для"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -405,7 +408,7 @@ msgstr "Заказы закупки"
 #: help:account.config.settings,group_analytic_account_for_purchases:0
 #: help:purchase.config.settings,group_analytic_account_for_purchases:0
 msgid "Allows you to specify an analytic account on purchase orders."
-msgstr ""
+msgstr "Позволяет указать аналитические счета по заказам закупок ."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -426,7 +429,7 @@ msgstr ""
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Вы должны присвоить порядковый номер для этого товара."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -437,12 +440,12 @@ msgstr "Октябрь"
 #: code:addons/purchase/purchase.py:820
 #, python-format
 msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
+msgstr "Заказ закупки для <em>%s</em> <b>отменен</b>."
 
 #. module: purchase
 #: field:purchase.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итого"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -466,7 +469,7 @@ msgstr "Предложения"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices?"
-msgstr ""
+msgstr "Вы хотите создавать счета от поставщиков?"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
@@ -479,7 +482,7 @@ msgstr "Количество"
 #: code:addons/purchase/purchase.py:802
 #, python-format
 msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
+msgstr "Отгрузка <em>%s</em> <b>запланирована</b> на %s."
 
 #. module: purchase
 #: field:purchase.order,fiscal_position:0
@@ -489,7 +492,7 @@ msgstr "Налоговая позиция"
 #. module: purchase
 #: field:purchase.config.settings,default_invoice_method:0
 msgid "Default invoicing control method"
-msgstr ""
+msgstr "Метод контроля счетов по умолчанию"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking_in
@@ -537,12 +540,14 @@ msgid ""
 "Put an address if you want to deliver directly from the supplier to the "
 "customer. Otherwise, keep empty to deliver to your own company."
 msgstr ""
+"Поместите адрес, если Вы хотите прямую доставку от поставщика к заказчику. "
+"Иначе, оставьте пустым для доставки в вашу компанию."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:807
 #, python-format
 msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
+msgstr "Черновик счета %s %s <b>ожидает утверждения</b>."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -575,6 +580,8 @@ msgid ""
 "Error: The default Unit of Measure and the purchase Unit of Measure must be "
 "in the same category."
 msgstr ""
+"Ошибка: единицы измерения по умолчанию и единицы измерения закупки должны "
+"быть одной категории."
 
 #. module: purchase
 #: view:board.board:0
@@ -601,19 +608,19 @@ msgstr "Название компании должно быть уникальн
 #: view:product.product:0
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "Можно закупать"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 msgid "Incoming  Products"
-msgstr ""
+msgstr "Входящие товары"
 
 #. module: purchase
 #: view:purchase.config.settings:0
 #: view:purchase.order.group:0
 #: view:purchase.order.line_invoice:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: purchase
 #: field:res.company,po_lead:0
@@ -623,7 +630,7 @@ msgstr "Запас по времени на закупку"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Ошибка: Неверный штрих-код"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
@@ -639,7 +646,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Применить"
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -658,12 +665,12 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Customer Address"
-msgstr ""
+msgstr "Адрес заказчика"
 
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "RFQ Sent"
-msgstr ""
+msgstr "Запрос отправлен"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -683,7 +690,7 @@ msgstr "Поставщик"
 #: code:addons/purchase/purchase.py:491
 #, python-format
 msgid "Define expense account for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Определить счет расходов для этой компании: \"%s\" (id:%d)."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
@@ -716,12 +723,12 @@ msgstr "Заказ закупки, который в состоянии \"Чер
 #. module: purchase
 #: view:product.product:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Поставщики"
 
 #. module: purchase
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "Для закупки"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -743,7 +750,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.line:0
 msgid "Invoices and Receptions"
-msgstr ""
+msgstr "Счета и поступления"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -755,12 +762,12 @@ msgstr "Кол-во позиций"
 #: code:addons/purchase/wizard/purchase_line_invoice.py:110
 #, python-format
 msgid "Define expense account for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Определить счет расходов для этого товара: \"%s\" (id:%d)."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "(update)"
-msgstr ""
+msgstr "(обновить)"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -777,7 +784,7 @@ msgstr "Показывает, что комплектование выполне
 #: code:addons/purchase/purchase.py:555
 #, python-format
 msgid "Unable to cancel this purchase order."
-msgstr ""
+msgstr "Не удалось отменить это заказ."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_invoice
@@ -810,6 +817,8 @@ msgid ""
 "Unique number of the purchase order, computed automatically when the "
 "purchase order is created."
 msgstr ""
+"Уникальный номер заказа закупки, вычисляется автоматически при создании "
+"заказа."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
@@ -837,7 +846,7 @@ msgstr "Прайс-лист"
 #. module: purchase
 #: selection:purchase.order,state:0
 msgid "Draft PO"
-msgstr ""
+msgstr "Черновик ЗЗ"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -857,7 +866,7 @@ msgstr "Дата заказа"
 #. module: purchase
 #: field:purchase.config.settings,group_uom:0
 msgid "Manage different units of measure for products"
-msgstr ""
+msgstr "Управление различными единицами измерения товаров"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_invoiceafterpacking0
@@ -889,7 +898,7 @@ msgstr "Запрос цен:"
 #: model:ir.actions.act_window,name:purchase.action_picking_tree4_picking_to_invoice
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 msgid "On Incoming Shipments"
-msgstr ""
+msgstr "По поступающим товарам"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -905,7 +914,7 @@ msgstr "Движение ТМЦ"
 #: code:addons/purchase/purchase.py:1141
 #, python-format
 msgid "Draft Purchase Order created"
-msgstr ""
+msgstr "Черновик заказа закупки создан"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
@@ -915,7 +924,7 @@ msgstr "Категории ТМЦ"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Send Request for Quotation"
-msgstr ""
+msgstr "Отправить запрос цен"
 
 #. module: purchase
 #: help:purchase.order,invoiced:0
@@ -925,12 +934,12 @@ msgstr "Показывает, что счет был оплачен"
 #. module: purchase
 #: field:purchase.order,notes:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Условия"
 
 #. module: purchase
 #: field:purchase.order,currency_id:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвестный"
 
 #. module: purchase
 #: help:purchase.order,date_order:0
@@ -940,7 +949,7 @@ msgstr "Дата на которую этот документ был созда
 #. module: purchase
 #: field:purchase.order,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
@@ -977,17 +986,17 @@ msgstr "Компании"
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders?"
-msgstr ""
+msgstr "Вы уверены, что хотите объединить эти заказы?"
 
 #. module: purchase
 #: field:account.config.settings,module_purchase_analytic_plans:0
 msgid "Use multiple analytic accounts on orders"
-msgstr ""
+msgstr "Использование нескольких аналитических счетов по заказам"
 
 #. module: purchase
 #: view:product.product:0
 msgid "will be created in order to subcontract the job"
-msgstr ""
+msgstr "будет создан для того, чтобы отдать на субподряд"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -1007,7 +1016,7 @@ msgstr "Дней на утверждение"
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Supplier Features"
-msgstr ""
+msgstr "Особенности поставщика"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1018,7 +1027,7 @@ msgstr "Кол-во"
 #. module: purchase
 #: model:res.groups,name:purchase.group_delivery_invoice_address
 msgid "Addresses in Purchase Orders"
-msgstr ""
+msgstr "Адреса в заказах закупки"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1034,7 +1043,7 @@ msgstr "Отмена"
 #: field:purchase.order,message_comment_ids:0
 #: help:purchase.order,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Комментарии и эл. письма"
 
 #. module: purchase
 #: sql_constraint:purchase.order:0
@@ -1073,17 +1082,17 @@ msgstr "Дата утверждения"
 #: code:addons/purchase/purchase.py:789
 #, python-format
 msgid "Request for quotation <b>created</b>."
-msgstr ""
+msgstr "Запрос цен <b>создан</b>."
 
 #. module: purchase
 #: view:product.product:0
 msgid "a draft purchase order"
-msgstr ""
+msgstr "черновик заказа закупки"
 
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Вы пытаетесь присвоить партию другого  товара."
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1093,13 +1102,13 @@ msgstr "Заказ года"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order
 msgid "RFQs and Purchases"
-msgstr ""
+msgstr "Запросы и закупки"
 
 #. module: purchase
 #: field:account.config.settings,group_analytic_account_for_purchases:0
 #: field:purchase.config.settings,group_analytic_account_for_purchases:0
 msgid "Analytic accounting for purchases"
-msgstr ""
+msgstr "Аналитический учет закупок"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1122,24 +1131,24 @@ msgstr ""
 #. module: purchase
 #: model:ir.model,name:purchase.model_mail_mail
 msgid "Outgoing Mails"
-msgstr ""
+msgstr "Исходящие письма"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:420
 #, python-format
 msgid "You cannot confirm a purchase order without any purchase order line."
-msgstr ""
+msgstr "Вы не можете подтвердить заказ закупки без позиций заказа."
 
 #. module: purchase
 #: help:purchase.order,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
 #: field:stock.picking.in,warehouse_id:0
 msgid "Destination Warehouse"
-msgstr ""
+msgstr "Склад назначения"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:956
@@ -1148,6 +1157,8 @@ msgid ""
 "Selected Unit of Measure does not belong to the same category as the product "
 "Unit of Measure."
 msgstr ""
+"Выбранные единицы измерения не принадлежат к той же категории, что и единицы "
+"измерения товара."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
@@ -1158,13 +1169,13 @@ msgstr "Единицы измерения"
 #. module: purchase
 #: field:purchase.config.settings,group_purchase_pricelist:0
 msgid "Manage pricelist per supplier"
-msgstr ""
+msgstr "Управление прайс-листом по поставщику"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:816
 #, python-format
 msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
+msgstr "Заказ закупки установлен в <b>черновик</b>."
 
 #. module: purchase
 #: view:board.board:0
@@ -1175,12 +1186,12 @@ msgstr "Панель закупок"
 #: code:addons/purchase/purchase.py:549
 #, python-format
 msgid "First cancel all receptions related to this purchase order."
-msgstr ""
+msgstr "Сначала отмените все приходы, связанные с этим заказом закупки."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approve Order"
-msgstr ""
+msgstr "Утвердить заказ"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -1208,7 +1219,7 @@ msgstr "Статистика заказов закупки"
 #: view:purchase.order:0
 #: field:purchase.order,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные сообщения"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
@@ -1223,7 +1234,7 @@ msgstr "Установить в 'Черновик'"
 #. module: purchase
 #: field:purchase.config.settings,group_purchase_delivery_address:0
 msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
+msgstr "Разрешить разные адреса для поступающих товаров и счетов"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1233,7 +1244,7 @@ msgstr "Примечания"
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_requisition:0
 msgid "Manage purchase requisitions"
-msgstr ""
+msgstr "Управление запросами закупки (тендерами)"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1258,7 +1269,7 @@ msgstr "Перемещение ТМЦ"
 #: code:addons/purchase/purchase.py:252
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Неверное действие!"
 
 #. module: purchase
 #: field:purchase.order,validator:0
@@ -1270,7 +1281,7 @@ msgstr "Утверждено"
 #: view:purchase.report:0
 #: field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Стоимость товара"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1286,7 +1297,7 @@ msgstr "Запрос цен"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Source"
-msgstr ""
+msgstr "Источник"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_picking
@@ -1307,12 +1318,12 @@ msgstr "Счета созданные для заказа закупки"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Pre-generate draft invoices based on purchase orders"
-msgstr ""
+msgstr "Предварительно генерировать счета, основанные на заказах закупки"
 
 #. module: purchase
 #: help:product.template,purchase_ok:0
 msgid "Specify if the product can be selected in a purchase order line."
-msgstr ""
+msgstr "Укажите, если товар может быть выбран в строке заказа закупки."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_invoicefrompackinglist0
@@ -1355,12 +1366,14 @@ msgid ""
 "a draft\n"
 "                        purchase order"
 msgstr ""
+"черновик\n"
+"                        заказа закупки"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:307
 #, python-format
 msgid "Please create Invoices."
-msgstr ""
+msgstr "Пожалуйста, создайте счета"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
@@ -1381,7 +1394,7 @@ msgstr "Март"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Receive Invoice"
-msgstr ""
+msgstr "Получить счет"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1408,7 +1421,7 @@ msgstr "Будет проверено бухгалтером."
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_settings
 msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_approvepurchaseorder0
@@ -1419,7 +1432,7 @@ msgstr "Состояние заказа на закупку"
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Ед. изм. продукции"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_pricelist_version_action
@@ -1461,12 +1474,12 @@ msgstr "Исходящие ТМЦ в счет"
 #: code:addons/purchase/purchase.py:481
 #, python-format
 msgid "Define purchase journal for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Определить журнал покупок для этой компании: \"%s\" (id:%d)."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase Order "
-msgstr ""
+msgstr "Заказ закупки "
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1477,12 +1490,12 @@ msgstr "Счета вручную"
 #: model:ir.actions.act_window,name:purchase.action_purchase_configuration
 #: view:purchase.config.settings:0
 msgid "Configure Purchases"
-msgstr ""
+msgstr "Настройка закупок"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed"
-msgstr ""
+msgstr "Без налога"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1493,7 +1506,7 @@ msgstr "Комплектовочный лист создан"
 #: model:ir.actions.act_window,name:purchase.purchase_line_form_action2
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 msgid "On Purchase Order Lines"
-msgstr ""
+msgstr "По позициям заказа закупки"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1506,16 +1519,17 @@ msgid ""
 "This is the list of incoming shipments that have been generated for this "
 "purchase order."
 msgstr ""
+"Это список поступающих партий, которые были созданы для этого заказа."
 
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_double_validation:0
 msgid "Force two levels of approvals"
-msgstr ""
+msgstr "Два уровня подтверждения"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase_type
 msgid "Price Types"
-msgstr ""
+msgstr "Типы цен"
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
@@ -1545,7 +1559,7 @@ msgstr "Счет"
 #. module: purchase
 #: view:product.product:0
 msgid "When you sell this product, OpenERP will trigger"
-msgstr ""
+msgstr "При продаже этого товара, OpenERP вызовет"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
@@ -1599,7 +1613,7 @@ msgstr "Объединить заказы"
 #. module: purchase
 #: field:purchase.config.settings,module_purchase_analytic_plans:0
 msgid "Use multiple analytic accounts on purchase orders"
-msgstr ""
+msgstr "Нескольких аналитических счетов в заказах закупки"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management
@@ -1622,7 +1636,7 @@ msgstr "Изменено вручную"
 #. module: purchase
 #: field:purchase.config.settings,group_costing_method:0
 msgid "Compute product cost price based on average cost"
-msgstr ""
+msgstr "Вычислить себестоимость на основе средней стоимости"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:337
@@ -1674,12 +1688,12 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoice Received"
-msgstr ""
+msgstr "Счет получен"
 
 #. module: purchase
 #: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
 msgid "Mark unread"
-msgstr ""
+msgstr "Непрочитано"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -1735,12 +1749,12 @@ msgstr "Место назначения"
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Customer Address (Direct Delivery)"
-msgstr ""
+msgstr "Адрес заказчика (прямая доставка)"
 
 #. module: purchase
 #: model:ir.actions.client,name:purchase.action_client_purchase_menu
 msgid "Open Purchase Menu"
-msgstr ""
+msgstr "Открыть меню закупок"
 
 #. module: purchase
 #: field:purchase.order,company_id:0
@@ -1794,7 +1808,7 @@ msgstr "Анализ поступлений"
 #. module: purchase
 #: field:purchase.order,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -1819,7 +1833,7 @@ msgstr "Заказ закупки"
 #: code:addons/purchase/wizard/purchase_line_invoice.py:109
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1857,13 +1871,13 @@ msgstr "Отменено"
 #. module: purchase
 #: field:res.partner,purchase_order_count:0
 msgid "# of Purchase Order"
-msgstr ""
+msgstr "№ заказа закупки"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:810
 #, python-format
 msgid "Shipment <b>received</b>."
-msgstr ""
+msgstr "Партия <b>получена</b>."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1873,14 +1887,14 @@ msgstr "Тел.:"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Resend Purchase Order"
-msgstr ""
+msgstr "Послать заказ закупки"
 
 #. module: purchase
 #: help:purchase.config.settings,group_purchase_delivery_address:0
 msgid ""
 "Allows you to specify different delivery and invoice addresses on a purchase "
 "order."
-msgstr ""
+msgstr "Позволяет задавать различные адреса в доставке и в счете по заказу."
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1929,7 +1943,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: purchase
 #: help:purchase.config.settings,module_purchase_requisition:0
@@ -1950,7 +1964,7 @@ msgstr "Позиции счета"
 #. module: purchase
 #: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
 msgid "Mark read"
-msgstr ""
+msgstr "Прочитано"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -1966,7 +1980,7 @@ msgstr ""
 #. module: purchase
 #: model:email.template,report_name:purchase.email_template_edi_purchase
 msgid "RFQ_${(object.name or '').replace('/','_')}"
-msgstr ""
+msgstr "RFQ_${(object.name or '').replace('/','_')}"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:971
@@ -2007,7 +2021,7 @@ msgstr "Прайс-лист ЕОД(EDI) (%s)"
 #: view:purchase.report:0
 #: field:purchase.report,product_uom:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Базовая единица измерения"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -2049,7 +2063,7 @@ msgstr "Список заказанных ТМЦ"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Incoming Shipments & Invoices"
-msgstr ""
+msgstr "Поступающие товары и счета"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -2101,7 +2115,7 @@ msgstr "Ноябрь"
 #. module: purchase
 #: help:purchase.config.settings,group_costing_method:0
 msgid "Allows you to compute product cost price based on average cost."
-msgstr ""
+msgstr "Позволяет рассчитать себестоимость на основе средней стоимости."
 
 #. module: purchase
 #: report:purchase.order:0
@@ -2116,7 +2130,7 @@ msgstr "Январь"
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить товары из или в расположение типа вид."
 
 #. module: purchase
 #: help:purchase.order,invoice_method:0
@@ -2134,6 +2148,8 @@ msgid ""
 "Reference of the document that generated this purchase order request; a sale "
 "order or an internal procurement request."
 msgstr ""
+"Ссылка на документ, который генерирует этот заказ закупки; заказ продажи или "
+"внутренний запрос снабжения."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
@@ -2153,7 +2169,7 @@ msgstr "Запрос цен №"
 #. module: purchase
 #: view:purchase.config.settings:0
 msgid "Invoicing Settings"
-msgstr ""
+msgstr "Настройка счетов"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
@@ -2163,7 +2179,7 @@ msgstr "Всего заказов пользователя за месяц"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on incoming shipments"
-msgstr ""
+msgstr "На основании поступающих грузов"
 
 #. module: purchase
 #: help:purchase.order,partner_ref:0
@@ -2204,7 +2220,7 @@ msgstr "Февраль"
 #: model:ir.actions.act_window,name:purchase.action_invoice_pending
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "On Draft Invoices"
-msgstr ""
+msgstr "По черновикам счетов"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
@@ -2230,7 +2246,7 @@ msgstr "Итоговая сумма"
 #. module: purchase
 #: model:ir.model,name:purchase.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Шаблон товара"
 
 #. module: purchase
 #: view:purchase.order.group:0
@@ -2261,7 +2277,7 @@ msgstr ""
 #. module: purchase
 #: view:product.product:0
 msgid "When you sell this service to a customer,"
-msgstr ""
+msgstr "Когда вы продаете эту услугу заказчику,"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_pricelist_version_action
@@ -2288,7 +2304,7 @@ msgstr "Год"
 #. module: purchase
 #: selection:purchase.config.settings,default_invoice_method:0
 msgid "Based on purchase order lines"
-msgstr ""
+msgstr "На основе позиций заказа"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.act_res_partner_2_purchase_order
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index e21310eb3fb..c9fef0cad75 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-27 12:03+0000\n"
+"PO-Revision-Date: 2012-11-28 11:54+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-11-28 04:40+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:13+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: purchase
 #: model:res.groups,name:purchase.group_analytic_accounting
@@ -129,19 +129,18 @@ msgstr ""
 "serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
 "255, 255); \">\n"
 "\n"
-"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
-"or ''},</p>\n"
+"    <p>您好 ${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
+"''},</p>\n"
 "    \n"
-"    <p>Here is a ${object.state in ('draft', 'sent') and 'request for "
-"quotation' or 'purchase order confirmation'} from ${object.company_id.name}: "
-"</p>\n"
+"    <p>这是一个 ${object.state in ('draft', 'sent') and '询价单' or '采购单确认函'} 来自  "
+"${object.company_id.name}: </p>\n"
 "    \n"
 "    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"       &nbsp;&nbsp;<strong>编号</strong><br />\n"
+"       &nbsp;&nbsp;&nbsp;订单号: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;订单总计: <strong>${object.amount_total} "
 "${object.pricelist_id.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       &nbsp;&nbsp;订单日期: ${object.date_order}<br />\n"
 "       % if object.origin:\n"
 "       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
 "       % endif\n"
@@ -155,8 +154,8 @@ msgstr ""
 "    </p>\n"
 "\n"
 "    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you!</p>\n"
+"    <p>如果有任何问题，请与我们联系.</p>\n"
+"    <p>谢谢!</p>\n"
 "    <br/>\n"
 "    <br/>\n"
 "    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
@@ -1948,8 +1947,11 @@ msgid ""
 "paid and received, the status becomes 'Done'. If a cancel action occurs in "
 "the invoice or in the reception of goods, the status becomes in exception."
 msgstr ""
-"采购订单或者询价单的状态。一个询价单是采购订单的“草稿”状态。然后这个采购单被用户确认后，状态切换为“已经确认”。\r\n"
-"供应商确认这个订单后，改变状态到“批准”。当采购订单被支付和收货以后，状态变成“完成”。\r\n"
+"采购订单或者询价单的状态。\r\n"
+"一个询价单是采购订单的“草稿”状态。\r\n"
+"然后这个采购单被用户确认后，状态切换为“已经确认”。\r\n"
+"供应商确认这个订单后，改变状态到“批准”。\r\n"
+"当采购订单被支付和收货以后，状态变成“完成”。\r\n"
 "如果在开票或者收货过程中出现了 “取消”操作，状态变成了“异常”。"
 
 #. module: purchase
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9397a95c970..f0be9e56dec 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -134,7 +134,7 @@
 
         <!-- Purchase order Read/Unread actions -->
         <record id="actions_server_purchase_order_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Purchase: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>
@@ -152,7 +152,7 @@
         </record>
 
         <record id="actions_server_purchase_order_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Purchase: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 495c8790e7b..c1500c48710 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -149,11 +149,6 @@
             <para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para>
           </td>
         </tr>
-        <tr>
-          <td>
-            <para style="terp_default_8_italic">[[ format(order_line.notes or removeParentNode('tr')) ]]</para>
-          </td>
-        </tr>
       </blockTable>
     </section>
     <para style="terp_default_9">
diff --git a/addons/purchase_double_validation/i18n/ru.po b/addons/purchase_double_validation/i18n/ru.po
index 2e16dca7d4e..e5a91f0e029 100644
--- a/addons/purchase_double_validation/i18n/ru.po
+++ b/addons/purchase_double_validation/i18n/ru.po
@@ -8,45 +8,45 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-03-20 07:56+0000\n"
+"PO-Revision-Date: 2012-11-28 12:29+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:31+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: purchase_double_validation
 #: model:ir.model,name:purchase_double_validation.model_purchase_config_settings
 msgid "purchase.config.settings"
-msgstr ""
+msgstr "purchase.config.settings"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Заказы закупки, которые еще ​​не утверждены."
 
 #. module: purchase_double_validation
 #: field:purchase.config.settings,limit_amount:0
 msgid "limit to require a second approval"
-msgstr ""
+msgstr "лимит требующий второго утверждения"
 
 #. module: purchase_double_validation
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Orders Waiting Approval"
-msgstr ""
+msgstr "Заказы закупок ожидающие утверждения"
 
 #. module: purchase_double_validation
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr ""
+msgstr "На утверждение"
 
 #. module: purchase_double_validation
 #: help:purchase.config.settings,limit_amount:0
 msgid "Amount after which validation of purchase is required."
-msgstr ""
+msgstr "Сумма после которой требуется утверждение"
 
 #~ msgid "Maximum amount after which validation of purchase is required."
 #~ msgstr "Максимальная сумма, после которой требуется утверждение закупки."
diff --git a/addons/purchase_requisition/i18n/ru.po b/addons/purchase_requisition/i18n/ru.po
index 32e76f08f76..8436d0cd322 100644
--- a/addons/purchase_requisition/i18n/ru.po
+++ b/addons/purchase_requisition/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-13 13:59+0000\n"
+"PO-Revision-Date: 2012-11-28 13:43+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -50,7 +50,7 @@ msgstr ""
 #. module: purchase_requisition
 #: field:purchase.requisition,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные сообщения"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,company_id:0
@@ -61,7 +61,7 @@ msgstr "Компания"
 #. module: purchase_requisition
 #: help:purchase.requisition,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если установлено, новые сообщения требуют вашего внимания"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/purchase_requisition.py:153
@@ -81,7 +81,7 @@ msgstr "Количество"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_order
@@ -126,6 +126,8 @@ msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
 msgstr ""
+"Вы ввели недопустимую ссылку на баркод EAN13. Вы можете использовать поле "
+"\"Внутренняя ссылка\"."
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -141,7 +143,7 @@ msgstr "Установить в \"Черновик\""
 #: code:addons/purchase_requisition/purchase_requisition.py:153
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Внимание!"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -160,17 +162,27 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Нажмите для создания запроса на закупку.\n"
+"          </p><p>\n"
+"            Запрос на закупку это шаг перед запросом цен.\n"
+"            В запросе на закупку (или тендере) вы вводите необходимые\n"
+"            товары и запускаете создание запросов цен у поставщиков.\n"
+"            После переговоров и рассмотрения всех предложений\n"
+"            вы можете утвердить одни и отменить другие.\n"
+"          </p>\n"
+"        "
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: view:purchase.requisition:0
 msgid "Source"
-msgstr ""
+msgstr "Источник"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
@@ -205,7 +217,7 @@ msgstr "Запрос на закупку"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Sent to Suppliers"
-msgstr ""
+msgstr "Отправлено поставщикам"
 
 #. module: purchase_requisition
 #: help:purchase.requisition,message_summary:0
@@ -213,6 +225,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -222,7 +236,7 @@ msgstr "Утверждено поставщиком"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Send to Suppliers"
-msgstr ""
+msgstr "Послать поставщикам"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -248,7 +262,7 @@ msgstr "Запрос"
 #: code:addons/purchase_requisition/purchase_requisition.py:186
 #, python-format
 msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
+msgstr "Запрос на закупку был <b>создан</b>."
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
@@ -278,28 +292,28 @@ msgstr "Дата начала"
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
-msgstr ""
+msgstr "или"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Ед. изм. продукции"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "Условия"
 
 #. module: purchase_requisition
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Ошибка! Конечная дата не может быть установлена ​​ранее даты начала."
 
 #. module: purchase_requisition
 #: view:purchase.order:0
@@ -319,13 +333,13 @@ msgstr "Пользователь"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_comment_ids:0
 #: help:purchase.requisition,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Комментарии и эл. письма"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -336,7 +350,7 @@ msgstr "Искать запрос на закупку"
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
 #, python-format
 msgid "No Product in Tender."
-msgstr ""
+msgstr "Нет товаров в тендере."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -346,7 +360,7 @@ msgstr "Отменить заказ на закупку"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итого"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -367,7 +381,7 @@ msgstr "Запрос цен"
 #: code:addons/purchase_requisition/purchase_requisition.py:103
 #, python-format
 msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr ""
+msgstr "Запрос на закупку был <b>отменен</b>."
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
@@ -383,7 +397,7 @@ msgstr "Кол-во"
 #: code:addons/purchase_requisition/purchase_requisition.py:94
 #, python-format
 msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr ""
+msgstr "Черновик запроса был <b>отправлен поставщику</b>."
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
@@ -407,6 +421,7 @@ msgid ""
 "Check this box to generates purchase requisition instead of generating "
 "requests for quotation from procurement."
 msgstr ""
+"Отметьте для создания запроса на закупку вместо запроса цен при снабжении."
 
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
@@ -421,7 +436,7 @@ msgstr "Ссылка на заказ должны быть уникальной
 #. module: purchase_requisition
 #: field:purchase.requisition,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Документ-источник"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -433,7 +448,7 @@ msgstr "Ответственный"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Purchase Done"
-msgstr ""
+msgstr "Закупка сделана"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -461,7 +476,7 @@ msgstr "Описание"
 #: code:addons/purchase_requisition/purchase_requisition.py:97
 #, python-format
 msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
+msgstr "Запрос на закупку был установлен в <b>черновик</b>."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -509,7 +524,7 @@ msgstr "Дата запроса"
 #. module: purchase_requisition
 #: help:purchase.requisition,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -525,7 +540,7 @@ msgstr "Срок запроса"
 #: code:addons/purchase_requisition/purchase_requisition.py:100
 #, python-format
 msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
+msgstr "Запрос на закупку был <b>сделан</b>."
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
diff --git a/addons/purchase_requisition/i18n/zh_CN.po b/addons/purchase_requisition/i18n/zh_CN.po
index 7b827d29521..3d94b02eff2 100644
--- a/addons/purchase_requisition/i18n/zh_CN.po
+++ b/addons/purchase_requisition/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-10-25 17:29+0000\n"
+"PO-Revision-Date: 2012-11-28 08:28+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:30+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -48,7 +48,7 @@ msgstr ""
 #. module: purchase_requisition
 #: field:purchase.requisition,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "未读信息"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,company_id:0
@@ -59,7 +59,7 @@ msgstr "公司"
 #. module: purchase_requisition
 #: help:purchase.requisition,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "如果要求你关注新消息，勾选此项"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/purchase_requisition.py:153
@@ -67,7 +67,7 @@ msgstr ""
 msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
-msgstr ""
+msgstr "你对这个供应商已经有个一个 %s 采购单 ,  你必须取消采购订单再创建新的请购单."
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_qty:0
@@ -77,7 +77,7 @@ msgstr "数量"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_order
@@ -121,7 +121,7 @@ msgstr "单号"
 msgid ""
 "You provided an invalid \"EAN13 Barcode\" reference. You may use the "
 "\"Internal Reference\" field instead."
-msgstr ""
+msgstr "你提供了一个错误的  \"EAN13 条码\" 编号。你可能要用 “编号”字段替代。"
 
 #. module: purchase_requisition
 #: selection:purchase.requisition,exclusive:0
@@ -137,7 +137,7 @@ msgstr "重置为草稿"
 #: code:addons/purchase_requisition/purchase_requisition.py:153
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
@@ -156,17 +156,26 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            单击开始请购单流程。 \n"
+"          </p><p>\n"
+"           请购单是询价单的前面一步，在请购单（采购招标）\n"
+"           中，你能记录你要购买的产品，并产生给供应商的\n"
+"           询价单。谈判后，一旦你复审了所有供应商的 出\n"
+"           价，你能很准一部分，并取消其他的。\n"
+"          </p>\n"
+"        "
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
 #: view:purchase.requisition:0
 msgid "Source"
-msgstr ""
+msgstr "来源"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,warehouse_id:0
@@ -201,14 +210,14 @@ msgstr "采购申请"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Sent to Suppliers"
-msgstr ""
+msgstr "发给供应商"
 
 #. module: purchase_requisition
 #: help:purchase.requisition,message_summary:0
 msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
-msgstr ""
+msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -218,7 +227,7 @@ msgstr "供应商已核审批"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Send to Suppliers"
-msgstr ""
+msgstr "发给供应商"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -244,7 +253,7 @@ msgstr "采购申请"
 #: code:addons/purchase_requisition/purchase_requisition.py:186
 #, python-format
 msgid "Purchase Requisition has been <b>created</b>."
-msgstr ""
+msgstr "请购单 <b>被创建</b>."
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
@@ -274,33 +283,33 @@ msgstr "开始日期"
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.line,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "产品计量单位"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 #: field:purchase.requisition,state:0
 msgid "Status"
-msgstr ""
+msgstr "状态"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Terms and Conditions"
-msgstr ""
+msgstr "条款和条件"
 
 #. module: purchase_requisition
 #: sql_constraint:product.product:0
 msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "错误!结束日期不能早于开始日期。"
 
 #. module: purchase_requisition
 #: view:purchase.order:0
 msgid "Purchase Orders with requisition"
-msgstr ""
+msgstr "具有请购的采购单"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -315,13 +324,13 @@ msgstr "用户"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "是一个关注者"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,message_comment_ids:0
 #: help:purchase.requisition,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -332,7 +341,7 @@ msgstr "搜索采购申请"
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
 #, python-format
 msgid "No Product in Tender."
-msgstr ""
+msgstr "没有产品在投标"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -342,7 +351,7 @@ msgstr "取消采购订单"
 #. module: purchase_requisition
 #: field:purchase.requisition,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -363,7 +372,7 @@ msgstr "请求询价"
 #: code:addons/purchase_requisition/purchase_requisition.py:103
 #, python-format
 msgid "Purchase Requisition has been <b>cancelled</b>."
-msgstr ""
+msgstr "请购单被<b>取消</b>."
 
 #. module: purchase_requisition
 #: field:procurement.order,requisition_id:0
@@ -379,7 +388,7 @@ msgstr "数量"
 #: code:addons/purchase_requisition/purchase_requisition.py:94
 #, python-format
 msgid "Draft Requisition has been <b>sent to suppliers</b>."
-msgstr ""
+msgstr "请购单草稿被 <b>发给供应商</b>."
 
 #. module: purchase_requisition
 #: view:purchase.requisition.partner:0
@@ -402,7 +411,7 @@ msgstr "取消"
 msgid ""
 "Check this box to generates purchase requisition instead of generating "
 "requests for quotation from procurement."
-msgstr ""
+msgstr "选中此项，产生请购单，而不是生成采购询价单"
 
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
@@ -417,7 +426,7 @@ msgstr "采购订单号必须在一个公司范围内唯一"
 #. module: purchase_requisition
 #: field:purchase.requisition,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "源单据"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -429,12 +438,12 @@ msgstr "负责人"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "Purchase Done"
-msgstr ""
+msgstr "采购完成"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Purchase Requisition in negociation"
-msgstr ""
+msgstr "谈判中的采购申请"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
@@ -457,7 +466,7 @@ msgstr "描述"
 #: code:addons/purchase_requisition/purchase_requisition.py:97
 #, python-format
 msgid "Purchase Requisition has been set to <b>draft</b>."
-msgstr ""
+msgstr "请购单被设为 <b>草稿</b>."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -505,7 +514,7 @@ msgstr "请购日期"
 #. module: purchase_requisition
 #: help:purchase.requisition,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "消息和通信历史"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -521,7 +530,7 @@ msgstr "请购截止日期"
 #: code:addons/purchase_requisition/purchase_requisition.py:100
 #, python-format
 msgid "Purchase Requisition has been <b>done</b>."
-msgstr ""
+msgstr "请购单已经 <b>完成</b>."
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
diff --git a/addons/report_intrastat/i18n/fr.po b/addons/report_intrastat/i18n/fr.po
index aa2ef108cb2..4a9f5e33c8a 100644
--- a/addons/report_intrastat/i18n/fr.po
+++ b/addons/report_intrastat/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-13 20:17+0000\n"
-"Last-Translator: GEOS <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 15:42+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:02+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -263,7 +263,7 @@ msgstr "Poids"
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_product_template
 msgid "Product Template"
-msgstr "Modèle de produit"
+msgstr "Modèle d'article"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 4032f45353b..f50e5cc3276 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -7,14 +7,21 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-27 13:35+0000\n"
+"PO-Revision-Date: 2012-11-28 17:01+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-11-28 04:41+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:14+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr "保存复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
@@ -106,13 +113,6 @@ msgid "Analytic Account"
 msgstr "辅助核算项"
 
 #. module: sale
-#: help:sale.order,message_summary:0
-msgid ""
-"Holds the Chatter summary (number of messages, ...). This summary is "
-"directly in html format in order to be inserted in kanban views."
-msgstr "保留复杂的摘要(消息数量,……等)。为了插入到看板视图，这一摘要直接是是HTML格式。"
-
-#. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
@@ -260,7 +260,7 @@ msgstr "我的报价单"
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "允许根据客户或者产品配置警告"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -291,7 +291,7 @@ msgstr "报价单 "
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
 #, python-format
 msgid "Advance of %s %%"
-msgstr ""
+msgstr "%s%% 的预付款"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_orders_exception
@@ -301,7 +301,7 @@ msgstr "销售异常"
 #. module: sale
 #: help:sale.order.line,address_allotment_id:0
 msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "需要分配特定产品的业务伙伴"
 
 #. module: sale
 #: view:sale.order:0
@@ -535,7 +535,7 @@ msgstr "总金额。"
 #. module: sale
 #: field:sale.config.settings,module_sale_journal:0
 msgid "Allow batch invoicing of delivery orders through journals"
-msgstr ""
+msgstr "允许通过日记账的发货单批量开票。"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -560,7 +560,7 @@ msgstr "计量单位 "
 #. module: sale
 #: field:sale.config.settings,time_unit:0
 msgid "The default working time unit for services is"
-msgstr ""
+msgstr "默认的服务工作时间单位是"
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -601,7 +601,7 @@ msgstr "每个合同里，一个员工能有不同的角色"
 #. module: sale
 #: view:sale.order:0
 msgid "Print"
-msgstr ""
+msgstr "打印"
 
 #. module: sale
 #: report:sale.order:0
@@ -617,7 +617,7 @@ msgstr "订单明细"
 #. module: sale
 #: field:account.config.settings,module_sale_analytic_plans:0
 msgid "Use multiple analytic accounts on sales"
-msgstr ""
+msgstr "在销售订单使用多重辅助核算项"
 
 #. module: sale
 #: help:sale.config.settings,module_sale_journal:0
@@ -627,6 +627,8 @@ msgid ""
 "                and perform batch operations on journals.\n"
 "                This installs the module sale_journal."
 msgstr ""
+"允许你对你的销售和发运（分拣单）在不同的分类账之间进行分类, 并且在分类账上进行批量操作。\n"
+"为此要安装模块  sale_journal。"
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -674,6 +676,11 @@ msgid ""
 "             \n"
 "* The 'Cancelled' status is set when a user cancel the sales order related."
 msgstr ""
+"*一个销售定单是草稿的时候，设置为“草稿”状态\n"
+"*销售定被用户确认后，状态切换为“已经确认”。\n"
+"*销售订单发生异常时（发货被取消等），状态为“异常”。\n"
+"*当销售订单收货以后，状态变成“完成”。\n"
+"*当用户取消了销售订单，状态成为“取消”。"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:92
@@ -715,7 +722,7 @@ msgstr "已送货"
 msgid ""
 "To allow your salesman to make invoices for sale order lines using the menu "
 "'Lines to Invoice'."
-msgstr ""
+msgstr "通过菜单“按行开票”，允许销售员为销售订单行制作发票"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_partner
@@ -727,7 +734,7 @@ msgstr "业务伙伴"
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Create and View Invoice"
-msgstr ""
+msgstr "创建和查看发票"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_shop_form
@@ -742,6 +749,14 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击定义一个新的销售商店。\n"
+"              </p><p>\n"
+"                每个报价单或者销售订单必须关联到一个\n"
+"               商店。为每次特地销售，商店也定义了产\n"
+"               品将被从哪个仓库发货。\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: report:sale.order:0
@@ -774,7 +789,7 @@ msgstr "产品类别"
 #: code:addons/sale/sale.py:589
 #, python-format
 msgid "Cannot cancel this sales order!"
-msgstr ""
+msgstr "不能取消这个销售订单！"
 
 #. module: sale
 #: view:sale.order:0
@@ -786,7 +801,7 @@ msgstr "重新生成发票"
 #, python-format
 msgid ""
 "In order to delete a confirmed sale order, you must cancel it before !"
-msgstr ""
+msgstr "要删除已经确认的销售订单，你必须先取消它！"
 
 #. module: sale
 #: report:sale.order:0
@@ -849,7 +864,7 @@ msgstr "明细没有找到有效的价格表！"
 #. module: sale
 #: field:sale.config.settings,module_sale_margin:0
 msgid "Display margins on sales orders"
-msgstr ""
+msgstr "显示利润在销售订单"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -896,6 +911,8 @@ msgid ""
 "Cannot find a pricelist line matching this product and quantity.\n"
 "You have to change either the product, the quantity or the pricelist."
 msgstr ""
+"找不到匹配这个产品和数量的价格表。\n"
+"你必须修改 产品、数量，或者价格表"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
@@ -919,6 +936,8 @@ msgid ""
 "Manage Related Stock.\n"
 "                    This installs the module sale_stock."
 msgstr ""
+"允许使用不同的订单策略 制作报价单、销售订单 并管理相关的库存。\n"
+"                为此要安装模块sale_stock."
 
 #. module: sale
 #: model:email.template,subject:sale.email_template_edi_sale
@@ -926,6 +945,8 @@ msgid ""
 "${object.company_id.name} ${object.state in ('draft', 'sent') and "
 "'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
 msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and '报价单' or "
+"'订单'} (Ref ${object.name or 'n/a' })"
 
 #. module: sale
 #: report:sale.order:0
@@ -1061,7 +1082,7 @@ msgstr "未读信息"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Draft Quotation"
-msgstr ""
+msgstr "报价单草稿"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1377,7 +1398,7 @@ msgid ""
 "The sale order will automatically create the invoice proposition (draft "
 "invoice).                                              You have to choose  "
 "if you want your invoice based on ordered "
-msgstr ""
+msgstr "销售订单将自动建立发票（草稿）。如果你要发票基于订单，你必须选择。 "
 
 #. module: sale
 #: code:addons/sale/sale.py:431
@@ -1403,6 +1424,9 @@ msgid ""
 "between the Unit Price and Cost Price.\n"
 "                This installs the module sale_margin."
 msgstr ""
+"增加“利润”在销售订单。\n"
+"          通过单价和成本价计算利润率\n"
+"          为此要安装模块  sale_margin."
 
 #. module: sale
 #: report:sale.order:0
@@ -1456,7 +1480,7 @@ msgstr "产品"
 #. module: sale
 #: field:sale.config.settings,group_invoice_so_lines:0
 msgid "Generate invoices based on the sale order lines"
-msgstr ""
+msgstr "基于销售订单行生成发票"
 
 #. module: sale
 #: help:sale.order,order_policy:0
@@ -1468,6 +1492,9 @@ msgid ""
 "Before delivery: A draft invoice is created from the sales order and must be "
 "paid before the products can be delivered."
 msgstr ""
+"立即:当需要时，从销售订单创建发票草稿。\n"
+"发运时：当有产品被发运时，从发运单创建发票草稿。\n"
+"发运前：从销售订单创建发票草稿，并且必须在产品发运前付款。"
 
 #. module: sale
 #: view:account.invoice.report:0
@@ -1484,7 +1511,7 @@ msgstr "开票依据"
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Fixed price (deposit)"
-msgstr ""
+msgstr "固定价格（押金）"
 
 #. module: sale
 #: report:sale.order:0
@@ -1504,7 +1531,7 @@ msgstr "手动处理"
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_unread
 msgid "Mark unread"
-msgstr ""
+msgstr "标记为未读"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1514,7 +1541,7 @@ msgstr "订单"
 #. module: sale
 #: view:sale.order:0
 msgid "Confirm Sale"
-msgstr ""
+msgstr "确认订单"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1540,17 +1567,17 @@ msgstr ""
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Some order lines"
-msgstr ""
+msgstr "一些订单行"
 
 #. module: sale
 #: view:res.partner:0
 msgid "sale.group_delivery_invoice_address"
-msgstr ""
+msgstr "sale.group_delivery_invoice_address"
 
 #. module: sale
 #: model:res.groups,name:sale.group_discount_per_so_line
 msgid "Discount on lines"
-msgstr ""
+msgstr "订单行折扣"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
@@ -1569,7 +1596,7 @@ msgid ""
 "Select how you want to invoice this order. This\n"
 "                        will create a draft invoice that can be modified\n"
 "                        before validation."
-msgstr ""
+msgstr "选择怎样为订单开票。这将建立一个可在核准前进行修改的发票草稿。"
 
 #. module: sale
 #: view:board.board:0
@@ -1605,6 +1632,8 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and '草稿' "
+"or ''}"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
@@ -1651,27 +1680,27 @@ msgstr "客户没有定义 ！"
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Delivery Address"
-msgstr ""
+msgstr "送货地址"
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Sale to Invoice"
-msgstr ""
+msgstr "销售到发票"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Warehouse Features"
-msgstr ""
+msgstr "仓库特性"
 
 #. module: sale
 #: field:sale.order,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "消息"
 
 #. module: sale
 #: field:sale.config.settings,module_project:0
 msgid "Project"
-msgstr ""
+msgstr "项目"
 
 #. module: sale
 #: code:addons/sale/sale.py:350
@@ -1681,7 +1710,7 @@ msgstr ""
 #: code:addons/sale/sale.py:823
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "错误!"
 
 #. module: sale
 #: report:sale.order:0
@@ -1711,12 +1740,12 @@ msgstr "查找未开票明细"
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Quotation Sent"
-msgstr ""
+msgstr "报价单发送"
 
 #. module: sale
 #: model:ir.model,name:sale.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Email撰写向导"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
@@ -1735,7 +1764,7 @@ msgstr "确认日期"
 #: code:addons/sale/sale.py:351
 #, python-format
 msgid "Please define sales journal for this company: \"%s\" (id:%d)."
-msgstr ""
+msgstr "轻微公司 \"%s\" (id:%d) 定义销售分类账"
 
 #. module: sale
 #: code:addons/sale/sale.py:273
@@ -1768,7 +1797,7 @@ msgstr "已确认"
 #. module: sale
 #: field:sale.order,note:0
 msgid "Terms and conditions"
-msgstr ""
+msgstr "条款和条件"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
@@ -1778,7 +1807,7 @@ msgstr "确认"
 #. module: sale
 #: field:sale.order,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "关注者"
 
 #. module: sale
 #: field:sale.order.line,invoice_lines:0
@@ -1788,7 +1817,7 @@ msgstr "发票明细"
 #. module: sale
 #: model:ir.actions.server,name:sale.actions_server_sale_order_read
 msgid "Mark read"
-msgstr ""
+msgstr "标记为已读"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1800,12 +1829,12 @@ msgstr "销售订单明细"
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Default Options"
-msgstr ""
+msgstr "默认选项"
 
 #. module: sale
 #: field:account.config.settings,group_analytic_account_for_sales:0
 msgid "Analytic accounting for sales"
-msgstr ""
+msgstr "销售辅助核算项"
 
 #. module: sale
 #: code:addons/sale/edi/sale_order.py:139
@@ -1833,16 +1862,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击 为这个客户创建报价单或者订单。\n"
+"              </p><p>\n"
+"                OpenERP 将帮你有效地处理完整的销售流程：\n"
+"                报价,销售订单,发运,开票已经支付.\n"
+"              </p><p>\n"
+"                社交特性帮你组织每个订单的讨论，并允许你客户跟踪订单的进度。\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "On Delivery Order"
-msgstr ""
+msgstr "根据发运单"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "参考计量单位"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_quotations
@@ -1863,6 +1901,15 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单据创建报价单，销售的第一步。\n"
+"              </p><p>\n"
+"                OpenERP 将帮你有效地处理完整的销售流程：\n"
+"                报价,销售订单,发运,开票已经支付.\n"
+"              </p><p>\n"
+"                社交特性帮你组织每个订单的讨论，并允许你客户跟踪订单的进度。.\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:111
@@ -1901,7 +1948,7 @@ msgstr "12月"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:96
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "在这个产品没有定义收益科目: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1927,7 +1974,7 @@ msgstr "预付款发票"
 #. module: sale
 #: model:ir.actions.client,name:sale.action_client_sale_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "打开销售订单"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1937,7 +1984,7 @@ msgstr "草稿"
 #. module: sale
 #: field:sale.config.settings,module_sale_stock:0
 msgid "Trigger delivery orders automatically from sale orders"
-msgstr ""
+msgstr "自动从销售订单触发发运单"
 
 #. module: sale
 #: help:sale.order,amount_tax:0
@@ -1947,7 +1994,7 @@ msgstr "税额。"
 #. module: sale
 #: view:sale.order:0
 msgid "Sale Order "
-msgstr ""
+msgstr "销售订单 "
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1979,7 +2026,7 @@ msgstr "11月"
 #: field:sale.order,message_comment_ids:0
 #: help:sale.order,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "评论和电子邮件"
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
@@ -1989,7 +2036,7 @@ msgstr "预付款产品"
 #. module: sale
 #: help:sale.order.line,sequence:0
 msgid "Gives the sequence order when displaying a list of sales order lines."
-msgstr ""
+msgstr "给出订单行列表显示的排列顺序"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2004,13 +2051,13 @@ msgstr "销售订单处理中"
 #. module: sale
 #: field:sale.config.settings,timesheet:0
 msgid "Prepare invoices based on timesheets"
-msgstr ""
+msgstr "准备基于计工单的发票"
 
 #. module: sale
 #: code:addons/sale/sale.py:689
 #, python-format
 msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
-msgstr ""
+msgstr "销售订单<em>%s</em> <b>被取消</b>."
 
 #. module: sale
 #: help:sale.order,origin:0
@@ -2026,12 +2073,12 @@ msgstr "承诺延迟"
 #. module: sale
 #: field:sale.report,state:0
 msgid "Order Status"
-msgstr ""
+msgstr "订单状态"
 
 #. module: sale
 #: view:sale.advance.payment.inv:0
 msgid "Show Lines to Invoice"
-msgstr ""
+msgstr "显示要开票的行"
 
 #. module: sale
 #: field:sale.report,date:0
@@ -2063,7 +2110,7 @@ msgstr "没价格表！： "
 #: model:ir.actions.act_window,name:sale.action_orders
 #: model:ir.ui.menu,name:sale.menu_sale_order
 msgid "Sale Orders"
-msgstr ""
+msgstr "销售订单"
 
 #. module: sale
 #: field:sale.config.settings,module_account_analytic_analysis:0
@@ -2095,7 +2142,7 @@ msgstr "你真的要生成发票吗 ？"
 #. module: sale
 #: view:sale.order:0
 msgid "Order Number"
-msgstr ""
+msgstr "订单编号"
 
 #. module: sale
 #: view:sale.order:0
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index daf396d302b..b150fb276b7 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -86,13 +86,13 @@
                         your customer.
                     </p>
                     <group>
-                        <label for="id" string="Contract Feature"/>
+                        <label for="id" string="Contract Features"/>
                         <div>
                             <div>
                                 <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)" class="oe_inline"/>
                                 <label for="module_account_analytic_analysis"/>
                             </div>
-                            <div attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}">
+                            <div name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}">
                                 <field name="module_analytic_user_function" class="oe_inline"/>
                                 <label for="module_analytic_user_function"/>
                             </div>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f248f4735e0..dd9cfad066a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -68,7 +68,7 @@
 
         <!-- Sale order Read/Unread actions -->
         <record id="actions_server_sale_order_unread" model="ir.actions.server">
-            <field name="name">Mark unread</field>
+            <field name="name">Sale: Mark unread</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>
@@ -86,7 +86,7 @@
         </record>
 
         <record id="actions_server_sale_order_read" model="ir.actions.server">
-            <field name="name">Mark read</field>
+            <field name="name">Sale: Mark read</field>
             <field name="condition">True</field>
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>
@@ -310,7 +310,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_follower_ids" widget="mail_followers" groups="base.group_user"/>
                     <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
                 </div>
                 </form>
diff --git a/addons/sale_crm/report/sales_crm_account_invoice_report.py b/addons/sale_crm/report/sales_crm_account_invoice_report.py
index 8e356527536..27da7640946 100644
--- a/addons/sale_crm/report/sales_crm_account_invoice_report.py
+++ b/addons/sale_crm/report/sales_crm_account_invoice_report.py
@@ -27,7 +27,10 @@ class account_invoice_report(osv.osv):
     }
 
     def _select(self):
-        return  super(account_invoice_report, self)._select() + ", ai.section_id as section_id"
+        return  super(account_invoice_report, self)._select() + ", sub.section_id as section_id"
+
+    def _sub_select(self):
+        return  super(account_invoice_report, self)._sub_select() + ", ai.section_id as section_id"
 
     def _group_by(self):
         return super(account_invoice_report, self)._group_by() + ", ai.section_id"
diff --git a/addons/sale_stock/i18n/fr.po b/addons/sale_stock/i18n/fr.po
index 54f88eb81e5..ed66315370f 100644
--- a/addons/sale_stock/i18n/fr.po
+++ b/addons/sale_stock/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-09-21 14:14+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 15:02+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:33+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: sale_stock
 #: help:sale.config.settings,group_invoice_deli_orders:0
@@ -101,7 +101,7 @@ msgid ""
 "sold product."
 msgstr ""
 "Pour chaque ligne de commande, un ordre d'approvisionnement est créé pour "
-"fournir le produit vendu."
+"fournir l'article vendu."
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:640
@@ -308,8 +308,8 @@ msgid ""
 "parameters. "
 msgstr ""
 "Un ordre d'approvisionnement est automatiquement créé lors de la "
-"confirmation des bons de commande ou quand la facture est payé. Il dirige "
-"les achats et la production de produits en fonction des règles et des "
+"confirmation des bons de commande ou quand la facture est payé. Il pilote "
+"les achats et la fabrication des articles en fonction des règles et des "
 "paramètres des bons de commande. "
 
 #. module: sale_stock
@@ -399,7 +399,7 @@ msgstr "Propriétés"
 #. module: sale_stock
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Vous devez attribuer un numéro de série pour cet article."
 
 #. module: sale_stock
 #: field:sale.config.settings,group_mrp_properties:0
@@ -418,6 +418,8 @@ msgstr ""
 #: constraint:stock.move:0
 msgid "You cannot move products from or to a location of the type view."
 msgstr ""
+"Il  est impossible de déplacer des articles depuis ou vers un emplacement de "
+"type \"vue\"."
 
 #. module: sale_stock
 #: model:ir.model,name:sale_stock.model_sale_report
@@ -564,7 +566,7 @@ msgstr "Incoterm"
 #. module: sale_stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Vous tentez d'assigner un lot qui n'appartient pas au même article."
 
 #. module: sale_stock
 #: code:addons/sale_stock/sale_stock.py:521
@@ -585,7 +587,7 @@ msgstr "Basé sur les quantités expédiées ou commandées"
 #. module: sale_stock
 #: selection:sale.order,picking_policy:0
 msgid "Deliver all products at once"
-msgstr "Livraison de tous les produits en une fois"
+msgstr "Livre tous les articles en une fois"
 
 #. module: sale_stock
 #: field:sale.order,picking_ids:0
@@ -653,7 +655,7 @@ msgstr "Réceptionné"
 #. module: sale_stock
 #: selection:sale.order,picking_policy:0
 msgid "Deliver each product when available"
-msgstr "Livrer chaque produit dès qu'il est disponible"
+msgstr "Livrer chaque article dès disponibilité"
 
 #. module: sale_stock
 #: model:process.transition,name:sale_stock.process_transition_packing0
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index 1b5fac5f8bd..caa511904df 100644
--- a/addons/share/i18n/zh_CN.po
+++ b/addons/share/i18n/zh_CN.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-06-07 03:37+0000\n"
-"Last-Translator: 开阖软件     Jeff Wang <jeff@osbzr.com>\n"
+"PO-Revision-Date: 2012-11-28 10:18+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:23+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:837
 #, python-format
 msgid "Invitation to collaborate about %s"
-msgstr ""
+msgstr "关于%s的合作邀请"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:775
@@ -90,18 +90,20 @@ msgid ""
 "Hello,\n"
 "\n"
 msgstr ""
+"Hello，\n"
+"\n"
 
 #. module: share
 #: field:share.wizard,share_root_url:0
 msgid "Share Access URL"
-msgstr ""
+msgstr "分享访问URL"
 
 #. module: share
 #: field:share.wizard,email_1:0
 #: field:share.wizard,email_2:0
 #: field:share.wizard,email_3:0
 msgid "New user email"
-msgstr ""
+msgstr "新用户Email"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:882
@@ -113,13 +115,13 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:616
 #, python-format
 msgid "(Modified)"
-msgstr ""
+msgstr "(已修改)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:660
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard."
-msgstr ""
+msgstr "必须是销售/用户组才能使用 分享向导"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:594
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index e627b555de3..7008b2555f9 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -12,7 +12,7 @@ openerp.share = function(session) {
         }
         if (view.fields_view.type == 'form') rec_name = view.datarecord.name;
         else rec_name = '';
-        self.rpc('/web/session/eval_domain_and_context', {
+        session.web.pyeval.eval_domains_and_contexts({
             domains: [domain],
             contexts: [view.dataset.context]
         }).done(function (result) {
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 839a99c1fa7..801fa8ea156 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -19,7 +19,7 @@
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
+            <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(context_today().today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
             <field name="view_id" ref="view_stock_graph_board"></field>
             <field name="context">{'search_default_in':1}</field>
          </record>
@@ -28,7 +28,7 @@
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
+            <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(context_today().today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
             <field name="view_id" ref="view_stock_graph_board"></field>
             <field name="context">{'search_default_out':1}</field>
          </record>
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 7c5a257ea64..1f29c12e9a3 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-26 08:33+0000\n"
-"Last-Translator: ccdos <ccdos@163.com>\n"
+"PO-Revision-Date: 2012-11-29 06:23+0000\n"
+"Last-Translator: mrshelly <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: 2012-11-27 05:23+0000\n"
-"X-Generator: Launchpad (build 16309)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: stock
 #: field:stock.inventory.line.split,line_exist_ids:0
@@ -32,6 +32,8 @@ msgid ""
 "Shirts, for the same \"Linux T-Shirt\", you may have variants on  sizes or "
 "colors; S, M, L, XL, XXL."
 msgstr ""
+"允许管理产品可变属性. 以T恤为例. 同样的 \"Linux T恤\",可以有尺寸和颜色的区分;  S(小号), M(中号), L(大号), "
+"XL(特大号), XXL(超大号)."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
@@ -83,7 +85,7 @@ msgstr "向前追溯"
 #: code:addons/stock/stock.py:1448
 #, python-format
 msgid "Products have been <b>delivered</b>."
-msgstr ""
+msgstr "产品已<b>送货</db>."
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -125,7 +127,7 @@ msgstr "产品调拨"
 #: code:addons/stock/stock.py:2650
 #, python-format
 msgid "Please provide proper quantity."
-msgstr ""
+msgstr "输入数量不正确"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
@@ -209,7 +211,7 @@ msgstr "库存账簿"
 #: code:addons/stock/stock.py:1449
 #, python-format
 msgid "Products have been <b>received</b>."
-msgstr ""
+msgstr "产品已<b>收货</b>."
 
 #. module: stock
 #: view:report.stock.move:0
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9040c678778..defe2805c37 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1845,7 +1845,7 @@ class stock_move(osv.osv):
                 if move.state == 'done':
                     if frozen_fields.intersection(vals):
                         raise osv.except_osv(_('Operation forbidden !'),
-                                             _('Quantities, Unit of Measures, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator).'))
+                                             _('Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator).'))
         return  super(stock_move, self).write(cr, uid, ids, vals, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index a1ce136e304..6a955d950bb 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -21,7 +21,6 @@ watch your stock valuation, and track production lots upstream and downstream (b
             <field name="name">Stock Journal</field>
             <field name="code">STJ</field>
             <field name="type">general</field>
-            <field name="view_id" ref="account.account_journal_view"/>
             <field name="sequence_id" ref="stock_journal_sequence"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index ad28fce8686..168a1c85233 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1151,7 +1151,7 @@
                     <field name="date" groups="base.group_no_one"/>
                     <field name="date_expected"/>
                     <field name="state"/>
-                    <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward"/>
+                    <button name="action_done" states="confirmed,assigned" string="Process" type="object" icon="gtk-go-forward" help="Done"/>
                 </tree>
             </field>
         </record>
@@ -1458,7 +1458,7 @@
                         states="assigned" class="oe_highlight"/>
                     <button name="action_done" states="draft,assigned,confirmed"
                         icon="gtk-go-forward" type="object"
-                        class="oe_highlight"/>
+                        class="oe_highlight" help="Done"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po
index 43a5ac398c4..283e253695c 100644
--- a/addons/stock_location/i18n/fr.po
+++ b/addons/stock_location/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-18 16:46+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2012-11-29 14:10+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:16+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
@@ -56,7 +56,7 @@ msgstr "Emplacement source"
 #. module: stock_location
 #: help:product.pulled.flow,cancel_cascade:0
 msgid "Allow you to cancel moves related to the product pull flow"
-msgstr "Autorise l'annulation d'un mouvement lié au produit en flux tiré"
+msgstr "Autorise l'annulation d'un mouvement lié à l'article en flux tiré"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_product_pulled_flow
@@ -73,7 +73,7 @@ msgstr ""
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You must assign a serial number for this product."
-msgstr ""
+msgstr "Vous devez attribuer un numéro de série pour cet article."
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -112,13 +112,13 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"C'est utilisé pour définir des chemins que le produit devra suivre dans "
-"l'arbre des emplacements.\n"
-"La valeur 'Mouvement Automatique' créera un mouvement de stock après le "
+"C'est utilisé pour définir des chemins que l'article devra suivre dans "
+"l'arborescence des emplacements.\n"
+"La valeur \"Mouvement Automatique\" créera un mouvement de stock après le "
 "mouvement courant qui sera automatiquement validé.\n"
-"Avec 'Opération Manuelle', le mouvement de stock doit être validé par le "
-"travailleur.\n"
-"Avec 'Automatique aucune étape ajoutée', l'emplacement est remplacé dans le "
+"Avec \"Opération Manuelle\", le mouvement de stock doit être validé par "
+"l'opérateur.\n"
+"Avec \"Automatique sans étape ajoutée\", l'emplacement est remplacé dans le "
 "mouvement original."
 
 #. module: stock_location
@@ -235,8 +235,8 @@ msgstr "Nom"
 msgid ""
 "These rules set the right path of the product in the whole location tree."
 msgstr ""
-"Ces règles placent le chemin correct du produit dans l'arbre complet des "
-"emplacements."
+"Ces règles définissent le chemin correct de l'article dans toute "
+"l'arborescence des emplacements."
 
 #. module: stock_location
 #: constraint:stock.move:0
@@ -252,7 +252,7 @@ msgstr "Opération manuelle"
 #: model:ir.model,name:stock_location.model_product_product
 #: field:product.pulled.flow,product_id:0
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: stock_location
 #: field:product.pulled.flow,picking_type:0
@@ -267,8 +267,8 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
-"'Production sur stock' : quand il y a une demande, on prend du stock ou on "
-"attend jusqu'au prochain réapprovisionnement. 'Production à la demande' : "
+"\"Production sur stock\" : quand il y a une demande, on prend du stock ou on "
+"attend jusqu'au prochain réapprovisionnement. \"Production à la demande\" : "
 "quand il y a une demande, on achète ou on fabrique selon cette demande."
 
 #. module: stock_location
@@ -280,12 +280,12 @@ msgstr ""
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product."
-msgstr ""
+msgstr "Vous tentez d'assigner un lot qui n'appartient pas au même article."
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
 msgid "Products"
-msgstr "Produits"
+msgstr "Articles"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.stock_location_qualitytest0
@@ -384,7 +384,7 @@ msgid ""
 "products"
 msgstr ""
 "En fonction de la société, choisissez si vous voulez envoyer ou recevoir les "
-"produits"
+"articles"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.location_order
diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml
index a7dd7d82607..0ff1b5d3af8 100644
--- a/addons/stock_location/test/stock_location_pull_flow.yml
+++ b/addons/stock_location/test/stock_location_pull_flow.yml
@@ -58,7 +58,6 @@
     name: Purchase Journal For Tests
     sequence_id:  account.sequence_purchase_journal
     type: purchase
-    view_id: account.account_journal_bank_view
 
 -
   I create a Sale Journal.
@@ -69,7 +68,6 @@
     name: Sale Journal For Tests
     sequence_id: account.sequence_sale_journal
     type: sale
-    view_id: account.account_journal_view
 
 -
   I create an Expense Account
diff --git a/addons/stock_no_autopicking/i18n/fr.po b/addons/stock_no_autopicking/i18n/fr.po
index 4bf8abd394c..7020639d103 100644
--- a/addons/stock_no_autopicking/i18n/fr.po
+++ b/addons/stock_no_autopicking/i18n/fr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2011-01-13 02:32+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2012-11-29 15:06+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:14+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
index 2082fc7ec7d..69f300f1c79 100644
--- a/addons/survey/i18n/zh_CN.po
+++ b/addons/survey/i18n/zh_CN.po
@@ -8,14 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-05-10 17:18+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-28 14:29+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:19+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: survey
+#: sql_constraint:res.users:0
+msgid "OAuth UID must be unique per provider"
+msgstr "OAuth UID必须是每个提供者（ provider ）唯一的"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr "列首"
 
 #. module: survey
 #: view:survey.response.line:0
@@ -50,7 +61,7 @@ msgstr "文本验证"
 #. module: survey
 #: view:survey:0
 msgid "Answers:"
-msgstr ""
+msgstr "回答："
 
 #. module: survey
 #: view:survey:0
@@ -61,7 +72,7 @@ msgstr "受邀用户"
 #. module: survey
 #: model:survey.type,name:survey.survey_type1
 msgid "Human Resources"
-msgstr ""
+msgstr "人力资源"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -293,7 +304,7 @@ msgstr " 列头"
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "The following surveys are not in open state: %s"
-msgstr ""
+msgstr "下列调查不在开放状态：%s"
 
 #. module: survey
 #: field:survey,tot_comp_survey:0
@@ -328,7 +339,7 @@ msgstr "rating scale"
 msgid ""
 "This survey has no question defined. Please define the questions and answers "
 "first."
-msgstr ""
+msgstr "这些调查没有定义提问。请首先定义提问和答案。"
 
 #. module: survey
 #: field:survey.question,comment_field_type:0
@@ -354,7 +365,7 @@ msgstr ""
 #. module: survey
 #: field:survey,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "颜色索引"
 
 #. module: survey
 #: selection:survey.question,type:0
@@ -371,7 +382,7 @@ msgstr "编辑问卷"
 #: code:addons/survey/wizard/survey_answer.py:962
 #, python-format
 msgid "Please enter an integer value."
-msgstr ""
+msgstr "请输入一个整型值"
 
 #. module: survey
 #: field:survey.question.column.heading,menu_choice:0
@@ -384,7 +395,7 @@ msgstr "菜单选项"
 msgid ""
 "You must enter one or more menu choices                                 in "
 "column heading."
-msgstr ""
+msgstr "你必须在列首输入一个或多个菜单选项"
 
 #. module: survey
 #: selection:survey.question,required_type:0
@@ -433,7 +444,7 @@ msgstr "文本"
 #. module: survey
 #: view:survey:0
 msgid "Edit..."
-msgstr ""
+msgstr "编辑..."
 
 #. module: survey
 #: selection:survey.print,paper_size:0
@@ -490,7 +501,7 @@ msgstr "未验证注释内容"
 #: code:addons/survey/survey.py:534
 #, python-format
 msgid "You must enter one or more menu choices in column heading."
-msgstr ""
+msgstr "你必须在列首输入一个或者多个菜单选择"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -528,7 +539,7 @@ msgstr "评估计划阶段"
 #: code:addons/survey/wizard/survey_send_invitation.py:202
 #, python-format
 msgid "Unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: survey
 #: view:survey:0
@@ -547,7 +558,7 @@ msgstr "打印"
 #. module: survey
 #: view:survey:0
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #. module: survey
 #: field:survey.question,make_comment_field:0
@@ -571,7 +582,7 @@ msgstr "电子邮箱"
 #: code:addons/survey/survey.py:261
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (副本)"
 
 #. module: survey
 #: selection:survey.response,state:0
@@ -597,7 +608,7 @@ msgstr ""
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "报告"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_answer
@@ -624,7 +635,7 @@ msgstr "页码"
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_form
 msgid "Print Surveys"
-msgstr ""
+msgstr "打印调查表"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
@@ -651,7 +662,7 @@ msgstr "无法复制资源！"
 #: code:addons/survey/wizard/survey_answer.py:126
 #, python-format
 msgid "You cannot answer this survey more than %s times."
-msgstr ""
+msgstr "你不能回答这个调查超过 %s 次。"
 
 #. module: survey
 #: field:survey.request,date_deadline:0
@@ -670,11 +681,6 @@ msgid "survey.print"
 msgstr "survey.print"
 
 #. module: survey
-#: sql_constraint:res.users:0
-msgid "OAuth UID must be unique per provider"
-msgstr ""
-
-#. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: field:survey.question,page_id:0
@@ -682,15 +688,9 @@ msgid "Survey Page"
 msgstr "问卷页面"
 
 #. module: survey
-#: view:survey.question.column.heading:0
-#: field:survey.question.column.heading,title:0
-msgid "Column Heading"
-msgstr "列头"
-
-#. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr "需要答案"
+msgstr "需要回答的问题"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_request
@@ -736,12 +736,12 @@ msgstr "选项"
 #: code:addons/survey/survey.py:438
 #, python-format
 msgid "You must enter one or more Answers for question \"%s\" of page %s."
-msgstr ""
+msgstr "你必须为提问 \"%s\" 输入一个或者多个答案（ %s页）。"
 
 #. module: survey
 #: view:survey:0
 msgid "Delete"
-msgstr ""
+msgstr "删除"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
@@ -785,7 +785,7 @@ msgstr "手工"
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "_Send"
-msgstr ""
+msgstr "发送(_S)"
 
 #. module: survey
 #: help:survey,responsible_id:0
@@ -846,7 +846,7 @@ msgstr "如果你需要每个用户只提供一份答案，把它设为1"
 #, python-format
 msgid ""
 "You must enter one or more column headings for question \"%s\" of page %s."
-msgstr ""
+msgstr "你必须为提问 \"%s\" 输入一个或者多个列首（ %s页）。"
 
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
@@ -865,7 +865,7 @@ msgstr "消息"
 msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)."
-msgstr ""
+msgstr "你必须在列首 输入一个或者多个菜单选择（不允许空白）。"
 
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
@@ -1161,7 +1161,7 @@ msgstr "忽略"
 msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
 "allowed)."
-msgstr ""
+msgstr "你必须在列首 输入一个或者多个菜单选择（不允许空白）。"
 
 #. module: survey
 #: field:survey.print,paper_size:0
@@ -1401,7 +1401,7 @@ msgstr "已答复"
 #. module: survey
 #: field:survey,send_response:0
 msgid "Email Notification on Answer"
-msgstr ""
+msgstr "Email提醒"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:446
@@ -1434,7 +1434,7 @@ msgstr "发送邀请"
 #: code:addons/survey/wizard/survey_selection.py:80
 #, python-format
 msgid "You cannot give response for this survey more than %s times."
-msgstr ""
+msgstr "你不能为回答这个调查多于 %s次。"
 
 #. module: survey
 #: view:survey.question:0
@@ -1482,7 +1482,7 @@ msgstr "纵向打印（纵向）"
 #: code:addons/survey/wizard/survey_send_invitation.py:71
 #, python-format
 msgid "Invitation for %s"
-msgstr ""
+msgstr "邀请 %s"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
@@ -1493,13 +1493,13 @@ msgstr "必须为指定的长度"
 #. module: survey
 #: model:survey.type,name:survey.survey_type3
 msgid "Supplier Selection"
-msgstr ""
+msgstr "选择供应商"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:993
 #, python-format
 msgid "You cannot select same answer more than one time.'"
-msgstr ""
+msgstr "你不能选择相同的答案多余1次"
 
 #. module: survey
 #: field:survey.response,date_create:0
@@ -1518,7 +1518,7 @@ msgstr "你输入的最少需要的答复大于答复总数。请用小于%d的�
 #. module: survey
 #: view:survey:0
 msgid "All Open Survey"
-msgstr ""
+msgstr "所有开放的调查"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_browse_response
@@ -1569,7 +1569,7 @@ msgstr "所有选择总数"
 #. module: survey
 #: view:survey.request:0
 msgid "Request"
-msgstr ""
+msgstr "请求"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
@@ -1633,7 +1633,7 @@ msgstr "错误消息"
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "警告！"
 
 #. module: survey
 #: code:addons/survey/survey.py:467
@@ -1652,7 +1652,7 @@ msgstr "菜单选项"
 #. module: survey
 #: field:survey,id:0
 msgid "ID"
-msgstr ""
+msgstr "编号"
 
 #. module: survey
 #: code:addons/survey/survey.py:489
@@ -1711,7 +1711,7 @@ msgstr "浮点数"
 #: view:survey.print.statistics:0
 #: view:survey.send.invitation:0
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #. module: survey
 #: field:survey,title:0
@@ -1731,7 +1731,7 @@ msgstr "日期和时间"
 #. module: survey
 #: constraint:res.users:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "错误：无效的(EAN)条码"
 
 #. module: survey
 #: field:survey.question,column_name:0
@@ -1761,7 +1761,7 @@ msgstr "表格(Table)"
 #: code:addons/survey/wizard/survey_answer.py:119
 #, python-format
 msgid "You cannot answer because the survey is not open."
-msgstr ""
+msgstr "你不能回答，因为调查还没开放。"
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index ad98b60010f..88959dc8655 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-02-08 09:17+0000\n"
-"Last-Translator: gde (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-29 15:32+0000\n"
+"Last-Translator: Numérigraphe <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: 2012-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
@@ -56,12 +56,12 @@ msgstr "Ligne de commande client"
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
-msgstr "Avertissement lors d'un Achat de ce Produit"
+msgstr "Avertissement lors d'un achat de cet article"
 
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
 msgid "Product"
-msgstr "Produit"
+msgstr "Article"
 
 #. module: warning
 #: view:product.product:0
@@ -130,7 +130,7 @@ msgstr "Facture"
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Selling this Product"
-msgstr "Avertissement lors de la Vente de ce Produit"
+msgstr "Avertissement lorsque vous vendez cet article"
 
 #. module: warning
 #: field:res.partner,sale_warn:0
diff --git a/addons/web_linkedin/i18n/pt_BR.po b/addons/web_linkedin/i18n/pt_BR.po
new file mode 100644
index 00000000000..a8a22b15f71
--- /dev/null
+++ b/addons/web_linkedin/i18n/pt_BR.po
@@ -0,0 +1,139 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-30 00:10+0000\n"
+"Last-Translator: Luiz Fernando M.França <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "here:"
+msgstr "aqui:"
+
+#. module: web_linkedin
+#: field:sale.config.settings,api_key:0
+msgid "API Key"
+msgstr "Chave API"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:249
+#, python-format
+msgid "No results found"
+msgstr "Nenhum resultado encontrado"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:84
+#, python-format
+msgid "Ok"
+msgstr "Ok"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Log into LinkedIn."
+msgstr "Entrar em LinkedIn."
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:13
+#, python-format
+msgid "People"
+msgstr "Pessoas"
+
+#. module: web_linkedin
+#: model:ir.model,name:web_linkedin.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: web_linkedin
+#: field:sale.config.settings,server_domain:0
+msgid "unknown"
+msgstr "desconhecido"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "https://www.linkedin.com/secure/developer"
+msgstr "https://www.linkedin.com/secure/developer"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:15
+#, python-format
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "API key"
+msgstr "Chave API"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Copy the"
+msgstr "Copiar o"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:181
+#, python-format
+msgid "LinkedIn search"
+msgstr "Pesquisar LinkedIn"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:31
+#, python-format
+msgid ""
+"LinkedIn access was not enabled on this server.\n"
+"            Please ask your administrator to configure it in Settings > "
+"Configuration > Sales > Social Network Integration."
+msgstr ""
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid ""
+"To use the LinkedIn module with this database, an API Key is required. "
+"Please follow this procedure:"
+msgstr ""
+"Para usar o módulo LinkedIn com este banco de dados, uma chave API é "
+"necessária. Por favor, siga este procedimento:"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:82
+#, python-format
+msgid "LinkedIn is not enabled"
+msgstr "LinkedIn não está habilitado"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Add a new application and fill the form:"
+msgstr "Adicionar um novo aplicativo e preencha o formulário:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Go to this URL:"
+msgstr "Vá para esta URL:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "The programming tool is Javascript"
+msgstr "A ferramenta de programação é o Javascript"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "JavaScript API Domain:"
+msgstr "JavaScript API Domain:"
diff --git a/addons/web_linkedin/i18n/zh_CN.po b/addons/web_linkedin/i18n/zh_CN.po
new file mode 100644
index 00000000000..af82f070f6e
--- /dev/null
+++ b/addons/web_linkedin/i18n/zh_CN.po
@@ -0,0 +1,139 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-28 09:35+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-29 05:15+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "here:"
+msgstr ""
+
+#. module: web_linkedin
+#: field:sale.config.settings,api_key:0
+msgid "API Key"
+msgstr "API Key"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:249
+#, python-format
+msgid "No results found"
+msgstr "找不到任何结果"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:84
+#, python-format
+msgid "Ok"
+msgstr "确定"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Log into LinkedIn."
+msgstr ""
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:13
+#, python-format
+msgid "People"
+msgstr "用户"
+
+#. module: web_linkedin
+#: model:ir.model,name:web_linkedin.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: web_linkedin
+#: field:sale.config.settings,server_domain:0
+msgid "unknown"
+msgstr "未知"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "https://www.linkedin.com/secure/developer"
+msgstr "https://www.linkedin.com/secure/developer"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:15
+#, python-format
+msgid "Companies"
+msgstr "公司"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "API key"
+msgstr "API Key"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Copy the"
+msgstr "复制"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:181
+#, python-format
+msgid "LinkedIn search"
+msgstr "LinkedIn 搜索"
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/xml/linkedin.xml:31
+#, python-format
+msgid ""
+"LinkedIn access was not enabled on this server.\n"
+"            Please ask your administrator to configure it in Settings > "
+"Configuration > Sales > Social Network Integration."
+msgstr ""
+"这个服务器不能访问 LinkedIn ，\n"
+"   请要求你的管理员配置它，在菜单 设置->设置->销售-社交网络集成。"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid ""
+"To use the LinkedIn module with this database, an API Key is required. "
+"Please follow this procedure:"
+msgstr "要在这个数据库使用LinkedIn 模块，要求有一个API Key。请遵循下列步骤："
+
+#. module: web_linkedin
+#. openerp-web
+#: code:addons/web_linkedin/static/src/js/linkedin.js:82
+#, python-format
+msgid "LinkedIn is not enabled"
+msgstr "LinkedIn 没启用。"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Add a new application and fill the form:"
+msgstr "增加一个新的应用，并填在这个表单："
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "Go to this URL:"
+msgstr "浏览这个URL:"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "The programming tool is Javascript"
+msgstr "这个编程工具是 JavaScript"
+
+#. module: web_linkedin
+#: view:sale.config.settings:0
+msgid "JavaScript API Domain:"
+msgstr "JavaScript"
diff --git a/addons/web_shortcuts/__init__.py b/addons/web_shortcuts/__init__.py
index 6c74add0cca..99b6a1491e8 100644
--- a/addons/web_shortcuts/__init__.py
+++ b/addons/web_shortcuts/__init__.py
@@ -17,6 +17,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import controllers
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/controllers/__init__.py b/addons/web_shortcuts/controllers/__init__.py
deleted file mode 100644
index 9f828025b8e..00000000000
--- a/addons/web_shortcuts/controllers/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import main
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/controllers/main.py b/addons/web_shortcuts/controllers/main.py
deleted file mode 100644
index 2cdf232ac0f..00000000000
--- a/addons/web_shortcuts/controllers/main.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import openerp
-
-class Shortcuts(openerp.addons.web.http.Controller):
-    _cp_path = "/web/shortcuts"
-
-    @openerp.addons.web.http.jsonrequest
-    def list(self, req):
-        return req.session.model('ir.ui.view_sc').get_sc(
-            req.session._uid, "ir.ui.menu", req.session.eval_context(req.context))
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/i18n/fr.po b/addons/web_shortcuts/i18n/fr.po
new file mode 100644
index 00000000000..f5c286c9f31
--- /dev/null
+++ b/addons/web_shortcuts/i18n/fr.po
@@ -0,0 +1,25 @@
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-29 15:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr ""
diff --git a/addons/web_shortcuts/i18n/it.po b/addons/web_shortcuts/i18n/it.po
new file mode 100644
index 00000000000..2508876eef0
--- /dev/null
+++ b/addons/web_shortcuts/i18n/it.po
@@ -0,0 +1,25 @@
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-29 07:33+0000\n"
+"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Aggiungi / Rimuovi Scorciatoia..."
diff --git a/addons/web_shortcuts/i18n/pt_BR.po b/addons/web_shortcuts/i18n/pt_BR.po
new file mode 100644
index 00000000000..738cc5689a7
--- /dev/null
+++ b/addons/web_shortcuts/i18n/pt_BR.po
@@ -0,0 +1,25 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:54+0000\n"
+"PO-Revision-Date: 2012-11-29 23:53+0000\n"
+"Last-Translator: Luiz Fernando M.França <Unknown>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16319)\n"
+
+#. module: web_shortcuts
+#. openerp-web
+#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
+#, python-format
+msgid "Add / Remove Shortcut..."
+msgstr "Adicionar/Remover atalho..."
diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
index 918feb4634d..a2607e3749e 100644
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -33,7 +33,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
         this.on('display', this, this.display);
         this.on('remove', this, this.remove);
         this.on('click', this, this.click);
-        this.dataset = new instance.web.DataSet(this, 'ir.ui.view_sc');
+        this.model = new instance.web.Model('ir.ui.view_sc');
     },
     start: function() {
         var self = this;
@@ -46,7 +46,11 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
     load: function() {
         var self = this;
         this.$el.find('.oe_systray_shortcuts_items').empty();
-        return this.rpc('/web/shortcuts/list', {}).done(function(shortcuts) {
+        return this.model.call('get_sc', [
+            instance.session.uid,
+            'ir.ui.menu',
+            instance.web.pyeval.eval('context', {})
+        ]).done(function(shortcuts) {
             _.each(shortcuts, function(sc) {
                 self.trigger('display', sc);
             });
@@ -54,7 +58,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
     },
     add: function (sc) {
         var self = this;
-        this.dataset.create(sc).then(function(out){
+        this.model.call('create', [sc]).then(function(out){
             self.trigger('load');
         });
     },
@@ -69,7 +73,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
         var $shortcut = this.$el.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
         var shortcut_id = $shortcut.data('shortcut-id');
         $shortcut.remove();
-        this.dataset.unlink([shortcut_id]);
+        this.model.call('unlink', [shortcut_id]);
     },
     click: function($link) {
         var self = this,