[MERGE] Latest trunk.

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

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'
     ],

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
+
+    # 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):

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)
 

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,
         }

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",

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>

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)
+                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)
 
-        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
+            #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:

addons/account/data/account_data.xml

@@ -59,412 +59,6 @@
             <field eval="account_payment_term_advance" name="payment_id"/>
         </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
         -->

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"/>

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

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

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

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

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

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

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

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()
 

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>
 

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:

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

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);
+        },
+    });
+};

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({

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>

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"), })

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"

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

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)
 

addons/account/wizard/account_move_journal.py

@@ -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:

addons/account/wizard/account_move_journal_view.xml

@@ -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>

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"

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"

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:
 

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'

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
 

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>

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

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

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 "在动作定义中输入的对象名称错误"

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."),
+    }

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>
+

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>
+</openerp>

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

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

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>

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

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 "选择信息"

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

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

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

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 ""

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">

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

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

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

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

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"

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

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"

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')]}" />

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."

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

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"/>
 

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

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

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:

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"/>
 

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>

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

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

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):

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>

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}"/>

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

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

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

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
 -

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
 -

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
 -

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
 -

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
 -

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
 -

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 
 -

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
 

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>

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

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

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
+        #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,))
 
-        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
+            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')

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."

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"

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

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

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

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

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

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"

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"

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

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