[MERGE]

bzr revid: hmo@tinyerp.com-20100729132104-m7ducnenq89u4rds

addons/account/__openerp__.py

@@ -21,7 +21,7 @@
 {
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
     "description": """Financial and accounting module that covers:
     General accountings
@@ -79,7 +79,7 @@ module named account_vouchers
         'wizard/account_invoice_state_view.xml',
         'wizard/account_partner_balance_report_view.xml',
         'wizard/account_balance_report_view.xml',
-        'wizard/account_move_line_select_view.xml',
+#        'wizard/account_move_line_select_view.xml',
         'wizard/account_aged_trial_balance_view.xml',
         'wizard/account_compare_account_balance_report_view.xml',
         'wizard/account_third_party_ledger.xml',
@@ -136,7 +136,7 @@ module named account_vouchers
         'test/account_invoice_state.yml',
         'test/account_use_model.yml',
         'test/account_validate_account_move.yml',
-#        'test/account_fiscalyear_close.yml',
+        'test/account_fiscalyear_close.yml',
     ],
     'installable': True,
     'active': False,

addons/account/account.py

@@ -248,59 +248,59 @@ class account_account(osv.osv):
 
     def __compute(self, cr, uid, ids, field_names, arg=None, context=None,
                   query='', query_params=()):
-            """ compute the balance, debit and/or credit for the provided
-            account ids
-            Arguments:
-            `ids`: account ids
-            `field_names`: the fields to compute (a list of any of
-                           'balance', 'debit' and 'credit')
-            `arg`: unused fields.function stuff
-            `query`: additional query filter (as a string)
-            `query_params`: parameters for the provided query string
-                            (__compute will handle their escaping) as a
-                            tuple
-            """
-            mapping = {
-                'balance': "COALESCE(SUM(l.debit),0) " \
-                           "- COALESCE(SUM(l.credit), 0) as balance",
-                'debit': "COALESCE(SUM(l.debit), 0) as debit",
-                'credit': "COALESCE(SUM(l.credit), 0) as credit"
-            }
-            #get all the necessary accounts
-            children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
-            #compute for each account the balance/debit/credit from the move lines
-            accounts = {}
-            if children_and_consolidated:
-                aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+        """ compute the balance, debit and/or credit for the provided
+        account ids
+        Arguments:
+        `ids`: account ids
+        `field_names`: the fields to compute (a list of any of
+                       'balance', 'debit' and 'credit')
+        `arg`: unused fields.function stuff
+        `query`: additional query filter (as a string)
+        `query_params`: parameters for the provided query string
+                        (__compute will handle their escaping) as a
+                        tuple
+        """
+        mapping = {
+            'balance': "COALESCE(SUM(l.debit),0) " \
+                       "- COALESCE(SUM(l.credit), 0) as balance",
+            'debit': "COALESCE(SUM(l.debit), 0) as debit",
+            'credit': "COALESCE(SUM(l.credit), 0) as credit"
+        }
+        #get all the necessary accounts
+        children_and_consolidated = self._get_children_and_consol(cr, uid, ids, context=context)
+        #compute for each account the balance/debit/credit from the move lines
+        accounts = {}
+        if children_and_consolidated:
+            aml_query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
 
-                wheres = [""]
-                if query.strip():
-                    wheres.append(query.strip())
-                if aml_query.strip():
-                    wheres.append(aml_query.strip())
-                filters = " AND ".join(wheres)
-                self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                          'Filters: %s'%filters)
-                # IN might not work ideally in case there are too many
-                # children_and_consolidated, in that case join on a
-                # values() e.g.:
-                # SELECT l.account_id as id FROM account_move_line l
-                # INNER JOIN (VALUES (id1), (id2), (id3), ...) AS tmp (id)
-                # ON l.account_id = tmp.id
-                # or make _get_children_and_consol return a query and join on that
-                request = ("SELECT l.account_id as id, " +\
-                           ' , '.join(map(mapping.__getitem__, field_names)) +
-                           " FROM account_move_line l" \
-                           " WHERE l.account_id IN %s " \
-                                + filters +
-                           " GROUP BY l.account_id")
-                params = (tuple(children_and_consolidated),) + query_params
-                cr.execute(request, params)
-                self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
-                                          'Status: %s'%cr.statusmessage)
+            wheres = [""]
+            if query.strip():
+                wheres.append(query.strip())
+            if aml_query.strip():
+                wheres.append(aml_query.strip())
+            filters = " AND ".join(wheres)
+            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
+                                      'Filters: %s'%filters)
+            # IN might not work ideally in case there are too many
+            # children_and_consolidated, in that case join on a
+            # values() e.g.:
+            # SELECT l.account_id as id FROM account_move_line l
+            # INNER JOIN (VALUES (id1), (id2), (id3), ...) AS tmp (id)
+            # ON l.account_id = tmp.id
+            # or make _get_children_and_consol return a query and join on that
+            request = ("SELECT l.account_id as id, " +\
+                       ' , '.join(map(mapping.__getitem__, field_names)) +
+                       " FROM account_move_line l" \
+                       " WHERE l.account_id IN %s " \
+                            + filters +
+                       " GROUP BY l.account_id")
+            params = (tuple(children_and_consolidated),) + query_params
+            cr.execute(request, params)
+            self.logger.notifyChannel('addons.'+self._name, netsvc.LOG_DEBUG,
+                                      'Status: %s'%cr.statusmessage)
 
-                for res in cr.dictfetchall():
-                    accounts[res['id']] = res
+            for res in cr.dictfetchall():
+                accounts[res['id']] = res
 
             # consolidate accounts with direct children
             children_and_consolidated.reverse()
@@ -629,8 +629,8 @@ class account_journal(osv.osv):
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
         'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
-        'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
-            help="The sequence used for invoice numbers in this journal."),
+#        'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
+#            help="The sequence used for invoice numbers in this journal."),
         'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
     }
 
@@ -656,9 +656,18 @@ class account_journal(osv.osv):
         @param context: context arguments, like lang, time zone
         @return: return a result
         """
+
+        journal_type = ('sale', 'sale_refund', 'purchase', 'purchase_refund')
+        journal_seq = {
+            'sale':'seq_out_invoice',
+            'purchase':'seq_in_invoice',
+            'purchase_refund':'seq_out_refund',
+            'sale_refund':'seq_in_refund'
+        }
         
         seq_pool = self.pool.get('ir.sequence')
         seq_typ_pool = self.pool.get('ir.sequence.type')
+        date_pool = self.pool.get('ir.model.data')
         
         result = True
         
@@ -685,11 +694,14 @@ class account_journal(osv.osv):
             res.update({
                 'sequence_id':seq_id
             })
-        
-        if not journal.invoice_sequence_id:
-            res.update({
-                'invoice_sequence_id':seq_id
-            })
+
+#        if journal.type in journal_type and not journal.invoice_sequence_id:
+#            res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))])
+#            inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id
+#            inv_seq_id
+#            res.update({
+#                'invoice_sequence_id':inv_seq_id
+#            })
         
         result = self.write(cr, uid, [journal.id], res)
             
@@ -1018,7 +1030,6 @@ class account_move(osv.osv):
             res.append((move.id, name))
         return res
 
-
     def _get_period(self, cr, uid, context):
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
@@ -1066,24 +1077,13 @@ class account_move(osv.osv):
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner"),
         'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
-        'type': fields.selection([
-            ('pay_voucher','Cash Payment'),
-            ('bank_pay_voucher','Bank Payment'),
-            ('rec_voucher','Cash Receipt'),
-            ('bank_rec_voucher','Bank Receipt'),
-            ('cont_voucher','Contra'),
-            ('journal_sale_vou','Journal Sale'),
-            ('journal_pur_voucher','Journal Purchase'),
-            ('journal_voucher','Journal Voucher'),
-            ],'Entry Type', select=True , size=128, readonly=True, states={'draft':[('readonly',False)]}),
-        'narration':fields.text('Narration', readonly=True, select=True, states={'draft':[('readonly',False)]}),
+        'narration':fields.text('Narration', select=True),
         'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
     }
     _defaults = {
         'name': lambda *a: '/',
         'state': lambda *a: 'draft',
         'period_id': _get_period,
-        'type' : lambda *a : 'journal_voucher',
         'date': lambda *a:time.strftime('%Y-%m-%d'),
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
@@ -1116,6 +1116,7 @@ class account_move(osv.osv):
             'You cannot create entries on different periods/journals in the same move',
             ['line_id']),
     ]
+    
     def post(self, cr, uid, ids, context=None):
         if self.validate(cr, uid, ids, context) and len(ids):
             for move in self.browse(cr, uid, ids):
@@ -1162,8 +1163,20 @@ class account_move(osv.osv):
     # TODO: Check if period is closed !
     #
     def create(self, cr, uid, vals, context={}):
-        if 'line_id' in vals:
-            if 'journal_id' in vals:
+        if 'line_id' in vals and context.get('copy'):
+            for l in vals['line_id']:
+                if not l[0]:
+                    l[2].update({
+                        'reconcile_id':False,
+                        'reconcil_partial_id':False,
+                        'analytic_lines':False,
+                        'invoice':False,
+                        'ref':False,
+                        'balance':False,
+                        'account_tax_id':False,
+                    })
+            
+            if 'journal_id' in vals and vals.get('journal_id', False):
                 for l in vals['line_id']:
                     if not l[0]:
                         l[2]['journal_id'] = vals['journal_id']
@@ -1189,11 +1202,14 @@ class account_move(osv.osv):
             result = super(account_move, self).create(cr, uid, vals, context)
         return result
 
-    def copy(self, cr, uid, id, default=None, context=None):
-        if default is None:
-            default = {}
-        default = default.copy()
-        default.update({'state':'draft', 'name':'/',})
+    def copy(self, cr, uid, id, default={}, context={}):
+        default.update({
+            'state':'draft',
+            'name':'/',
+        })
+        context.update({
+            'copy':True
+        })
         return super(account_move, self).copy(cr, uid, id, default, context)
 
     def unlink(self, cr, uid, ids, context={}, check=True):
@@ -1746,7 +1762,12 @@ class account_tax(osv.osv):
         tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
         for r in tin:
             totalex -= r['amount']
-        tex = self._compute(cr, uid, tex, totalex/quantity, quantity, address_id=address_id, product=product, partner=partner)
+        totlex_qty=0.0            
+        try:
+            totlex_qty=totalex/quantity
+        except:
+            pass    
+        tex = self._compute(cr, uid, tex, totlex_qty, quantity, address_id=address_id, product=product, partner=partner)
         for r in tex:
             totalin += r['amount']
         return {
@@ -2522,9 +2543,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     'account_paid_id': acc_template_ref[value['account_paid_id']],
                 })
 
-        # Creating Journals
+        # Creating Journals Sales and Purchase
         vals_journal={}
-        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_view')])
+        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
         data = data_pool.browse(cr, uid, data_id[0])
         view_id = data.res_id
         
@@ -2556,6 +2577,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         vals_journal['type'] = 'purchase'
         vals_journal['code'] = _('EXJ')
         vals_journal['sequence_id'] = seq_id_purchase
+        vals_journal['view_id'] = view_id
 
         if obj_multi.chart_template_id.property_account_payable:
             vals_journal['default_credit_account_id'] = acc_template_ref[obj_multi.chart_template_id.property_account_expense_categ.id]
@@ -2567,12 +2589,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
         data = data_pool.browse(cr, uid, data_id[0])
         view_id_cash = data.res_id
-        #view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: why put  fix name
-        
+       
         data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
         data = data_pool.browse(cr, uid, data_id[0])
         ref_acc_bank = data.res_id
-        #ref_acc_bank = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fix name
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
         current_num = 1
@@ -2599,8 +2619,8 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
             if obj_multi.seq_journal:
                 vals_seq={
-                        'name': _('Bank Journal ') + vals['name'],
-                        'code': 'account.journal',
+                    'name': _('Bank Journal ') + vals['name'],
+                    'code': 'account.journal',
                 }
                 seq_id = obj_sequence.create(cr,uid,vals_seq)
 
@@ -2656,9 +2676,9 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
 
                 vals_fp = {
-                           'company_id' : company_id,
-                           'name' : position.name,
-                           }
+                    'company_id' : company_id,
+                    'name' : position.name,
+                }
                 new_fp = obj_fiscal_position.create(cr, uid, vals_fp)
 
                 obj_tax_fp = self.pool.get('account.fiscal.position.tax')
@@ -2666,19 +2686,28 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
                 for tax in position.tax_ids:
                     vals_tax = {
-                                'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
-                                'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
-                                'position_id' : new_fp,
-                                }
+                        'tax_src_id' : tax_template_ref[tax.tax_src_id.id],
+                        'tax_dest_id' : tax.tax_dest_id and tax_template_ref[tax.tax_dest_id.id] or False,
+                        'position_id' : new_fp,
+                    }
                     obj_tax_fp.create(cr, uid, vals_tax)
 
                 for acc in position.account_ids:
                     vals_acc = {
-                                'account_src_id' : acc_template_ref[acc.account_src_id.id],
-                                'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
-                                'position_id' : new_fp,
-                                }
+                        'account_src_id' : acc_template_ref[acc.account_src_id.id],
+                        'account_dest_id' : acc_template_ref[acc.account_dest_id.id],
+                        'position_id' : new_fp,
+                    }
                     obj_ac_fp.create(cr, uid, vals_acc)
+        
+        #fially inactive the demo chart of accounts
+        data_id = data_pool.search(cr, uid, [('model','=','account.account'), ('name','=','chart0')])
+        if data_id:
+            data = data_pool.browse(cr, uid, data_id[0])
+            account_id = data.res_id
+            if account_id:
+                cr.execute("update account_account set active='f' where id=%s" % (account_id))
+        
 wizard_multi_charts_accounts()
 
 class account_bank_accounts_wizard(osv.osv_memory):

addons/account/account_bank_statement.py

@@ -25,6 +25,7 @@ from osv import fields, osv
 
 from tools.misc import currency
 from tools.translate import _
+import decimal_precision as dp
 
 class account_bank_statement(osv.osv):
 
@@ -130,9 +131,9 @@ class account_bank_statement(osv.osv):
             states={'confirm': [('readonly', True)]}, domain=[('type', '=', 'cash')]),
         'period_id': fields.many2one('account.period', 'Period', required=True,
             states={'confirm':[('readonly', True)]}),
-        'balance_start': fields.float('Starting Balance', digits=(16,2),
+        'balance_start': fields.float('Starting Balance', digits_compute=dp.get_precision('Account'),
             states={'confirm':[('readonly',True)]}),
-        'balance_end_real': fields.float('Ending Balance', digits=(16,2),
+        'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'),
             states={'confirm':[('readonly', True)]}),
         'balance_end': fields.function(_end_balance, method=True, string='Balance'),
         'line_ids': fields.one2many('account.bank.statement.line',
@@ -159,6 +160,32 @@ class account_bank_statement(osv.osv):
         'period_id': _get_period,
     }
 
+    def onchange_date(self, cr, user, ids, date, context={}):
+        """
+        Returns a dict that contains new values and context
+        @param cr: A database cursor
+        @param user: ID of the user currently logged in
+        @param date: latest value from user input for field date
+        @param args: other arguments
+        @param context: context arguments, like lang, time zone
+        @return: Returns a dict which contains new values, and context
+        """
+        res = {}
+        period_pool = self.pool.get('account.period')
+        pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
+        if pids:
+            res.update({
+                'period_id':pids[0]
+            })
+            context.update({
+                'period_id':pids[0]
+            })
+        
+        return {
+            'value':res,
+            'context':context,
+        }
+
     def button_confirm_bank(self, cr, uid, ids, context={}):
         done = []
         res_currency_obj = self.pool.get('res.currency')
@@ -334,6 +361,7 @@ class account_bank_statement(osv.osv):
 
                 if st.journal_id.entry_posted:
                     account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
+            self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name)
             done.append(st.id)
         self.write(cr, uid, done, {'state':'confirm'}, context=context)
         return True

addons/account/account_cash_statement.py

@@ -25,6 +25,7 @@ import time
 from mx import DateTime
 from decimal import Decimal
 from tools.translate import _
+import decimal_precision as dp
 
 class account_cashbox_line(osv.osv):
     
@@ -55,9 +56,9 @@ class account_cashbox_line(osv.osv):
         return {'value':{'subtotal': sub or 0.0}}
 
     _columns = {
-        'pieces': fields.float('Values', digits=(16,2)),
+        'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')),
         'number': fields.integer('Number'),
-        'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float',digits=(16,2)),
+        'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')),
         'starting_id': fields.many2one('account.bank.statement',ondelete='cascade'),
         'ending_id': fields.many2one('account.bank.statement',ondelete='cascade'),
      }
@@ -173,10 +174,21 @@ class account_cash_statement(osv.osv):
         
         return company_id
 
+    def _get_cash_box_lines(self, cr, uid, ids, context={}):
+        res = []
+        curr = [1, 2, 5, 10, 20, 50, 100, 500]
+        for rs in curr:
+            dct = {
+                'pieces':rs,
+                'number':0
+            }
+            res.append((0,0,dct))
+        return res
+    
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-        'balance_end_real': fields.float('Closing Balance', digits=(16,2), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
+        'balance_end_real': fields.float('Closing Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('confirm', 'Confirm'),
@@ -196,24 +208,23 @@ class account_cash_statement(osv.osv):
         'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"),
         'journal_id': _default_journal_id,
         'user_id': lambda self, cr, uid, context=None: uid,
-        'company_id': _get_company
+        'company_id': _get_company,
+        'starting_details_ids':_get_cash_box_lines,
+        'ending_details_ids':_get_cash_box_lines
      }
 
     def create(self, cr, uid, vals, context=None):
         company_id = vals and vals.get('company_id',False)
         if company_id:
-            open_jrnl = self.search(cr, uid, [('company_id', '=', vals['company_id']), ('journal_id', '=', vals['journal_id']), ('state', '=', 'open')])
+            sql = [
+                ('company_id', '=', vals['company_id']), 
+                ('journal_id', '=', vals['journal_id']), 
+                ('state', '=', 'open')
+            ]
+            open_jrnl = self.search(cr, uid, sql)
             if open_jrnl:
-                raise osv.except_osv('Error', u'Une caisse de type espèce est déjà ouverte')
-            if 'starting_details_ids' in vals:
-                vals['starting_details_ids'] = starting_details_ids = map(list, vals['starting_details_ids'])
-                for i in starting_details_ids:
-                    if i and i[0] and i[1]:
-                        i[0], i[1] = 0, 0
+                raise osv.except_osv('Error', _('You can not have two open register for the same journal'))
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
-        res = self._get_starting_balance(cr, uid, [res_id])
-        for rs in res:
-            super(account_cash_statement, self).write(cr, uid, rs, res.get(rs))
         return res_id
     
     def write(self, cr, uid, ids, vals, context=None):
@@ -283,27 +294,26 @@ class account_cash_statement(osv.osv):
         
         number = self.pool.get('ir.sequence').get(cr, uid, statement.journal_id.sequence_id.code)
         
-        if len(statement.starting_details_ids) > 0:
-            sid = []
-            for line in statement.starting_details_ids:
-                sid.append(line.id)
-            
-            cash_pool.unlink(cr, uid, sid)
-        
-        cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
-        rs = cr.fetchone()
-        rs = rs and rs[0] or None
-        if rs:
-            statement = statement_pool.browse(cr, uid, rs)
-            balance_start = statement.balance_end_real or 0.0
-            open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
-            for sid in open_ids:
-                default = {
-                    'ending_id': False,
-                    'starting_id':ids[0]
-                }
-                cash_pool.copy(cr, uid, sid, default)
-            
+#        if len(statement.starting_details_ids) > 0:
+#            sid = []
+#            for line in statement.starting_details_ids:
+#                sid.append(line.id)
+#            cash_pool.unlink(cr, uid, sid)
+#        
+#        cr.execute("select id from account_bank_statement where journal_id=%s and user_id=%s and state=%s order by id desc limit 1", (statement.journal_id.id, uid, 'confirm'))
+#        rs = cr.fetchone()
+#        rs = rs and rs[0] or None
+#        if rs:
+#            statement = statement_pool.browse(cr, uid, rs)
+#            balance_start = statement.balance_end_real or 0.0
+#            open_ids = cash_pool.search(cr, uid, [('ending_id','=',statement.id)])
+#            for sid in open_ids:
+#                default = {
+#                    'ending_id': False,
+#                    'starting_id':ids[0]
+#                }
+#                cash_pool.copy(cr, uid, sid, default)
+#            
         vals = {
             'date':time.strftime("%Y-%m-%d %H:%M:%S"), 
             'state':'open',

addons/account/account_end_fy.xml

@@ -8,6 +8,7 @@
             <field name="view_type">form</field>
             <field name="domain">[('state','=','draft')]</field>
             <field name="view_id" ref="view_account_period_tree"/>
+            <field name="help"> After closing a period, you will no longer be able to post entries to the period once it has been closed.</field>
         </record>
         <menuitem
             action="action_account_period_tree"

addons/account/account_installer.xml

@@ -60,6 +60,8 @@
                 <field name="account_payment"/>
                 <field name="account_followup"/>
                 <field name="account_asset"/>
+                <field name="account_voucher"/>
+                <field name="account_voucher_payment"/>
             </group>
           </group>
           </group>

addons/account/account_invoice_view.xml

@@ -5,7 +5,6 @@
         <!--
         Invoices
         -->
-
         <record id="view_invoice_line_calendar" model="ir.ui.view">
             <field name="name">account.invoice.calendar</field>
             <field name="model">account.invoice</field>
@@ -17,6 +16,7 @@
                 </calendar>
             </field>
         </record>
+        
         <record model="ir.ui.view" id="view_invoice_graph">
             <field name="name">account.invoice.graph</field>
             <field name="model">account.invoice</field>
@@ -28,6 +28,7 @@
                 </graph>
             </field>
         </record>
+        
         <record id="view_invoice_line_tree" model="ir.ui.view">
             <field name="name">account.invoice.line.tree</field>
             <field name="model">account.invoice.line</field>
@@ -44,6 +45,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_invoice_line_form" model="ir.ui.view">
             <field name="name">account.invoice.line.form</field>
             <field name="model">account.invoice.line</field>
@@ -74,6 +76,7 @@
                 </form>
             </field>
         </record>
+        
         <record id="view_invoice_tax_tree" model="ir.ui.view">
             <field name="name">account.invoice.tax.tree</field>
             <field name="model">account.invoice.tax</field>
@@ -89,6 +92,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="view_invoice_tax_form" model="ir.ui.view">
             <field name="name">account.invoice.tax.form</field>
             <field name="model">account.invoice.tax</field>
@@ -115,7 +119,7 @@
             <field name="model">account.invoice</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state not in ('draft')" string="Invoice">
+                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in ('paid','cancel')" string="Invoice">
                     <field name="date_invoice"/>
                     <field name="number"/>
                     <field name="partner_id" groups="base.group_user"/>
@@ -131,6 +135,12 @@
                     <field name="amount_untaxed" sum="Untaxed Amount"/>
                     <field name="amount_total" sum="Total Amount"/>
                     <field name="state"/>
+
+                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
+                    <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
                 </tree>
             </field>
         </record>
@@ -147,9 +157,9 @@
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                        <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change"/>
+                        <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/>
                         <newline/>
-                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
+                        <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                         <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                         <newline/>
@@ -201,18 +211,18 @@
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
-                                <group col="3" colspan="4">
-                                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="terp-camera_test"/>
+                                <group col="6" colspan="4">
+                                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
+                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="terp-dolar"/>
                                 </group>
                             </group>
                         </page>
                         <page string="Other Info">
-                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank" on_change="onchange_partner_bank(partner_bank)"/>
+                            <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
 
                             <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             <newline/>
@@ -245,7 +255,6 @@
             </field>
         </record>
 
-
         <record id="invoice_form" model="ir.ui.view">
             <field name="name">account.invoice.form</field>
             <field name="model">account.invoice</field>
@@ -257,9 +266,9 @@
                     <field name="number"/>
                     <field name="type" invisible="1"/>
                     <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change"/>
+                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change" attrs="{'invisible':[('state','!=','draft')]}"/>
                     <newline/>
-                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" groups="base.group_user"/>
+                    <field name="partner_id" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)" groups="base.group_user"/>
                     <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
                     <field name="fiscal_position" groups="base.group_extended" widget="selection"/>
                     <newline/>
@@ -295,14 +304,14 @@
                                 <field name="amount_total"/>
                                 <field name="state"/>
                                 <field name="residual"/>
-                                <group col="4" colspan="4" groups="base.group_user">
+                                <group col="7" colspan="4" groups="base.group_user">
                                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-check"/>
                                     <button name="invoice_open" states="draft,proforma2" string="Create" icon="terp-document-new"/>
+                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
+                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
                                     <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='paid' icon="gtk-execute"/>
                                 </group>
                             </group>
                         </page>
@@ -312,7 +321,7 @@
                             <field name="date_due"/>
                             <field name="user_id"/>
                             <newline/>
-                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank"
+                            <field domain="[('partner_id.ref_companies', 'in', [company_id])]" name="partner_bank_id"
                                 groups="base.group_extended"/>
                             <field name="origin"/>
                             <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id"
@@ -349,7 +358,7 @@
                    <group col="10" colspan="4">
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                         <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices"/>
-                        <filter icon="terp-check" string="Invoices" domain="[('state','not in',['draft','cancel','cancel'])]" help="Invoices"/>
+                        <filter icon="terp-check" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Invoices"/>
                         <separator orientation="vertical"/>
                         <filter icon="terp-dolar_ok!" string="Unpaid" domain="[('state','=','open')]" help="Unpaid Invoices"/>
                         <separator orientation="vertical"/>
@@ -362,6 +371,11 @@
                         <field name="amount_total"/>
                     </group>
                     <newline/>
+                    <group col="10" colspan="4">
+                        <field name="journal_id" widget="selection" select='1'/>
+                        <field name="period_id" select='1'/>
+                    </group>
+                    <newline/>
                     <group expand="0" string="Group By...">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
@@ -403,6 +417,7 @@
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_invoice_tree"/>
         </record>
+        
         <record id="action_invoice_tree_view2" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
@@ -420,12 +435,15 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
         </record>
+        
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
+        
         <record id="action_invoice_tree1_view2" model="ir.actions.act_window.view">
             <field eval="2" name="sequence"/>
             <field name="view_mode">form</field>
@@ -443,6 +461,7 @@
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">Proposal for vendor invoices are usually automatically generate by OpenERP, following a procurement order or a production order for instance. To consult and to check for, or to manually create a customer invoice, use this menu. You can review, confirm or cancel, pay or refund an invoice from the view from of the invoices.</field>
         </record>
         <menuitem action="action_invoice_tree2" id="menu_action_invoice_tree2" parent="menu_finance_payables"/>
 
@@ -455,6 +474,7 @@
             <field name="domain">[('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">A customer refund is a credit note to your customer that cancel  invoice or a part of it.</field>
         </record>
 
         <record id="action_invoice_tree3_view1" model="ir.actions.act_window.view">
@@ -469,7 +489,6 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree3"/>
         </record>
-
         <menuitem action="action_invoice_tree3" id="menu_action_invoice_tree3" parent="menu_finance_receivables"/>
 
         <record id="action_invoice_tree4" model="ir.actions.act_window">
@@ -481,6 +500,7 @@
             <field name="domain">[('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">A vendor refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you.</field>
         </record>
         <menuitem action="action_invoice_tree4" id="menu_action_invoice_tree4" parent="menu_finance_payables"/>
 

addons/account/account_invoice_workflow.xml

@@ -12,17 +12,19 @@
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
+        
         <!--        <record model="workflow.activity" id="act_confirm">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">confirm</field>
         </record> -->
-        <record id="act_proforma" model="workflow.activity">
-            <field name="wkf_id" ref="wkf"/>
-            <field name="name">proforma</field>
-            <field name="action">action_move_create()
-write({'state':'proforma'})</field>
-            <field name="kind">function</field>
-        </record>
+        
+<!--        <record id="act_proforma" model="workflow.activity">-->
+<!--            <field name="wkf_id" ref="wkf"/>-->
+<!--            <field name="name">proforma</field>-->
+<!--            <field name="action">action_move_create()-->
+<!--write({'state':'proforma'})</field>-->
+<!--            <field name="kind">function</field>-->
+<!--        </record>-->
 
         <record id="act_proforma2" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
@@ -42,7 +44,7 @@ write({'state':'open'})</field>
         </record>
         <record model="workflow.activity" id="act_open_test">
             <field name="wkf_id" ref="wkf"/>
-            <field name="name">open</field>
+            <field name="name">re-open</field>
             <field name="action">write({'state':'open'})</field>
             <field name="kind">function</field>
            </record>
@@ -70,28 +72,28 @@ write({'state':'cancel'})</field>
         </record>
         -->
 
-        <record id="t3" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_proforma"/>
-            <field name="signal">invoice_proforma</field>
-        </record>
+<!--        <record id="t3" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_draft"/>-->
+<!--            <field name="act_to" ref="act_proforma"/>-->
+<!--            <field name="signal">invoice_proforma</field>-->
+<!--        </record>-->
         <record id="t4" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_open"/>
             <field name="signal">invoice_open</field>
         </record>
-        <record id="t5" model="workflow.transition">
-            <field name="act_from" ref="act_proforma"/>
-            <field name="act_to" ref="act_open"/>
-            <field name="signal">invoice_open</field>
-        </record>
-        <record id="t7" model="workflow.transition">
-            <field name="act_from" ref="act_proforma"/>
-            <field name="act_to" ref="act_paid"/>
-            <field name="trigger_model">account.move.line</field>
-            <field name="trigger_expr_id">move_line_id_payment_get()</field>
-            <field name="condition">test_paid()</field>
-        </record>
+<!--        <record id="t5" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_proforma"/>-->
+<!--            <field name="act_to" ref="act_open"/>-->
+<!--            <field name="signal">invoice_open</field>-->
+<!--        </record>-->
+<!--        <record id="t7" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_proforma"/>-->
+<!--            <field name="act_to" ref="act_paid"/>-->
+<!--            <field name="trigger_model">account.move.line</field>-->
+<!--            <field name="trigger_expr_id">move_line_id_payment_get()</field>-->
+<!--            <field name="condition">test_paid()</field>-->
+<!--        </record>-->
         <record id="t8" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_paid"/>
@@ -104,11 +106,11 @@ write({'state':'cancel'})</field>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
-        <record id="t11" model="workflow.transition">
-            <field name="act_from" ref="act_proforma"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">invoice_cancel</field>
-        </record>
+<!--        <record id="t11" model="workflow.transition">-->
+<!--            <field name="act_from" ref="act_proforma"/>-->
+<!--            <field name="act_to" ref="act_cancel"/>-->
+<!--            <field name="signal">invoice_cancel</field>-->
+<!--        </record>-->
         <record id="t12" model="workflow.transition">
             <field name="act_from" ref="act_open"/>
             <field name="act_to" ref="act_cancel"/>
@@ -124,7 +126,15 @@ write({'state':'cancel'})</field>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
-
+        
+        <record id="open_test_to_paid" model="workflow.transition">
+            <field name="act_from" ref="act_open_test"/>
+            <field name="act_to" ref="act_paid"/>
+            <field name="trigger_model">account.move.line</field>
+            <field name="trigger_expr_id">move_line_id_payment_get()</field>
+            <field name="condition">test_paid()</field>
+        </record>
+        
         <record id="draft_to_pro2" model="workflow.transition">
             <field name="act_from" ref="account.act_draft"/>
             <field name="act_to" ref="act_proforma2"/>

addons/account/account_menuitem.xml

@@ -8,24 +8,23 @@
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="3"/>
 <!--        <menuitem id="menu_accounting" name="Accounting" parent="menu_finance" sequence="5"/>-->
         <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="8" groups="group_account_user"/>
-            <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
-            <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
+        <menuitem id="periodical_processing_journal_entries_validation" name="Entries to Review" parent="menu_finance_periodical_processing"/>
+        <menuitem id="periodical_processing_reconciliation" name="Reconciliation" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_recurrent_entries" name="Recurrent Entries" parent="menu_finance_periodical_processing"/>-->
-            <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
+        <menuitem id="periodical_processing_invoicing" name="Invoicing" parent="menu_finance_periodical_processing"/>
 <!--            <menuitem id="periodical_processing_end_of_period" name="End of Period" parent="menu_finance_periodical_processing"/>-->
         <menuitem id="menu_finance_charts" name="Charts" parent="menu_finance" sequence="5"/>
         <menuitem id="menu_finance_reporting" name="Reporting" parent="account.menu_finance" sequence="12"/>
-            <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
-            <menuitem id="menu_generic_report" name="Management Reports" parent="menu_finance_reporting"/>
-            <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
-            <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_reporting_budgets" name="Budgets" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_legal_statement" name="Legal Reports" parent="menu_finance_reporting"/>
+        <menuitem id="menu_finance_management_belgian_reports" name="Belgian Reports" parent="menu_finance_reporting"/>
         <menuitem id="menu_finance_configuration" name="Configuration" parent="menu_finance" sequence="13"/>
-            <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
-            <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
-                <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
-                <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
-            <menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
-                <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
+        <menuitem id="menu_finance_accounting" name="Financial Accounting" parent="menu_finance_configuration"/>
+        <menuitem id="menu_analytic_accounting" name="Analytic Accounting" parent="menu_finance_configuration"/>
+        <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts"/>
+        <menuitem id="menu_low_level" name="Low Level" parent="menu_finance_accounting"/>
+        <menuitem id="menu_configuration_misc" name="Miscelleanous" parent="menu_finance_configuration"/>
+        <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20"/>
 <!--        <menuitem id="menu_finance_configuration1" name="Configuration" parent="menu_finance" sequence="80"/>-->
 <!--        <menuitem id="base.menu_action_currency_form" parent="menu_finance_configuration" sequence="20"/>-->
 <!--        <menuitem id="menu_finance_accounting1" name="Financial Accounting" parent="menu_finance_configuration" sequence="80"/>-->
@@ -34,10 +33,9 @@
 <!--        <menuitem id="menu_finance_reporting11" name="Reporting" parent="account.menu_finance"  sequence="80"/>-->
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reporting" sequence="100"/>
 <!--        <menuitem id="menu_finance_legal_statement1" name="Legal Statements" parent="account.menu_finance_reporting" sequence="200"/>-->
-<!--        <menuitem id="menu_generic_report" name="Generic Reports" parent="account.menu_finance_legal_statement" sequence="8"/>-->
 
         <menuitem id="menu_finance_entries" name="Accounting" parent="menu_finance" sequence="4"
-            groups="group_account_user"/>
+        groups="group_account_user"/>
         <menuitem id="account.menu_finance_recurrent_entries" name="Recurring Entries" parent="menu_finance_periodical_processing" sequence="15"/>
 
 <!--        <menuitem id="menu_finance_periodical_processing11" name="Periodical Processing" parent="account.menu_finance"-->
@@ -45,7 +43,18 @@
 <!--            groups="group_account_user"/>-->
         <menuitem id="menu_account_end_year_treatments" name="End of Period" parent="menu_finance_periodical_processing"/>
 
-       <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
+        <menuitem id="menu_finance_statistic_report_statement" name="Statistic Reports" parent="menu_finance_reporting" sequence="300"/>
+
+        <menuitem 
+        parent="account.menu_finance_legal_statement" 
+        id="final_accounting_reports"
+        name="Accounting Reports"/>
+
+        <menuitem 
+        parent="account.menu_finance_legal_statement" 
+        id="menu_journals_report"
+        name="Journals"/>
+
     </data>
 </openerp>
 

addons/account/account_move_line.py

@@ -20,7 +20,6 @@
 ##############################################################################
 import time
 from datetime import datetime
-
 import netsvc
 from osv import fields, osv
 from tools.translate import _
@@ -183,7 +182,7 @@ class account_move_line(osv.osv):
         # Compute the current move
         move_id = False
         partner_id = False
-        if context.get('journal_id',False) and context.get('period_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 \
@@ -199,6 +198,7 @@ class account_move_line(osv.osv):
                     return data
                 else:
                     data['move_id'] = move_id
+
             if 'date' in fields:
                 cr.execute('select date  \
                     from \
@@ -214,7 +214,6 @@ class account_move_line(osv.osv):
                     period = period_obj.browse(cr, uid, context['period_id'],
                             context=context)
                     data['date'] = period.date_start
-
         if not move_id:
             return data
 
@@ -401,7 +400,7 @@ class account_move_line(osv.osv):
         'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
         'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2),
         'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", states={'valid':[('readonly',True)]}, help="The move of this entry line.", select=2),
-
+        'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Narration'),
         'ref': fields.char('Ref.', size=64),
         '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),
@@ -454,6 +453,7 @@ class account_move_line(osv.osv):
                         context=context)
                 dt = period.date_start
         return dt
+        
     def _get_currency(self, cr, uid, context={}):
         if not context.get('journal_id', False):
             return False
@@ -786,6 +786,31 @@ class account_move_line(osv.osv):
             return j+(p and (':'+p) or '')
         return False
 
+#    def onchange_date(self, cr, user, ids, date, context={}):
+#        """
+#        Returns a dict that contains new values and context
+#        @param cr: A database cursor
+#        @param user: ID of the user currently logged in
+#        @param date: latest value from user input for field date
+#        @param args: other arguments
+#        @param context: context arguments, like lang, time zone
+#        @return: Returns a dict which contains new values, and context
+#        """
+#        res = {}
+#        period_pool = self.pool.get('account.period')
+#        pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
+#        if pids:
+#            res.update({
+#                'period_id':pids[0]
+#            })
+#            context.update({
+#                'period_id':pids[0]
+#            })
+#        return {
+#            'value':res,
+#            'context':context,
+#        }
+
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context,toolbar=toolbar, submenu=submenu)
         if view_type != 'tree':
@@ -794,7 +819,7 @@ class account_move_line(osv.osv):
         fld = []
         fields = {}
         flds = []
-        title = self.view_header_get(cr, uid, view_id, view_type, context)
+        title = "Accounting Entries" #self.view_header_get(cr, uid, view_id, view_type, context)
         xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write">\n\t''' % (title)
         journal_pool = self.pool.get('account.journal')
 
@@ -848,11 +873,14 @@ class account_move_line(osv.osv):
             elif field == 'credit':
                 attrs.append('sum="Total credit"')
             elif field == 'account_tax_id':
-                attrs.append('domain="[(\'parent_id\',\'=\',False)]"')
+                attrs.append('domain="[(\'parent_id\',\'=\',False), (\'type_tax_use\',\'=\',context.get(journal_id.type, \'sale\'))]"')
             elif field == 'account_id' and journal.id:
                 attrs.append('domain="[(\'journal_id\', \'=\', '+str(journal.id)+'),(\'type\',\'&lt;&gt;\',\'view\'), (\'type\',\'&lt;&gt;\',\'closed\')]" on_change="onchange_account_id(account_id, partner_id)"')
             elif field == 'partner_id':
                 attrs.append('on_change="onchange_partner_id(move_id, partner_id, account_id, debit, credit, date, journal_id)"')
+#            elif field == 'date':
+#                attrs.append('on_change="onchange_date(date)"')
+
 #            if field.readonly:
 #                attrs.append('readonly="1"')
 #            if field.required:
@@ -898,6 +926,7 @@ class account_move_line(osv.osv):
     def _check_date(self, cr, uid, vals, context=None, check=True):
         if context is None:
             context = {}
+        journal_id = False
         if 'date' in vals.keys():
             if 'journal_id' in vals and 'journal_id' not in context:
                 journal_id = vals['journal_id']
@@ -1082,10 +1111,10 @@ class account_move_line(osv.osv):
 
         #if not 'currency_id' in vals:
         #    vals['currency_id'] = account.company_id.currency_id.id
-
+        
         result = super(osv.osv, self).create(cr, uid, vals, context)
         # CREATE Taxes
-        if vals.get('account_tax_id',False):
+        if vals.get('account_tax_id', False):
             tax_id = tax_obj.browse(cr, uid, vals['account_tax_id'])
             total = vals['debit'] - vals['credit']
             if journal.refund_journal:
@@ -1158,7 +1187,7 @@ class account_move_line(osv.osv):
         if check and ((not context.get('no_store_function')) or journal.entry_posted):
             tmp = self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
             if journal.entry_posted and tmp:
-                self.pool.get('account.move').button_validate(cr,uid, [vals['move_id']],context)
+                rs = self.pool.get('account.move').button_validate(cr,uid, [vals['move_id']],context)
         return result
 account_move_line()
 

addons/account/account_unit_test.xml

@@ -52,6 +52,8 @@
             <!-- writeoff_acc_id = -->        <value eval="ref('cash')"/>
             <!-- writeoff_period_id = -->    <value eval="ref('account.period_' + str(int(time.strftime('%m'))))"/>
             <!-- writeoff_journal_id = -->    <value eval="ref('bank_journal')"/>
+            <!-- context = -->              <value eval="{}"/>
+            <!-- name = -->                 <value eval="str('Payment from ASUStek')"/>
         </function>
         
         <assert id="test_invoice_1" model="account.invoice" string="Test invoice 1 is now paid">

addons/account/account_view.xml

@@ -44,7 +44,7 @@
             <field name="model">account.fiscalyear</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Fiscalyear">
+                <tree colors="blue:state in ('draft');gray:state in ('done') " string="Fiscalyear">
                     <field name="code"/>
                     <field name="name"/>
                     <field name="state"/>
@@ -113,7 +113,7 @@
             <field name="model">account.period</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Period">
+            	<tree colors="blue:state in ('draft');gray:state in ('done') " string="Period">
                     <field name="code"/>
                     <field name="name"/>
                     <field name="date_start"/>
@@ -197,12 +197,32 @@
             </field>
         </record>
 
+        <record id="view_account_list" model="ir.ui.view">
+            <field name="name">account.account.list</field>
+            <field name="model">account.account</field>
+            <field name="type">tree</field>
+            <field name="field_parent">child_id</field>
+            <field name="arch" type="xml">
+                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="user_type" invisible="1"/>
+                    <field name="debit"/>
+                    <field name="credit"/>
+                    <field name="balance"/>
+                    <field name="type"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="company_currency_id"/>
+                </tree>
+            </field>
+        </record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
             <field name="search_view_id" ref="view_account_search"/>
+            <field name="view_id" ref="view_account_list"/>
         </record>
         <menuitem id="account_account_menu" name="Accounts" parent="menu_finance_accounting"/>
         <menuitem action="action_account_form" id="menu_action_account_form" parent="account_account_menu"/>
@@ -213,17 +233,15 @@
             <field name="type">tree</field>
             <field name="field_parent">child_id</field>
             <field name="arch" type="xml">
-                <tree string="Chart of accounts" toolbar="1" colors="blue:type in ('view');black:type not in ('view')">
+                <tree colors="blue:type in ('view');black:type in ('other','receivable','payable','consolidation');gray:type in ('closed')" string="Chart of accounts" toolbar="1" >
                     <field name="code"/>
                     <field name="name"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="user_type" invisible="1"/>
                     <field name="debit"/>
                     <field name="credit"/>
                     <field name="balance"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="company_currency_id"/>
-                    <field name="type" invisible="1"/>
+                    <field name="type"/>
                 </tree>
             </field>
         </record>
@@ -237,10 +255,10 @@
 <!--        <menuitem action="action_account_tree" id="menu_action_account_tree" parent="account.account_account_menu"/>-->
 
         <!--
-    Journal
+        Journal
 
-    Account Journal Columns
-    -->
+        Account Journal Columns
+        -->
 
         <record id="view_journal_column_form" model="ir.ui.view">
             <field name="name">account.journal.column.form</field>
@@ -251,9 +269,9 @@
                     <field colspan="4" name="name" select="1"/>
                     <field name="field" select="1"/>
                     <field name="sequence"/>
-                    <newline/>
-                    <field name="readonly"/>
-                    <field name="required"/>
+<!--                    <newline/>-->
+<!--                    <field name="readonly"/>-->
+<!--                    <field name="required"/>-->
                 </form>
             </field>
         </record>
@@ -265,8 +283,8 @@
                 <tree string="Journal Column">
                     <field name="sequence"/>
                     <field name="name"/>
-                    <field name="required"/>
-                    <field name="readonly"/>
+<!--                    <field name="required"/>-->
+<!--                    <field name="readonly"/>-->
                 </tree>
             </field>
         </record>
@@ -277,11 +295,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Journal View">
-                    <field colspan="4" name="name" select="1"/>
+                    <field name="name" select="1"/>
                     <field colspan="4" name="columns_id" nolabel="1" widget="one2many_list"/>
                 </form>
             </field>
         </record>
+        <record id="action_account_journal_view" model="ir.actions.act_window">
+            <field name="name">Journal Views</field>
+            <field name="res_model">account.journal.view</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem action="action_account_journal_view" id="menu_action_account_journal_view" parent="account.menu_low_level"/>
 
         <!--
     # Account Journal
@@ -347,7 +372,7 @@
                                     <field name="view_id" widget="selection"/>
                                 </group>
                             </group>
-                            
+
                             <group colspan="2" col="2">
                                 <separator string="Company" colspan="4"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
@@ -363,15 +388,14 @@
                                 <field name="centralisation" groups="base.group_extended"/>
                                 <field name="entry_posted"/>
                             </group>
-                            <group colspan="2" col="2">
-                                <separator string="Invoicing Data" colspan="4"/>
-                                <field name="invoice_sequence_id" groups="base.group_extended"/>
-                                <field name="group_invoice_lines"/>
-                            </group>
                             <group colspan="2" col="2" groups="base.group_extended">
                                 <separator string="Sequence" colspan="4"/>
                                 <field name="sequence_id"/>
                             </group>
+                            <group colspan="2" col="2">
+                                <separator string="Invoicing Data" colspan="4"/>
+                                <field name="group_invoice_lines"/>
+                            </group>
                         </page>
                         <page string="Entry Controls" groups="base.group_extended">
                             <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
@@ -396,18 +420,20 @@
             <field name="model">account.bank.statement</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Search Statement">
-                   <group col="10" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Statement"/>
-                        <filter icon="terp-check" string="Posted" domain="[('state','=','confirm')]" help="Confirm confirm"/>
+                <search string="Search Bank Statements">
+                    <group col="8" colspan="4">
+                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
-                        <field name="name"/>
                         <field name="date"/>
+                        <field name="name"/>
                         <field name="journal_id"/>
                     </group>
-                    <group expand="0" string="Group By..." colspan="12" col="10">
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
-                        <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Journal" context="{'group_by': 'journal_id'}" icon="terp-folder-orange"/>
+                        <filter string="Period" context="{'group_by': 'period_id'}" icon="terp-go-month"/>
+                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
                     </group>
                 </search>
             </field>
@@ -419,10 +445,10 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree colors="red:balance_end_real!=balance_end and state=='draft';blue:state=='draft' and (balance_end_real==balance_end);black:state=='confirm'" string="Statement">
-                    <field name="date"/>
                     <field name="name"/>
-                    <field name="journal_id"/>
+                    <field name="date"/>
                     <field name="period_id"/>
+                    <field name="journal_id"/>
                     <field name="balance_start"/>
                     <field name="balance_end_real"/>
                     <field name="balance_end"/>
@@ -439,13 +465,13 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Search Bank Statements">
-                    <group>
+                    <group col="8" colspan="4">
                         <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
                         <filter string="Confirm" domain="[('state','=','confirm')]" icon="terp-camera_test"/>
                         <separator orientation="vertical"/>
+                        <field name="journal_id" widget="selection"/>      
                         <field name="date"/>
                         <field name="name"/>
-                        <field name="journal_id"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -464,8 +490,8 @@
                 <form string="Bank Statement">
                     <group col="6" colspan="4">
                         <field name="name" select="1"/>
-                        <field name="date" select="1"/>
-                        <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
+                        <field name="date" select="1" on_change="onchange_date(date)"/>
+                        <field name="journal_id" domain="[('type', '=', 'bank')]" on_change="onchange_journal_id(journal_id)" select="1"/>
                         <field name="period_id"/>
                         <field name="balance_start"/>
                         <field name="balance_end_real"/>
@@ -518,7 +544,7 @@
             <field name="name">Bank Statements</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('journal_id.type', '=', 'bank')]</field>
         </record>
         <record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
@@ -544,12 +570,12 @@
             <field name="filter" eval="True"/>
         </record>
 
-        <record id="action_bank_statement_tree2" model="ir.actions.act_window">
-            <field name="name">New Statement</field>
-            <field name="res_model">account.bank.statement</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-        </record>
+<!--        <record id="action_bank_statement_tree2" model="ir.actions.act_window">-->
+<!--            <field name="name">New Statement</field>-->
+<!--            <field name="res_model">account.bank.statement</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">form,tree</field>-->
+<!--        </record>-->
 
         <record id="view_bank_statement_reconcile" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
@@ -638,14 +664,14 @@
             <field name="model">account.move</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Accounting Entries">
+                <tree colors="blue:state in ('draft');black:state in ('posted')" string="Accounting Entries">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="ref"/>
                     <field name="period_id"/>
                     <field name="journal_id"/>
                     <field name="partner_id"/>
-                    <field name="amount"/>
+                    <field name="amount" sum="Total Amount"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -792,7 +818,7 @@
                             <field groups="base.group_extended" name="price_include"/>
                             <field name="type_tax_use"/>
                             <newline/>
-                            <field colspan="4" groups="base.group_extended" name="child_ids"/>
+                            <field colspan="4" groups="base.group_extended" name="child_ids" nolabel="1"/>
                         </page>
                         <page string="Tax Declaration">
                             <separator colspan="4" string="Invoices"/>
@@ -832,6 +858,7 @@
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
             <field name="view_id" ref="view_tax_code_tree"/>
+            <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
         </record>
         <menuitem
             action="action_tax_code_tree"
@@ -850,7 +877,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Account Entry Line" editable="top" on_write="on_create_write">
+                <tree colors="blue:state in ('draft');black:state in ('valid')" string="Account Entry Line" editable="top" on_write="on_create_write">
                     <field name="date"/>
                     <field name="period_id"/>
                     <field name="move_id"/>
@@ -880,43 +907,70 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Account Entry Line">
-                    <notebook>
+                    <group col="6" colspan="4">
+                        <field name="name" select="1"/>
+                        <field name="ref"/>
+                        <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                        
+                        <field name="journal_id"/>
+                        <field name="period_id"/>
+                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+                    </group>
+                    <notebook colspan="4">
                         <page string="Information">
-                            <separator colspan="4" string="General Information"/>
-                            <field name="name" select="1"/>
-                            <field name="date" select="1"/>
-                            <field name="ref"/>
-                            <field name="invoice"/>
-                            <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Amount"/>
+                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                <field name="debit"/>
+                                <field name="credit"/>
+                                <field name="quantity"/>
+                            </group>
+                            
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Accounting Documents"/>
+                                <field name="invoice"/>
+                                <field name="move_id" required="False"/>
+                                <field name="statement_id"/>
+                            </group>
 
-                            <field name="debit"/>
-                            <field name="credit"/>
-                            <field name="company_id" required="1" groups="base.group_multi_company"/>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Dates"/>
+                                <field name="date" select="1"/>
+                                <field name="date_maturity"/>
+                                <field name="date_created"/>
+                            </group>
+                            
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Taxes"/>
+                                <field name="tax_code_id"/>
+                                <field name="tax_amount"/>
+                                <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                            </group>
+                            
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Currency"/>
+                                <field name="currency_id"/>
+                                <field name="amount_currency"/>
+                            </group>
 
-                            <separator colspan="4" string="Optional Information"/>
-                            <field name="currency_id"/>
-                            <field name="amount_currency"/>
-                            <field name="quantity"/>
-                            <field name="move_id" required="False"/>
-                            <newline/>
-                            <field name="statement_id"/>
-                            <field name="blocked"/>
-                            <field name="date_maturity"/>
-                            <field name="date_created"/>
-                            <newline/>
-                            <field name="tax_code_id"/>
-                            <field name="tax_amount"/>
-                            <newline/>
-                            <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-                            <field name="analytic_account_id"/>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Reconciliation"/>
+                                <field name="reconcile_id"/>
+                                <field name="reconcile_partial_id"/>
+                            </group>
 
-                            <separator colspan="4" string="State"/>
-                            <field name="journal_id"/>
-                            <field name="period_id"/>
-                            <field name="reconcile_id"/>
-                            <field name="reconcile_partial_id"/>
-                            <field name="state"/>
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="States"/>
+                                <field name="state"/>
+                                <field name="blocked"/>
+                            </group>
+                            
+                            <group col="2" colspan="2">
+                                <separator colspan="2" string="Analytic"/>
+                                <field name="analytic_account_id"/>
+                            </group>
+                            <separator string="Narration" colspan="4"/>
+                            <field name="narration" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Analytic Lines">
                             <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
@@ -926,7 +980,6 @@
             </field>
         </record>
 
-
         <record id="view_move_line_form2" model="ir.ui.view">
             <field name="name">account.move.line.form2</field>
             <field name="model">account.move.line</field>
@@ -934,7 +987,7 @@
             <field eval="9" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Account Entry Line">
-                    <notebook>
+                    <notebook colspan="4">
                         <page string="Information">
                             <separator colspan="4" string="General Information"/>
                             <field name="name" select="1"/>
@@ -974,6 +1027,19 @@
             </field>
         </record>
 
+        <record id="account_move_line_graph" model="ir.ui.view">
+            <field name="name">account.move.line.graph</field>
+            <field name="model">account.move.line</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Account Statistics" type="bar">
+                    <field name="account_id"/>
+                    <field name="debit" operator="+"/>
+                    <field name="credit" operator="+"/>
+                </graph>
+            </field>
+         </record>
+        
         <record id="view_account_move_line_filter" model="ir.ui.view">
             <field name="name">Entry Lines</field>
             <field name="model">account.move.line</field>
@@ -984,17 +1050,25 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entry Lines"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','valid')]" help="Posted Entry Lines"/>
                         <separator orientation="vertical"/>
-                        <field name="date" select='1'/>
+                        <filter icon="terp-stock_symbol-selection" string="Unposted" domain="[('move_id.state','=','draft')]" help="Unposted Entry Lines"/>
+                        <filter icon="terp-stock_symbol-selection" string="Unreconciled" domain="[('reconcile_id','=',False), ('account_id.type','in',['receivable', 'payable'])]" help="Unreconciled Entry Lines"/>
+                        <separator orientation="vertical"/>
+                        <field name="ref" select="1" string="Reference"/>
+                        <field name="move_id" select="1" string="Number (Move)"/>
+                        <field name="name" select="1"/>
                         <field name="account_id" select='1'/>
                         <field name="partner_id" select='1'>
                             <filter help="Next Partner Entries to reconcile" name="next_partner" string="Next Partner to reconcile" context="{'next_partner_only': 1}" icon="terp-partner" domain="[('account_id.reconcile','=',True),('reconcile_id','=',False)]"/>
                         </field>
-                        <field name="balance" string="Debit/Credit" select='1'/>
                     </group>
                     <newline/>
                     <group col="10" colspan="4">
-                        <field name="journal_id" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
-                        <field name="period_id" widget="selection" context="{'period_id':self}"/>
+                        <field name="journal_id" required="1" widget="selection" context="{'journal_id':self, 'visible_id':self or 0, 'normal_view':False}"/>
+                        <field name="period_id" required="1" widget="selection" context="{'period_id':self}"/>
+                        <separator orientation="vertical"/>
+                        <field name="narration" select="1"/>
+                        <field name="date" select='1'/>
+                        <field name="balance" string="Debit/Credit" select='1'/>
                     </group>
                 </search>
             </field>
@@ -1020,28 +1094,55 @@
             <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
 
+        <record id="action_move_line_select" model="ir.actions.act_window">
+            <field name="name">Journal Items</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_line_tree"/>
+            <field name="search_view_id" ref="view_account_move_line_filter"/>
+            <field name="domain">[('account_id', 'child_of', active_id)]</field>
+        </record>
+        
+        <record id="ir_account_move_line_select" model="ir.values">
+            <field name="key2">tree_but_open</field>
+            <field name="model">account.account</field>
+            <field name="name">Open Journal Items</field>
+            <field eval="'ir.actions.act_window,%d'%action_move_line_select" name="value"/>
+            <field eval="True" name="object"/>
+        </record>
         <!--
     Account.Entry Edition
     -->
 
+        <record id="account_move_graph" model="ir.ui.view">
+            <field name="name">account.move.graph</field>
+            <field name="model">account.move</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Account Statistics" type="bar">
+                    <field name="period_id"/>
+                    <field name="amount" operator="+"/>
+                </graph>
+            </field>
+         </record>
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Account Entry">
+                <tree colors="blue:state in ('draft');black:state in ('posted')" string="Account Entry">
                     <field name="name"/>
                     <field name="date"/>
                     <field name="ref"/>
                     <field name="journal_id"/>
                     <field name="period_id"/>
-                    <field name="type" invisible=" not context.get('set_visible',True)"/>
                     <field name="partner_id"/>
                     <field name="line_id"/>
                     <field name="to_check" groups="base.group_extended"/>
-                    <field name="amount"/>
+                    <field name="amount" sum="Total Amount"/>
                     <field name="state"/>
-                    <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
+                    <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
                 </tree>
             </field>
         </record>
@@ -1053,40 +1154,90 @@
                 <form string="Journal Entries">
                     <group colspan="4" col="6">
                         <field name="name" select="1" readonly="True"/>
+                        <field name="ref" select="1"/>
+                        <field name="to_check" groups="base.group_extended"/>
                         <field name="journal_id" select="1"/>
                         <field name="period_id"/>
-                        <field name="type"/>
-                        <field name="ref" select="1"/>
                         <field name="date" select="1"/>
+                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+                        <field name="partner_id" invisible="1" select="1"/>
+                        <field name="amount" invisible="1" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Journal Entries Lines">
-                            <field colspan="4" height="200" name="line_id" nolabel="1" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
+                            <field colspan="4" name="line_id" nolabel="1" height="250" widget="one2many_list" default_get="{'lines':line_id ,'journal':journal_id }">
                                 <form string="Account Entry Line">
-                                    <separator colspan="4" string="General Information"/>
-                                    <field name="name" select="1"/>
-                                    <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
-                                    <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,parent.date,parent.journal_id)"/>
+                                    <group col="6" colspan="4">
+                                        <field name="name" select="1"/>
+                                        <field name="ref"/>
+                                        <field name="partner_id" select="1" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                                        
+                                        <field name="journal_id"/>
+                                        <field name="period_id"/>
+                                        <field name="company_id" required="1" groups="base.group_multi_company"/>
+                                    </group>
+                                    <notebook colspan="4">
+                                        <page string="Information">
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Amount"/>
+                                                <field name="account_id" select="1" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                                <field name="debit"/>
+                                                <field name="credit"/>
+                                                <field name="quantity"/>
+                                            </group>
+                                            
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Accounting Documents"/>
+                                                <field name="invoice"/>
+                                                <field name="move_id" required="False"/>
+                                                <field name="statement_id"/>
+                                            </group>
 
-                                    <field name="debit" select="1"/>
-                                    <field name="credit" select="1"/>
-                                    <field name="date" select="1"/>
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Dates"/>
+                                                <field name="date" select="1"/>
+                                                <field name="date_maturity"/>
+                                                <field name="date_created"/>
+                                            </group>
+                                            
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Taxes"/>
+                                                <field name="tax_code_id"/>
+                                                <field name="tax_amount"/>
+                                                <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                                            </group>
+                                            
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Currency"/>
+                                                <field name="currency_id"/>
+                                                <field name="amount_currency"/>
+                                            </group>
 
-                                    <separator colspan="4" string="Optional Information"/>
-                                    <field name="currency_id"/>
-                                    <field name="amount_currency"/>
-                                    <field name="quantity" select="1"/>
-                                    <newline/>
-                                    <field name="date_maturity"/>
-                                    <field name="date_created"/>
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Reconciliation"/>
+                                                <field name="reconcile_id"/>
+                                                <field name="reconcile_partial_id"/>
+                                            </group>
 
-                                    <separator colspan="4" string="State"/>
-                                    <field name="reconcile_id"/>
-                                    <field name="reconcile_partial_id"/>
-                                    <field name="statement_id"/>
-                                    <field name="state"/>
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="States"/>
+                                                <field name="state"/>
+                                                <field name="blocked"/>
+                                            </group>
+                                            
+                                            <group col="2" colspan="2">
+                                                <separator colspan="2" string="Analytic"/>
+                                                <field name="analytic_account_id"/>
+                                            </group>
+                                            <separator string="Narration" colspan="4"/>
+                                            <field name="narration" colspan="4" nolabel="1"/>
+                                        </page>
+                                        <page string="Analytic Lines">
+                                            <field colspan="4" name="analytic_lines" nolabel="1" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+                                        </page>
+                                    </notebook>
                                 </form>
-                                <tree editable="top" string="Account Entry Line">
+                                <tree colors="blue:state in ('draft');black:state in ('posted')" editable="top" string="Account Entry Line">
                                     <field name="ref"/>
                                     <field name="invoice"/>
                                     <field name="name"/>
@@ -1106,20 +1257,13 @@
                                 </tree>
                             </field>
                             <separator colspan="4" string="Narration"/>
-                            <field name="narration" colspan="4" nolabel="1"/>
-                            <field name="state" select="1"/>
-                            <group col="2" colspan="2">
-                                <button name="button_validate" states="draft" string="Validate" type="object" icon="terp-camera_test"/>
+                            <field name="narration" colspan="4" nolabel="1" height="50"/>
+                            <group col="4" colspan="4">
+                                <field name="state" select="1"/>
+                                <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
                                 <button name="button_cancel" states="posted" string="Cancel" type="object" icon="terp-gtk-stop"/>
                             </group>
                         </page>
-                        <page string="Other Information">
-                            <field name="company_id" required="1" groups="base.group_multi_company"/>
-                            <field name="date" select="1" groups="base.group_extended"/>
-                            <field name="to_check" groups="base.group_extended"/>
-                            <field name="partner_id" invisible="1" select="1"/>
-                            <field name="amount" invisible="1" select="1"/>
-                        </page>
                     </notebook>
                 </form>
             </field>
@@ -1135,29 +1279,37 @@
                         <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Entries"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Entries"/>
                         <separator orientation="vertical"/>
-                        <filter icon="terp-camera_test" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
+                        <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('to_check','=',True)]" groups="base.group_extended" help="To Review"/>
+                        <separator orientation="vertical"/>
+                        <field name="ref" select="1"/>
+                        <field name="name" select="1"/>
+                        <field name="partner_id" select='1'/>   
                         <field name="date" select='1'/>
-                        <field name="name" select='1'/>
-                        <field name="journal_id" select='1'/>
-                        <field name="partner_id" select='1'/>
+                        <field name="narration" select="1"/>
+                    </group>
+                    <newline/>
+                    <group col='8' colspan='4'>
+                        <field name="journal_id" widget="selection" select='1'/>
+                        <field name="period_id" select='1'/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="12" col="10">
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
                         <filter string="Period" icon="terp-go-month" domain="[]" context="{'group_by':'period_id'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type', 'set_visible':True}"/>
                         <filter string="States" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+
+                        <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
                     </group>
                 </search>
             </field>
         </record>
 
-
-       <record id="action_move_journal_line" model="ir.actions.act_window">
+        <record id="action_move_journal_line" model="ir.actions.act_window">
             <field name="name">Journal Entries</field>
             <field name="res_model">account.move</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
@@ -1186,22 +1338,21 @@
             res_model="account.move.line"
             src_model="account.move"/>
 
-        <record id="action_move_to_review" model="ir.actions.act_window">
-            <field name="name">Journal Entries</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">account.move</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_move_tree"/>
-            <field name="search_view_id" ref="view_account_move_filter"/>
-            <field name="domain">[('to_check','=',True), ('state','=','draft')]</field>
-        </record>
-        
-        <menuitem 
-            action="action_move_to_review" 
-            id="menu_action_move_to_review" 
-            parent="periodical_processing_journal_entries_validation"
-        />
-        
+<!--        <record id="action_move_to_review" model="ir.actions.act_window">-->
+<!--            <field name="name">Journal Entries</field>-->
+<!--            <field name="type">ir.actions.act_window</field>-->
+<!--            <field name="res_model">account.move</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_id" ref="view_move_tree"/>-->
+<!--            <field name="search_view_id" ref="view_account_move_filter"/>-->
+<!--            <field name="domain">[('to_check','=',True), ('state','=','draft')]</field>-->
+<!--        </record>-->
+<!--        <menuitem-->
+<!--            action="action_move_to_review"-->
+<!--            id="menu_action_move_to_review"-->
+<!--            parent="periodical_processing_journal_entries_validation"-->
+<!--        />-->
+
 <!--        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
 <!--        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
 
@@ -1220,7 +1371,7 @@
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="domain">[('journal_id.type', 'in', ['sale', 'purchase_refund'])]</field>
@@ -1232,11 +1383,10 @@
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
             <field name="domain">[('journal_id.type', 'in', ['purchase', 'sale_refund'])]</field>
-            <field name="context">{'journal_id':1}</field>
         </record>
 
         <menuitem action="action_account_moves_purchase" id="menu_eaction_account_moves_purchase" parent="menu_finance_payables"/>
@@ -1401,7 +1551,7 @@
             <field name="model">account.journal.period</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Journals">
+                <tree colors="blue:state in ('draft');gray:state in ('done');black:state in ('printed')" string="Journals">
                     <field icon="icon" name="fiscalyear_id"/>
                     <field name="period_id"/>
                     <field name="journal_id"/>
@@ -1414,6 +1564,7 @@
             <field name="name">Journals</field>
             <field name="res_model">account.journal.period</field>
             <field name="view_type">tree</field>
+            <field name="help">You can look up individual account entries by searching for useful information. To search for account entries, open a journal, then select a record line.</field>
         </record>
         <menuitem action="action_account_journal_period_tree" id="menu_action_account_journal_period_tree" parent="account.menu_finance_generic_reporting" sequence="2"/>
 
@@ -1493,7 +1644,7 @@
             </field>
         </record>
         <record id="action_model_form" model="ir.actions.act_window">
-            <field name="name">Define Recurring</field>
+            <field name="name">Recurring Models</field>
             <field name="res_model">account.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -1615,7 +1766,7 @@
             <field name="model">account.subscription</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Entry Subscription">
+                <tree colors="blue:state in ('draft');gray:state in ('done');black:state in ('running')" string="Entry Subscription">
                     <field name="ref"/>
                     <field name="name"/>
                     <field name="date_start"/>
@@ -1717,7 +1868,7 @@
             <field name="type">tree</field>
             <field eval="4" name="priority"/>
             <field name="arch" type="xml">
-                <tree string="Account Entry Line">
+                <tree colors="blue:state in ('draft');black:state in ('valid')" string="Account Entry Line">
                     <field name="date"/>
                     <field name="move_id"/>
                     <field name="statement_id" string="St."/>
@@ -1741,7 +1892,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_line_tax_tree"/>
-            <field name="domain">[('tax_code_id','=',active_id),('state','&lt;&gt;','draft')]</field>
+            <field name="domain">[('tax_code_id','child_of',active_id),('state','&lt;&gt;','draft')]</field>
         </record>
         <record id="ir_open_tax_move_line" model="ir.values">
             <field name="key2">tree_but_open</field>
@@ -1758,11 +1909,11 @@
 
         <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_bank_statement" name="Bank statements" res_model="account.bank.statement" src_model="account.journal"/>
 
-        <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Entry lines" res_model="account.move.line" src_model="account.journal"/>
+        <act_window domain="[('journal_id', '=', active_id)]" id="act_account_journal_2_account_move_line" name="Journal Items" res_model="account.move.line" src_model="account.journal"/>
 
-        <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
+        <act_window context="{'search_default_reconcile_id':False}" domain="[('partner_id', '=', active_id),('reconcile_id','=',False),('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
-        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
+        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="Journal Items" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Create Account</field>
@@ -2252,7 +2403,7 @@
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,graph</field>
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
@@ -2266,23 +2417,22 @@
         />
 
         <!-- Cash Statement -->
-        <record id="view_bank_statement_tree" model="ir.ui.view">
+        <record id="view_cash_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open');blue:state in ('draft')" string="Statement">
-                    <field name="date"/>
+                <tree colors="red:balance_end_real!=balance_end;blue:state=='draft' and (balance_end_real==balance_end);black:state in ('open')" string="Statement">
                     <field name="name"/>
-                    <field name="journal_id"/>
+                    <field name="date"/>
                     <field name="period_id"/>
+                    <field name="journal_id"/>
                     <field name="balance_start"/>
                     <field name="balance_end_real"/>
                     <field name="balance_end"/>
-                        <field name="user_id" select="1"/>
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
-                    <button type="object" string="Confirm" name="button_confirm_cash" states="open" icon="terp-gtk-go-back-rtl"/>
+                    <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
                     <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
                 </tree>
             </field>
@@ -2334,7 +2484,7 @@
                         </page>
                         <page string="CashBox">
                             <group col="2" colspan="2" expand="1">
-                                <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+                                <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','draft')]}">
                                     <tree string = "Opening Balance" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
@@ -2348,7 +2498,7 @@
                                 </field>
                             </group>
                             <group col="2" colspan="2" expand="1">
-                                <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
+                                <field name="ending_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','!=','open')]}">
                                     <tree string = "Closing Balance" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number" on_change="on_change_sub(pieces,number, parent.balance_end)"/>
@@ -2369,7 +2519,7 @@
                     <group col="6" colspan="4">
                         <group col="2" colspan="2">
                             <separator string="Dates" colspan="4"/>
-                            <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"/>
+                            <field name="date" select="1" attrs="{'readonly':[('state','!=','draft')]}"  on_change="onchange_date(date)"/>
                             <field name="closing_date" select="1" attrs="{'readonly':[('state','=','confirm')]}"/>
                         </group>
                         <group col="2" colspan="2">
@@ -2392,20 +2542,32 @@
                 </form>
             </field>
         </record>
+        <record id="account_cash_statement_graph" model="ir.ui.view">
+            <field name="name">account.bank.statement.graph</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Account Statistics" type="bar">
+                    <field name="date"/>
+                    <field name="balance_start" operator="+"/>
+                    <field name="balance_end" operator="+"/>
+                </graph>
+            </field>
+         </record>
         <record id="action_view_bank_statement_tree" model="ir.actions.act_window">
             <field name="name">Cash Register</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.bank.statement</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="view_id" ref="view_cash_statement_tree"/>
             <field name="search_view_id" ref="view_account_bank_statement_filter"/>
             <field name="domain">[('journal_id.type', '=', 'cash')]</field>
         </record>
         <record model="ir.actions.act_window.view" id="act_cash_statement1_all">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="view_id" ref="view_cash_statement_tree"/>
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
         <record model="ir.actions.act_window.view" id="act_cash_statement2_all">
@@ -2414,6 +2576,12 @@
             <field name="view_id" ref="view_bank_statement_form2"/>
             <field name="act_window_id" ref="action_view_bank_statement_tree"/>
         </record>
+        <record model="ir.actions.act_window.view" id="act_cash_statement3_all">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="account_cash_statement_graph"/>
+            <field name="act_window_id" ref="action_view_bank_statement_tree"/>
+        </record>
         <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
 
     </data>

addons/account/board_account_view.xml

@@ -29,7 +29,7 @@
                 <form string="Account Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                         </child1>
                         <child2>
                             <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
@@ -49,7 +49,7 @@
             <field name="view_id" ref="board_account_form"/>
         </record>
 
-        <menuitem icon="terp-graph" id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting"/>
+        <menuitem id="menu_dashboard_acc" name="Dashboard" sequence="2" parent="account.menu_finance_reporting"/>
         <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="menu_dashboard_acc" sequence="1"/>
     </data>
 </openerp>

addons/account/data/account_data2.xml

@@ -74,12 +74,6 @@
             <field name="field">credit</field>
             <field eval="11" name="sequence"/>
         </record>
-        <record id="bank_col12" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Analytic Account</field>
-            <field name="field">analytic_account_id</field>
-            <field eval="13" 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>

addons/account/demo/account_minimal.xml

@@ -62,92 +62,235 @@
         <!--
         Chart of Account
         -->
-        <record id="minimal_0" model="account.account">
-            <field name="code">x 0</field>
+        
+        <record id="chart0" model="account.account">
+            <field name="code">X0</field>
             <field name="name">Chart For Automated Tests</field>
-            <field eval="False" name="parent_id"/>
+            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own accounts.
-            </field>
             <field name="user_type" ref="account_type_root"/>
         </record>
-        <record id="a_recv" model="account.account">
-            <field name="name">Main Receivable</field>
-            <field name="code">x 40000</field>
-            <field name="type">receivable</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_receivable"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+
+        <!-- Balance Sheet -->
+
+        <record id="bal" model="account.account">
+            <field name="code">X1</field>
+            <field name="name">Balance Sheet - (test)</field>
+            <field ref="chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_root"/>
         </record>
-        <record id="a_pay" model="account.account">
-            <field name="name">Main Payable</field>
-            <field name="code">x 44000</field>
-            <field name="type">payable</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field eval="True" name="reconcile"/>
-            <field name="user_type" ref="account_type_payable"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+        
+        <record model="account.account" id="assets_view">
+            <field name="name">Assets - (test)</field>
+            <field name="code">X10</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
-        <record id="cash" model="account.account">
-            <field name="name">Petty Cash</field>
-            <field name="code">x 57000</field>
-            <field name="type">other</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="user_type" ref="account_type_cash_moves"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+        
+        <record model="account.account" id="liabilities_view">
+            <field name="name">Liabilities - (test)</field>
+            <field name="code">X11</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="bal"/>
         </record>
-        <record id="a_expense" model="account.account">
-            <field name="name">Products Purchase</field>
-            <field name="code">x 60000</field>
-            <field name="type">other</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="user_type" ref="account_type_expense"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
-        </record>
-        <record id="a_sale" model="account.account">
-            <field name="name">Products Sales</field>
-            <field name="code">x 70000</field>
-            <field name="type">other</field>
-            <field eval="ref('minimal_0')" name="parent_id"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="user_type" ref="account_type_income"/>
-            <field name="note">
-This chart of account is used for automated testing purpose. It is installed
-only if you selected demo data during your database creation. Modules can
-do black box testing on entries on this chart of account, without modifying
-your own chart of account.
-</field>
+            
+        <record id="fas" model="account.account">
+            <field name="code">X100</field>
+            <field name="name">Fixed Assets - (test)</field>
+            <field ref="assets_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
         </record>
 
+        <record id="xfa" model="account.account">
+            <field name="code">X1000</field>
+            <field name="name">Fixed Asset Account - (test)</field>
+            <field ref="fas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="nca" model="account.account">
+            <field name="code">X101</field>
+            <field name="name">Net Current Assets - (test)</field>
+            <field ref="assets_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="cas" model="account.account">
+            <field name="code">X1100</field>
+            <field name="name">Current Assets - (test)</field>
+            <field ref="nca" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="stk" model="account.account">
+            <field name="code">X11001</field>
+            <field name="name">Purchased Stocks - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="a_recv" model="account.account">
+            <field name="code">X11002</field>
+            <field name="name">Debtors - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">receivable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account_type_receivable"/>
+        </record>
+
+        <record id="ova" model="account.account">
+            <field name="code">X11003</field>
+            <field name="name">Output VAT - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_receivable"/>
+        </record>
+
+        <record id="bnk" model="account.account">
+            <field name="code">X11004</field>
+            <field name="name">Bank Current Account - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="cash" model="account.account">
+            <field name="code">X11005</field>
+            <field name="name">Cash - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_asset"/>
+        </record>
+
+        <record id="cli" model="account.account">
+            <field name="code">X110</field>
+            <field name="name">Current Liabilities - (test)</field>
+            <field ref="liabilities_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_liability"/>
+        </record>
+
+        <record id="a_pay" model="account.account">
+            <field name="code">X1111</field>
+            <field name="name">Creditors - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">payable</field>
+            <field eval="True" name="reconcile"/>
+            <field name="user_type" ref="account_type_payable"/>
+        </record>
+
+        <record id="iva" model="account.account">
+            <field name="code">X1112</field>
+            <field name="name">Input VAT - (test)</field>
+            <field ref="cli" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_payable"/>
+        </record>
+
+        <!-- Profit and Loss -->
+
+        <record id="gpf" model="account.account">
+            <field name="code">X2</field>
+            <field name="name">Profit and Loss - (test)</field>
+            <field ref="chart0" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_root"/>
+        </record>
+        
+        <record model="account.account" id="income_view">
+            <field name="name">Income - (test)</field>
+            <field name="code">X20</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+        
+        <record model="account.account" id="income_fx_income">
+            <field name="name">Foreign Exchange Gain - (test)</field>
+            <field name="code">X201</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="income_view"/>
+        </record>
+        
+        <record model="account.account" id="expense_view">
+            <field name="name">Expense - (test)</field>
+            <field name="code">X21</field>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="gpf"/>
+        </record>
+        
+        <record id="rev" model="account.account">
+            <field name="code">X200</field>        
+            <field name="name">Revenue - (test)</field>
+            <field ref="income_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_income"/>
+        </record>
+
+        <record id="a_sale" model="account.account">
+            <field name="code">X2001</field>
+            <field name="name">Product Sales - (test)</field>
+            <field ref="rev" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_income"/>
+        </record>
+
+        <record id="cos" model="account.account">
+            <field name="code">X210</field>
+            <field name="name">Cost of Sales - (test)</field>
+            <field ref="expense_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
+        <record id="cog" model="account.account">
+            <field name="code">X2100</field>
+            <field name="name">Cost of Goods Sold - (test)</field>
+            <field ref="cos" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
+        <record id="ovr" model="account.account">
+            <field name="code">X211</field>
+            <field name="name">Overheads - (test)</field>
+            <field ref="expense_view" name="parent_id"/>
+            <field name="type">view</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+
+        <record id="a_expense" model="account.account">
+            <field name="code">X2110</field>
+            <field name="name">Expenses - (test)</field>
+            <field ref="ovr" name="parent_id"/>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+        </record>
+        
+        <record model="account.account" id="income_fx_expense">
+            <field name="name">Foreign Exchange Loss - (test)</field>
+            <field name="code">X2111</field>
+            <field name="type">other</field>
+            <field name="user_type" ref="account_type_expense"/>
+            <field name="reconcile" eval="False"/>
+            <field name="parent_id" ref="ovr"/>
+        </record>
+        
         <!-- Properties -->
         <record forcecreate="True" id="property_account_receivable" model="ir.property">
             <field name="name">property_account_receivable</field>
@@ -174,7 +317,7 @@ your own chart of account.
         -->
 
         <record id="sales_journal" model="account.journal">
-            <field name="name">x Sales Journal</field>
+            <field name="name">Sales Journal - (test)</field>
             <field name="code">SAJ</field>
             <field name="type">sale</field>
             <field name="view_id" ref="account_sp_journal_view"/>
@@ -185,7 +328,7 @@ your own chart of account.
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="refund_sales_journal" model="account.journal">
-            <field name="name">x Sales Credit Note Journal</field>
+            <field name="name">Sales Credit Note Journal - (test)</field>
             <field name="code">SCNJ</field>
             <field name="type">sale_refund</field>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -196,7 +339,7 @@ your own chart of account.
         </record>
 
         <record id="expenses_journal" model="account.journal">
-            <field name="name">x Expenses Journal</field>
+            <field name="name">Expenses Journal - (test)</field>
             <field name="code">EXJ</field>
             <field name="type">purchase</field>
             <field name="view_id" ref="account_sp_journal_view"/>
@@ -207,7 +350,7 @@ your own chart of account.
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="refund_expenses_journal" model="account.journal">
-            <field name="name">x Expenses Credit Notes Journal</field>
+            <field name="name">Expenses Credit Notes Journal - (test)</field>
             <field name="code">ECNJ</field>
             <field name="type">purchase_refund</field>
             <field name="view_id" ref="account_sp_refund_journal_view"/>
@@ -218,7 +361,7 @@ your own chart of account.
         </record>
 
         <record id="bank_journal" model="account.journal">
-            <field name="name">x Bank Journal</field>
+            <field name="name">Bank Journal - (test)</field>
             <field name="code">BNK</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
@@ -228,7 +371,7 @@ your own chart of account.
             <field name="user_id" ref="base.user_root"/>
         </record>
         <record id="check_journal" model="account.journal">
-            <field name="name">x Checks Journal</field>
+            <field name="name">Checks Journal - (test)</field>
             <field name="code">CHK</field>
             <field name="type">cash</field>
             <field name="view_id" ref="account_journal_bank_view"/>
@@ -242,18 +385,18 @@ your own chart of account.
         Product income and expense accounts, default parameters
         -->
 
-        <record id="property_account_expense_prd" model="ir.property">
-            <field name="name">property_account_expense</field>
-            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>
-            <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-        <record id="property_account_income_prd" model="ir.property">
-            <field name="name">property_account_income</field>
-            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>
-            <field eval="'account.account,'+str(ref('account.a_sale'))" name="value"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
+<!--        <record id="property_account_expense_prd" model="ir.property">-->
+<!--            <field name="name">property_account_expense</field>-->
+<!--            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_expense')]"/>-->
+<!--            <field eval="'account.account,'+str(ref('account.a_expense'))" name="value"/>-->
+<!--            <field name="company_id" ref="base.main_company"/>-->
+<!--        </record>-->
+<!--        <record id="property_account_income_prd" model="ir.property">-->
+<!--            <field name="name">property_account_income</field>-->
+<!--            <field name="fields_id" search="[('model','=','product.template'),('name','=','property_account_income')]"/>-->
+<!--            <field eval="'account.account,'+str(ref('account.a_sale'))" name="value"/>-->
+<!--            <field name="company_id" ref="base.main_company"/>-->
+<!--        </record>-->
         <record id="property_account_expense_categ" model="ir.property">
             <field name="name">property_account_expense_categ</field>
             <field name="fields_id" search="[('model','=','product.category'),('name','=','property_account_expense_categ')]"/>

addons/account/i18n/es.po

@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-29 22:11+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
+"PO-Revision-Date: 2010-07-26 17:47+0000\n"
+"Last-Translator: Albert Cervera i Areny - http://www.NaN-tic.com <albert@nan-"
+"tic.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-01 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-07-27 03:58+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -55,7 +56,7 @@ msgstr "Activo"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nombre de modelo inválido en la definición de acción."
+msgstr "Nombre de modelo no válido en la definición de la acción."
 
 #. module: account
 #: help:account.journal,currency:0
@@ -193,8 +194,6 @@ msgstr "Seleccionar línea movimineto"
 #. module: account
 #: rml:account.journal.period.print:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Ref. asiento"
 
@@ -218,7 +217,7 @@ msgstr "Código para calcular (si tipo=código)"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr "Línea del asiento contable"
+msgstr "Apunte"
 
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
@@ -239,7 +238,6 @@ msgstr "Asientos recurrentes"
 #: field:account.move,amount:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Importe"
 
@@ -308,7 +306,6 @@ msgstr "Pagos fuera de plazo"
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -348,6 +345,7 @@ msgid "Delta Debit"
 msgstr "Diferencia debe"
 
 #. module: account
+#: model:account.account.type,name:account.account_type_tax
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -362,7 +360,9 @@ msgstr "Trans. debe"
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Cuenta analítica"
@@ -686,8 +686,11 @@ msgstr "Subtotal :"
 #. module: account
 #: field:account.analytic.account,line_ids:0
 #: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Asientos analíticos"
 
@@ -702,6 +705,7 @@ msgid "Associated Partner"
 msgstr "Empresa asociada"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Información adicional"
@@ -1018,7 +1022,7 @@ msgstr "Contabilidad financiera"
 #. module: account
 #: rml:account.invoice:0
 msgid "Net Total:"
-msgstr "Total neto:"
+msgstr "Base:"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -1486,6 +1490,9 @@ msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr "Desajuste"
 
@@ -1896,7 +1903,6 @@ msgstr "x Diario facturas rectificativas (abono) de gastos"
 #: field:account.journal,type:0
 #: field:account.move,type:0
 #: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -2094,7 +2100,7 @@ msgstr "Gasto"
 #. module: account
 #: field:account.journal,invoice_sequence_id:0
 msgid "Invoice Sequence"
-msgstr "factura de secuencia"
+msgstr "Secuencia de facturas"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
@@ -2109,7 +2115,7 @@ msgstr "Proceso de factura de cliente"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "Comentario situacion fiscal"
+msgstr "Observación posición fiscal :"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -2340,13 +2346,13 @@ msgstr "La cuenta base de la declaración de impuestos."
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 #: rml:account.journal.period.print:0
 #: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
 #: field:account.subscription.line,date:0
 #: rml:account.tax.code.entries:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
 msgid "Date"
 msgstr "Fecha"
 
@@ -2467,10 +2473,11 @@ msgstr "Fecha final"
 #: view:account.bank.statement:0
 #: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr "Líneas de asiento"
+msgstr "Apuntes"
 
 #. module: account
 #: view:account.tax:0
@@ -2660,6 +2667,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2768,6 +2777,7 @@ msgid "Invoice Number"
 msgstr "Número factura"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr "Fin de período"
@@ -2780,7 +2790,7 @@ msgstr "_Aceptar"
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 msgid "Untaxed"
-msgstr "Sin impuestos"
+msgstr "Base"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
@@ -2954,8 +2964,6 @@ msgstr "Nombre completo de la cuenta"
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr "1cm 27.7cm 20cm 27.7cm"
@@ -3005,16 +3013,18 @@ msgstr "Conciliación de asientos de órdenes de pago."
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
 #: model:ir.model,name:account.model_account_move_line
 msgid "Entry lines"
-msgstr "Líneas de asiento"
+msgstr "Apuntes"
 
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Conciliación"
 
@@ -3077,7 +3087,6 @@ msgstr "Situación"
 
 #. module: account
 #: rml:account.invoice:0
-#: xsl:account.transfer:0
 msgid "Document"
 msgstr "Documento"
 
@@ -3127,6 +3136,8 @@ msgstr "Diario analítico"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr "Etiqueta asiento"
 
@@ -3319,6 +3330,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr "Generar asientos apertura ejercicio fiscal"
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Conciliar los asientos"
@@ -3676,7 +3688,6 @@ msgstr ""
 "empresa actual."
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr "Descripción"
@@ -4146,8 +4157,8 @@ msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
 msgstr ""
-"Marque esta opción para señalar la línea de asiento en desacuerdo con la "
-"empresa asociada"
+"Marque esta opción para señalar el apunte en desacuerdo con la empresa "
+"asociada"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4285,7 +4296,7 @@ msgid ""
 "date for the payment of this entry line."
 msgstr ""
 "Este campo es usado en asientos a pagar y a cobrar. Puede definir la fecha "
-"límite de pago para esta línea de asiento."
+"límite de pago para este apunte."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -5031,6 +5042,7 @@ msgid "Invoice Lines"
 msgstr "Líneas de factura"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr "Inicio del periodo"
@@ -5391,7 +5403,7 @@ msgstr "PRO-FORMA"
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "Líneas de asiento parcial"
+msgstr "Apuntes de conciliación parcial"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5427,8 +5439,6 @@ msgstr "Proceso factura de proveedor"
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
 msgstr "Página"
@@ -5514,7 +5524,6 @@ msgstr "Número de periodos"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5708,7 +5717,6 @@ msgstr "Ejercicio fiscal a cerrar"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -6258,7 +6266,7 @@ msgid "Show Comparision in %"
 msgstr "Mostrar comparación en %"
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
 msgstr "Seleccionar periodo"
 
@@ -6435,5 +6443,324 @@ msgstr "A cobrar anteriores"
 msgid "Untaxed Amount"
 msgstr "Base imponible"
 
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "¡Error de integridad!"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "¡Debe indicar una cuenta para el asiento de ajuste!"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "¡Atención!"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "¡No puede eliminar el movimiento fijado: \"%s\"!"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "¡No diario analítico!"
+
+#, python-format
+#~ msgid "Bank Journal "
+#~ msgstr "Diario bancario "
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "¡No puede usar esta cuenta general en este diario!"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "No puede añadir/modificar asientos en un diario cerrado."
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "¡No puede hacer esta modificación en un asiento conciliado! ¡Observe que "
+#~ "sólo puede cambiar algunos campos no importantes!"
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "¡Primero debe seleccionar una empresa!"
+
+#, python-format
+#~ msgid "The opening journal must not have any entry in the new fiscal year !"
+#~ msgstr ""
+#~ "¡El diario de apertura no debe tener ningún asiento en el nuevo ejercicio "
+#~ "fiscal!"
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.asistente"
+
+#, python-format
+#~ msgid ""
+#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
+#~ msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a confirmed entry ! Please note that you "
+#~ "can just change some non important fields !"
+#~ msgstr ""
+#~ "¡No puede hacer esta modificación en un asiento confirmado! ¡Observe que "
+#~ "sólo puede cambiar algunos campos no importantes!"
+
+#, python-format
+#~ msgid "Purchase Journal"
+#~ msgstr "Diario de compras"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Referencia libre"
+
+#, python-format
+#~ msgid "No Partner Defined !"
+#~ msgstr "¡No se ha definido empresa!"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "¡Asientos no son de la misma cuenta o ya están conciliados! "
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "¡Acción no válida!"
+
+#, python-format
+#~ msgid "No sequence defined in the journal !"
+#~ msgstr "¡No se ha definido una secuencia en el diario!"
+
+#, python-format
+#~ msgid "Your journal must have a default credit and debit account."
+#~ msgstr "El diario debe tener una cuenta haber y debe por defecto."
+
+#, python-format
+#~ msgid "The journal must have default credit and debit account"
+#~ msgstr "El diario debe tener una cuenta haber y debe por defecto."
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "¡Algunos asientos ya están conciliados!"
+
+#, python-format
+#~ msgid "No Analytic Journal !"
+#~ msgstr "¡No diario analítico!"
+
+#, python-format
+#~ msgid "Already Reconciled"
+#~ msgstr "Ya conciliado"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Las líneas de los asientos contables no están en estado válido."
+
+#, python-format
+#~ msgid "Unable to reconcile entry \"%s\": %.2f"
+#~ msgstr "No es posible conciliar el asiento \"%s\": %.2f"
+
+#, python-format
+#~ msgid "Please set an analytic journal on this financial journal !"
+#~ msgstr "¡Por favor indique un diario analítico en este diario financiero!"
+
+#, python-format
+#~ msgid "EXJ"
+#~ msgstr "GASTO"
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Diario de ventas"
+
+#, python-format
+#~ msgid "BNK"
+#~ msgstr "BANCO"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Asientos: "
+
+#, python-format
+#~ msgid "Couldn't create move between different companies"
+#~ msgstr "No se ha podido crear movimiento entre diferentes compañías"
+
+#, python-format
+#~ msgid "Entry \"%s\" is not valid !"
+#~ msgstr "¡El asiento \"%s\" no es válido!"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
+#, python-format
+#~ msgid "SAJ"
+#~ msgstr "VENTA"
+
+#, python-format
+#~ msgid "The journal must have centralised counterpart"
+#~ msgstr "El diario debe tener un homólogo centralizado"
+
+#, python-format
+#~ msgid "Bad total !"
+#~ msgstr "¡Total erróneo!"
+
+#, python-format
+#~ msgid "End of Fiscal Year Entry"
+#~ msgstr "Asiento fin de ejercicio fiscal"
+
+#, python-format
+#~ msgid "UserError"
+#~ msgstr "Error de usuario"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Aviso"
+
+#, python-format
+#~ msgid "Please verify that an account is defined in the journal."
+#~ msgstr "Compruebe que se ha definido una cuenta en el diario."
+
+#, python-format
+#~ msgid "You can not use an inactive account!"
+#~ msgstr "¡No puede utilizar una cuenta inactiva!"
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "El asiento ya está conciliado"
+
+#, python-format
+#~ msgid ""
+#~ "Selected Move lines does not have any account move enties in draft state"
+#~ msgstr ""
+#~ "Ha seleccionado apuntes que no tienen ningún asiento contable en estado "
+#~ "borrador"
+
+#, python-format
+#~ msgid "Standard Encoding"
+#~ msgstr "Codificación estándar"
+
+#, python-format
+#~ msgid "Bad account!"
+#~ msgstr "¡Cuenta incorrecta!"
+
+#, python-format
+#~ msgid "Closing of fiscal year cancelled, please check the box !"
+#~ msgstr "¡Cierre del ejercicio fiscal cancelado, por favor marque la caja!"
+
+#, python-format
+#~ msgid "Bad account !"
+#~ msgstr "¡Cuenta incorrecta!"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#, python-format
+#~ msgid "Taxes missing !"
+#~ msgstr "¡Faltan impuestos!"
+
+#, python-format
+#~ msgid "No piece number !"
+#~ msgstr "¡Ningún trozo de número!"
+
+#, python-format
+#~ msgid "Closing of states cancelled, please check the box !"
+#~ msgstr "¡Cierre de estados cancelado, por favor marque la caja!"
+
+#, python-format
+#~ msgid "You have to define an analytic journal on the '%s' journal!"
+#~ msgstr "¡Debe definir un diario analítico en el diario '%s'!"
+
+#, python-format
+#~ msgid "No Data Available"
+#~ msgstr "No hay datos disponibles"
+
+#, python-format
+#~ msgid "You must select accounts to reconcile"
+#~ msgstr "Debe seleccionar las cuentas a conciliar"
+
+#, python-format
+#~ msgid "Cannot delete invoice(s) that are already opened or paid !"
+#~ msgstr "¡No se puede eliminar factura(s) que ya estan abiertas o pagadas!"
+
+#, python-format
+#~ msgid "Unable to change tax !"
+#~ msgstr "¡No ha sido posible cambiar el impuesto!"
+
+#, python-format
+#~ msgid "Invoice is already reconciled"
+#~ msgstr "La factura ya está conciliada"
+
+#, python-format
+#~ msgid "Date to must be set between %s and %s"
+#~ msgstr "La fecha debe estar entre %s y %s"
+
+#, python-format
+#~ msgid "No records found for your selection!"
+#~ msgstr "¡No se han encontrado registros en su selección!"
+
+#, python-format
+#~ msgid "Data Insufficient !"
+#~ msgstr "¡Datos insuficientes!"
+
+#, python-format
+#~ msgid "Date not in a defined fiscal year"
+#~ msgstr "La fecha no está en un ejercicio fiscal definido"
+
+#, python-format
+#~ msgid "Can not pay draft/proforma/cancel invoice."
+#~ msgstr "No se puede pagar una factura borrador/proforma/cancelada."
+
+#, python-format
+#~ msgid "You must define an analytic journal of type '%s' !"
+#~ msgstr "¡Debe definir un diario analítico de tipo '%s'!"
+
+#, python-format
+#~ msgid "No journal for ending writing has been defined for the fiscal year"
+#~ msgstr ""
+#~ "No se ha definido un diario para el asiento de cierre para el ejercicio "
+#~ "fiscal"
+
+#, python-format
+#~ msgid "Can not %s draft/proforma/cancel invoice."
+#~ msgstr "No se puede %s factura borrador/proforma/cancelada."
+
+#, python-format
+#~ msgid "Cannot create invoice move on centralised journal"
+#~ msgstr "No se puede crear asiento factura en el diario centralizado"
+
+#, python-format
+#~ msgid ""
+#~ "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
+#~ "defined !"
+#~ msgstr ""
+#~ "¡El plazo de pago de los proveedores no tiene líneas de plazo de pago "
+#~ "(Cálculo) definidas!"
+
+#, python-format
+#~ msgid "You can not change the tax, you should remove and recreate lines !"
+#~ msgstr ""
+#~ "¡No se puede cambiar el impuesto, debe eliminar y recrear las líneas!"
+
+#, python-format
+#~ msgid "Global taxes defined, but are not in invoice lines !"
+#~ msgstr ""
+#~ "¡Impuestos globales definidos, pero no están en líneas de la factura!"
+
+#, python-format
+#~ msgid "No Period found on Invoice!"
+#~ msgstr "No se encontro un período en la factura"
+
+#, python-format
+#~ msgid "No period found !"
+#~ msgstr "¡No se ha encontrado período!"
+
+#, python-format
+#~ msgid "Unable to find a valid period !"
+#~ msgstr "¡No ha sido posible encontrar un período válido!"
+
+#, python-format
+#~ msgid "You must enter a period length that cannot be 0 or below !"
+#~ msgstr ""
+#~ "¡Debe introducir una duración del período que no puede ser 0 o inferior!"

addons/account/i18n/it.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-08 08:56+0000\n"
+"PO-Revision-Date: 2010-07-28 12:08+0000\n"
 "Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -193,8 +193,6 @@ msgstr "Seleziona la riga del movimento"
 #. module: account
 #: rml:account.journal.period.print:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "Inserisci etichetta"
 
@@ -239,7 +237,6 @@ msgstr "Voci ricorrenti"
 #: field:account.move,amount:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Importo"
 
@@ -309,7 +306,6 @@ msgstr "Ritardo Pagamenti"
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -349,11 +345,12 @@ msgid "Delta Debit"
 msgstr "Delta di Debito"
 
 #. module: account
+#: model:account.account.type,name:account.account_type_tax
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Tassa"
+msgstr "Imposte"
 
 #. module: account
 #: rml:account.general.journal:0
@@ -363,7 +360,9 @@ msgstr "Debito Trans."
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "Contabilità Analitica"
@@ -684,8 +683,11 @@ msgstr "Sub-totale"
 #. module: account
 #: field:account.analytic.account,line_ids:0
 #: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr "Voci analitiche"
 
@@ -700,6 +702,7 @@ msgid "Associated Partner"
 msgstr "Partner associato"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Informazioni Aggiuntive"
@@ -1473,6 +1476,9 @@ msgstr "Lasciare vuoto per usare il conto di ricavo"
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr ""
 
@@ -1879,7 +1885,6 @@ msgstr ""
 #: field:account.journal,type:0
 #: field:account.move,type:0
 #: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
 msgid "Type"
 msgstr "Tipo"
 
@@ -2315,13 +2320,13 @@ msgstr ""
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 #: rml:account.journal.period.print:0
 #: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
 #: field:account.subscription.line,date:0
 #: rml:account.tax.code.entries:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
 msgid "Date"
 msgstr "Data"
 
@@ -2438,6 +2443,7 @@ msgstr "Data fine"
 #: view:account.bank.statement:0
 #: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
@@ -2629,6 +2635,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2732,6 +2740,7 @@ msgid "Invoice Number"
 msgstr "Numero fattura"
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr ""
@@ -2915,8 +2924,6 @@ msgstr ""
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
@@ -2973,9 +2980,11 @@ msgstr "Righe movimento"
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr "Riconciliazione"
 
@@ -3035,7 +3044,6 @@ msgstr "Situazione"
 
 #. module: account
 #: rml:account.invoice:0
-#: xsl:account.transfer:0
 msgid "Document"
 msgstr "Documento"
 
@@ -3083,6 +3091,8 @@ msgstr "Libro Giornale analitico"
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
@@ -3276,6 +3286,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr ""
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr "Riconcilia registrazioni"
@@ -3625,7 +3636,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr ""
@@ -4940,6 +4950,7 @@ msgid "Invoice Lines"
 msgstr ""
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr ""
@@ -5213,7 +5224,7 @@ msgstr ""
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Pagamenti"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -5332,8 +5343,6 @@ msgstr ""
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
@@ -5342,7 +5351,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Optional Information"
-msgstr ""
+msgstr "Informazioni aggiuntive"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
@@ -5415,7 +5424,6 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5501,7 +5509,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Informazioni Generali"
 
 #. module: account
 #: help:populate_statement_from_inv,init,journal_id:0
@@ -5604,7 +5612,6 @@ msgstr "Anno fiscale da chiudere"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -6126,7 +6133,7 @@ msgid "Show Comparision in %"
 msgstr ""
 
 #. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
 msgid "Select Period"
 msgstr ""
 
@@ -6290,3 +6297,92 @@ msgstr ""
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr ""
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Errore di Integrità!"
+
+#, python-format
+#~ msgid ""
+#~ "Specified Journal does not have any account move entries in draft state for "
+#~ "this period"
+#~ msgstr ""
+#~ "Il Giornale specificato non ha nessun movimento in stato di bozza per questo "
+#~ "periodo"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Occorre inserire un conto per la scrittura della registrazione"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Attenzione !"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "Non è possibile cancellare il movimento registrato \"%s\"!"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Nessun Giornale analitico presente!"
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "Non è possibile utilizzare questo conto generale in questo giornale!"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Non si può aggiungere/modificare registrazioni in un giornale chiuso"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "Non si può fare questa modifica su una registrazione riconcigliata! Per "
+#~ "cortesia, osservare che si possono modificare solo campi non importanti!"
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Bisogna prima selezionare un partner!"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Riferimenti vari"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "Registrazioni non nello stesso conto, oppure già riconciliate! "
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Azione non valida !"
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "Alcune registrazioni sono già riconciliate !"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Queste registrazioni contabili non sono in uno stato valido."
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Giornale Vendite"
+
+#, python-format
+#~ msgid "You can not modify/delete a journal with entries for this period !"
+#~ msgstr ""
+#~ "Non puoi modificare/cancellare un giornale con registrazioni per questo "
+#~ "periodo !"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Registrazioni: "
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "La registrazione è già stata riconciliata"

addons/account/i18n/vi.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-11 07:51+0000\n"
-"Last-Translator: Nguyễn Thịnh <thinhnverp@gmail.com>\n"
+"PO-Revision-Date: 2010-07-20 03:39+0000\n"
+"Last-Translator: Business Link Development Technologies <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:06+0000\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -25,28 +25,28 @@ msgstr "Tên nội bộ"
 #. module: account
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr ""
+msgstr "Mã số thuế"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree9
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree9
 msgid "Unpaid Supplier Invoices"
-msgstr ""
+msgstr "Hoá đơn từ nhà cung cấp chưa thanh toán"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr "mục endoding"
+msgstr "Mã hoá mục"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
 msgid "Specify The Message for the Overdue Payment Report."
-msgstr ""
+msgstr "Chỉ định Thông báo cho Báo cáo thanh toán quá hạn"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Xác nhận kê khai tạm"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
@@ -61,19 +61,21 @@ msgstr ""
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr ""
+msgstr "Đơn vị tiền được sử dụng để nhập bảng kê khai"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
 msgid "Select Message"
-msgstr ""
+msgstr "Lựa chọn thông báo"
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
 msgid ""
 "This account will be used to value incoming stock for the current product "
 "category"
-msgstr "tài khoản này sẽ được dùng cho giá của sản phẩm đưa vào danh mục"
+msgstr ""
+"Tài khoản này sẽ được sử dụng để định giá tồn kho sắp đến đối với loại sản "
+"phẩm này."
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -89,7 +91,7 @@ msgstr "kết quả hòa giả"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "không thể hòa giải"
+msgstr "Mục chưa được tổng hợp"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -107,7 +109,7 @@ msgstr "thống kê tài chính"
 #: model:ir.actions.wizard,name:account.wizard_vat_declaration
 #: model:ir.ui.menu,name:account.menu_wizard_vat_declaration
 msgid "Print Taxes Report"
-msgstr ""
+msgstr "in báo cáo thuế"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -189,8 +191,6 @@ msgstr "di chuyển dòng lựa chọn"
 #. module: account
 #: rml:account.journal.period.print:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 msgid "Entry label"
 msgstr "thử nhãn hàng"
 
@@ -235,7 +235,6 @@ msgstr ""
 #: field:account.move,amount:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
 msgid "Amount"
 msgstr "Số tiền"
 
@@ -299,7 +298,6 @@ msgstr ""
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
 #: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
 #: wizard_view:account.analytic.account.cost_ledger.report,init:0
 #: wizard_view:account.analytic.account.inverted.balance.report,init:0
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -339,6 +337,7 @@ msgid "Delta Debit"
 msgstr ""
 
 #. module: account
+#: model:account.account.type,name:account.account_type_tax
 #: rml:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -353,7 +352,9 @@ msgstr "thay đổi báo có."
 #. module: account
 #: field:account.analytic.line,account_id:0
 #: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
 #: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
 #: field:report.hr.timesheet.invoice.journal,account_id:0
 msgid "Analytic Account"
 msgstr "truy vấn tài khoản"
@@ -675,8 +676,11 @@ msgstr ""
 #. module: account
 #: field:account.analytic.account,line_ids:0
 #: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
 #: model:ir.ui.menu,name:account.next_id_41
+#, python-format
 msgid "Analytic Entries"
 msgstr ""
 
@@ -691,6 +695,7 @@ msgid "Associated Partner"
 msgstr "liên kết khách hàng"
 
 #. module: account
+#: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
 msgstr "Thông tin bổ sung"
@@ -1460,6 +1465,9 @@ msgstr ""
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
 msgid "Write-Off"
 msgstr ""
 
@@ -1865,7 +1873,6 @@ msgstr ""
 #: field:account.journal,type:0
 #: field:account.move,type:0
 #: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
 msgid "Type"
 msgstr ""
 
@@ -2299,13 +2306,13 @@ msgstr ""
 #: selection:account.general.ledger.report,checktype,sortbydate:0
 #: rml:account.journal.period.print:0
 #: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
 #: rml:account.overdue:0
 #: wizard_field:account.subscription.generate,init,date:0
 #: field:account.subscription.line,date:0
 #: rml:account.tax.code.entries:0
 #: rml:account.third_party_ledger:0
 #: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
 msgid "Date"
 msgstr ""
 
@@ -2422,6 +2429,7 @@ msgstr ""
 #: view:account.bank.statement:0
 #: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
 #: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
@@ -2613,6 +2621,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
 #: model:ir.ui.menu,name:account.next_id_40
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
@@ -2716,6 +2726,7 @@ msgid "Invoice Number"
 msgstr ""
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: field:account.period,date_stop:0
 msgid "End of Period"
 msgstr ""
@@ -2899,8 +2910,6 @@ msgstr ""
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "1cm 27.7cm 20cm 27.7cm"
 msgstr ""
@@ -2957,9 +2966,11 @@ msgstr ""
 #: wizard_view:account.move.line.reconcile,init_full:0
 #: wizard_view:account.move.line.reconcile,init_partial:0
 #: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
 #: model:ir.ui.menu,name:account.next_id_20
 #: model:process.node,name:account.process_node_reconciliation0
 #: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
 msgid "Reconciliation"
 msgstr ""
 
@@ -3019,7 +3030,6 @@ msgstr ""
 
 #. module: account
 #: rml:account.invoice:0
-#: xsl:account.transfer:0
 msgid "Document"
 msgstr ""
 
@@ -3067,6 +3077,8 @@ msgstr ""
 
 #. module: account
 #: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
 msgid "Entry Label"
 msgstr ""
 
@@ -3258,6 +3270,7 @@ msgid "Generate Fiscal Year Opening Entries"
 msgstr ""
 
 #. module: account
+#: view:account.move.reconcile:0
 #: model:ir.actions.wizard,name:account.wizard_reconcile
 msgid "Reconcile Entries"
 msgstr ""
@@ -3605,7 +3618,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
 #: wizard_field:account.invoice.pay,init,name:0
 msgid "Entry Name"
 msgstr ""
@@ -4912,6 +4924,7 @@ msgid "Invoice Lines"
 msgstr ""
 
 #. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: field:account.period,date_start:0
 msgid "Start of Period"
 msgstr ""
@@ -5304,8 +5317,6 @@ msgstr ""
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
 #: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
 #: rml:account.vat.declaration:0
 msgid "Page"
 msgstr ""
@@ -5387,7 +5398,6 @@ msgstr ""
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5576,7 +5586,6 @@ msgstr ""
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,date1:0
 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
 #: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -5934,6 +5943,335 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr ""
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.open_board_account
+#: model:ir.ui.menu,name:account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_account_balance
+#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
+msgid "Account balance"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:account.module_meta_information
+msgid ""
+"Account Balance Module is an added functionality to the Financial Management "
+"module.\n"
+"\n"
+"    This module gives you the various options for printing balance sheet.\n"
+"\n"
+"    1. You can compare the balance sheet for different years.\n"
+"\n"
+"    2. You can set the cash or percentage comparison between two years.\n"
+"\n"
+"    3. You can set the referential account for the percentage comparison for "
+"particular years.\n"
+"\n"
+"    4. You can select periods as an actual date or periods as creation "
+"date.\n"
+"\n"
+"    5. You have an option to print the desired report in Landscape format.\n"
+"    "
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.analytic.account.balance.report,init:0
+msgid "Select Period"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr ""
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr ""
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"3. You have selected 'Percentage' option with more than 2 years, but you "
+"have not selected landscape format."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"You might have done following mistakes. Please correct them and try again."
+msgstr ""
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr ""
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid ""
+"2. You have not selected 'Percentage' option, but you have selected more "
+"than 2 years."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid ""
+"You may have selected the compare options with more than 1 year with "
+"credit/debit columns and % option.This can lead contents to be printed out "
+"of the paper.Please try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "You have to select at least 1 Fiscal Year. Try again."
+msgstr ""
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr ""
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr ""
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,description:report_account.module_meta_information
+msgid "A module that adds new reports based on the account module."
+msgstr ""
+
+#. module: account
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph
+#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph
+msgid "Balance by Type of Account"
+msgstr ""
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr ""
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr ""
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "Cảnh báo"

addons/account/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-13 03:12+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-07-22 01:32+0000\n"
+"Last-Translator: digitalsatori <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-07-23 04:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -35,7 +35,7 @@ msgstr "未支付的采购发票"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr "录入的记录"
+msgstr "分录录入"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
@@ -55,7 +55,7 @@ msgstr "资产"
 #. module: account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "在动作定义使用了无效的模块名。"
+msgstr "在动作定义使用了无效的模式名称。"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -87,14 +87,14 @@ msgstr "对账结果"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "取消核销"
+msgstr "未对账分录"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "基于的税务"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -115,7 +115,7 @@ msgstr "上级科目"
 #. module: account
 #: selection:account.move,type:0
 msgid "Journal Voucher"
-msgstr "原始凭证集合"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,residual:0
@@ -215,7 +215,7 @@ msgstr "明细"
 #. module: account
 #: wizard_view:account.aged.trial.balance,init:0
 msgid "Aged Trial Balance"
-msgstr "账龄试算平衡表"
+msgstr "旧的试算表"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -239,7 +239,7 @@ msgstr "金额"
 #: model:ir.actions.wizard,name:account.wizard_third_party_ledger
 #: model:ir.ui.menu,name:account.menu_third_party_ledger
 msgid "Partner Ledger"
-msgstr "业务伙伴总帐"
+msgstr "业务伙伴分类账"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -460,7 +460,7 @@ msgstr "从草稿确认, 与对/ 不对账"
 #: model:ir.actions.wizard,name:account.action_account_bank_reconcile_tree
 #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_check_tree
 msgid "Bank reconciliation"
-msgstr "银行对账"
+msgstr "银行对帐单"
 
 #. module: account
 #: rml:account.invoice:0
@@ -680,7 +680,7 @@ msgstr "月"
 #. module: account
 #: field:account.analytic.account,partner_id:0
 msgid "Associated Partner"
-msgstr "相关业务伙伴"
+msgstr "相关的业务伙伴"
 
 #. module: account
 #: view:account.invoice:0
@@ -795,7 +795,7 @@ msgstr "之前生成的记录:"
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr "成本分类帐"
+msgstr "成本分类账"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -888,7 +888,7 @@ msgstr "补差额集合"
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "货币金额"
+msgstr "另一货币金额"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -1182,7 +1182,7 @@ msgstr "银行收据"
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr "银行账号"
+msgstr "银行帐号"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
@@ -1897,7 +1897,7 @@ msgstr "支付发票"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr "错误：无效的Bvr号（错误的检验和）"
+msgstr "错误：无效的Bvr号(校验错误)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
@@ -4212,7 +4212,7 @@ msgstr "这序列提供记录集合列表的显示顺序"
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr "类型控制"
+msgstr "控制类型"
 
 #. module: account
 #: field:account.analytic.account,name:0
@@ -4555,7 +4555,7 @@ msgstr "辅助核算项统计"
 msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
-msgstr "将根据选择的模板自动设置你的科目一览表、银行帐号、税和记录集合"
+msgstr "将根据选择的模板自动设置你的科目一览表、银行科目、税和记录集合"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5182,7 +5182,7 @@ msgstr "从手动转为草稿"
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_43
 msgid "This Month"
-msgstr "本月"
+msgstr "这月"
 
 #. module: account
 #: field:account.account.type,sign:0
@@ -5209,7 +5209,7 @@ msgstr "在确认对帐单产生的会计分录"
 #. module: account
 #: wizard_view:account_use_models,create:0
 msgid "Use Model"
-msgstr "使用模型"
+msgstr "使用模式"
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
@@ -5463,7 +5463,7 @@ msgstr "科目.税.模板"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Bank Accounts"
-msgstr "银行帐号"
+msgstr "银行科目"
 
 #. module: account
 #: constraint:account.period:0
@@ -5739,7 +5739,7 @@ msgstr "打印记录集合 -"
 #: field:account.chart.template,bank_account_view_id:0
 #: field:account.invoice,partner_bank:0
 msgid "Bank Account"
-msgstr "银行帐号"
+msgstr "银行科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form

addons/account/installer.py

@@ -33,8 +33,9 @@ class account_installer(osv.osv_memory):
     _inherit = 'res.config.installer'
 
     def _get_default_accounts(self, cr, uid, context=None):
-        accounts = [{'acc_name':'Current','account_type':'cash'},
-                    {'acc_name':'Deposit','account_type':'cash'}]
+        accounts = [{'acc_name':'Current','account_type':'bank'},
+                    {'acc_name':'Deposit','account_type':'bank'},
+                    {'acc_name':'Cash','account_type':'cash'}]
         return accounts
 
     def _get_charts(self, cr, uid, context=None):
@@ -67,6 +68,12 @@ class account_installer(osv.osv_memory):
         'account_asset':fields.boolean('Assets Management',
             help="Enables asset management in the accounting application, "
                  "including asset categories and usage periods."),
+        'account_voucher':fields.boolean('Voucher Management',
+            help="Account Voucher module includes all the basic requirements of "
+                 "Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc... "),
+        'account_voucher_payment':fields.boolean('Voucher and Reconcile Management',
+            help="Extension Account Voucher module includes allows to link payment / receipt "
+                 "entries with voucher, also automatically reconcile during the payment and receipt entries."),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period':fields.selection([('month','Monthly'), ('3months','3 Monthly')],
@@ -289,9 +296,12 @@ class account_installer(osv.osv_memory):
                     'account_paid_id': acc_template_ref[value['account_paid_id']],
                 })
 
-        # Creating Journals
+        # Creating Journals Sales and Purchase
         vals_journal={}
-        view_id = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Journal View')])[0]
+        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
+        data = data_pool.browse(cr, uid, data_id[0])
+        view_id = data.res_id
+        
         seq_id = obj_sequence.search(cr,uid,[('name','=','Account Journal')])[0]
 
         if seq_journal:

addons/account/invoice.py

@@ -219,8 +219,8 @@ class account_invoice(osv.osv):
 
     _name = "account.invoice"
     _description = 'Invoice'
-    _order = "number"
-    _log_create = True
+    _order = "id"
+
     _columns = {
         'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
@@ -231,24 +231,25 @@ class account_invoice(osv.osv):
             ('in_refund','Supplier Refund'),
             ],'Type', readonly=True, select=True, change_default=True),
 
-        'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
+        'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'),
+        #'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."),
         'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."),
         'reference_type': fields.selection(_get_reference_type, 'Reference Type',
             required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'comment': fields.text('Additional Information', translate=True),
+        'comment': fields.text('Additional Information'),
 
         'state': fields.selection([
             ('draft','Draft'),
             ('proforma','Pro-forma'),
             ('proforma2','Pro-forma'),
             ('open','Open'),
-            ('paid','Done'),
+            ('paid','Paid'),
             ('cancel','Cancelled')
             ],'State', select=True, readonly=True,
             help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Invoice. \
             \n* The \'Pro-forma\' when invoice is in Pro-forma state,invoice does not have an invoice number. \
             \n* The \'Open\' state is used when user create invoice,a invoice number is generated.Its in open state till user does not pay invoice. \
-            \n* The \'Done\' state is set automatically when invoice is paid.\
+            \n* The \'Paid\' state is set automatically when invoice is paid.\
             \n* The \'Cancelled\' state is used when user cancel invoice.'),
         'date_invoice': fields.date('Date Invoiced', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
         'date_due': fields.date('Due Date', states={'paid':[('readonly',True)], 'open':[('readonly',True)], 'close':[('readonly',True)]},
@@ -299,8 +300,8 @@ class account_invoice(osv.osv):
                 'account.move.line': (_get_invoice_from_line, None, 50),
                 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50),
             }, help="The Ledger Postings of the invoice have been reconciled with Ledger Postings of the payment(s)."),
-        'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',
-            help='The bank account to pay to or to be paid from', readonly=True, states={'draft':[('readonly',False)]}),
+        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',
+            help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Parner bank account number.', readonly=True, states={'draft':[('readonly',False)]}),
         'move_lines':fields.function(_get_lines , method=True, type='many2many', relation='account.move.line', string='Entry Lines'),
         'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual',
             store={
@@ -344,6 +345,9 @@ class account_invoice(osv.osv):
     def create(self, cr, uid, vals, context=None):
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
+            for inv_id, name in self.name_get(cr, uid, [res], context=context):
+                message = _('Invoice ') + " '" + name + "' "+ _("is waiting for validation.")
+                self.log(cr, uid, inv_id, message)
             return res
         except Exception, e:
             if '"journal_id" viol' in e.args[0]:
@@ -354,9 +358,6 @@ class account_invoice(osv.osv):
 
     def confirm_paid(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'paid'}, context=context)
-        for (id, name) in self.name_get(cr, uid, ids):
-            message = _('Document ') + " '" + name + "' "+ _("has been paid.")
-            self.log(cr, uid, id, message)
         return True
 
     def unlink(self, cr, uid, ids, context=None):
@@ -373,8 +374,8 @@ class account_invoice(osv.osv):
 #   def get_invoice_address(self, cr, uid, ids):
 #       res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
 #       return [{}]
-    def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank=False, company_id=False):
+    def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         invoice_addr_id = False
         contact_addr_id = False
         partner_payment_term = False
@@ -429,7 +430,7 @@ class account_invoice(osv.osv):
         }
 
         if type in ('in_invoice', 'in_refund'):
-            result['value']['partner_bank'] = bank_id
+            result['value']['partner_bank_id'] = bank_id
 
         if payment_term != partner_payment_term:
             if partner_payment_term:
@@ -439,7 +440,7 @@ class account_invoice(osv.osv):
             else:
                 result['value']['date_due'] = False
 
-        if partner_bank != bank_id:
+        if partner_bank_id != bank_id:
             to_update = self.onchange_partner_bank(cr, uid, ids, bank_id)
             result['value'].update(to_update['value'])
         return result
@@ -474,7 +475,7 @@ class account_invoice(osv.osv):
     def onchange_invoice_line(self, cr, uid, ids, lines):
         return {}
 
-    def onchange_partner_bank(self, cursor, user, ids, partner_bank):
+    def onchange_partner_bank(self, cursor, user, ids, partner_bank_id=False):
         return {'value': {}}
 
     def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id):
@@ -768,8 +769,8 @@ class account_invoice(osv.osv):
         cur_obj = self.pool.get('res.currency')
         context = {}
         for inv in self.browse(cr, uid, ids):
-            if not inv.journal_id.invoice_sequence_id:
-                raise osv.except_osv(_('Error !'), _('Please define invoice sequence on invoice journal'))
+            if not inv.journal_id.sequence_id:
+                raise osv.except_osv(_('Error !'), _('Please define sequence on invoice journal'))
             if not inv.invoice_line:
                 raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
             if inv.move_id:
@@ -875,7 +876,14 @@ class account_invoice(osv.osv):
 
             line = self.finalize_invoice_move_lines(cr, uid, inv, line)
 
-            move = {'ref': inv.number, 'line_id': line, 'journal_id': journal_id, 'date': date, 'type': entry_type}
+            move = {
+                'ref': inv.number, 
+                'line_id': line, 
+                'journal_id': journal_id, 
+                'date': date, 
+                'type': entry_type,
+                'narration':inv.comment
+            }
             period_id=inv.period_id and inv.period_id.id or False
             if not period_id:
                 period_ids= self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d'))])
@@ -890,8 +898,11 @@ class account_invoice(osv.osv):
             new_move_name = self.pool.get('account.move').browse(cr, uid, move_id).name
             # make the invoice point to that move
             self.write(cr, uid, [inv.id], {'move_id': move_id,'period_id':period_id, 'move_name':new_move_name})
-            self.pool.get('account.move').post(cr, uid, [move_id])
+            # Pass invoice in context in method post: used if you want to get the same
+            # account move reference when creating the same invoice after a cancelled one:
+            self.pool.get('account.move').post(cr, uid, [move_id], context={'invoice':inv})
         self._log_event(cr, uid, ids)
+
         return True
 
     def line_get_convert(self, cr, uid, x, part, date, context=None):
@@ -916,36 +927,35 @@ class account_invoice(osv.osv):
         }
 
     def action_number(self, cr, uid, ids, *args):
-        cr.execute('SELECT id, type, number, move_id, reference ' \
-                    'FROM account_invoice ' \
-                    'WHERE id IN %s',
-                    (tuple(ids),))
-        obj_inv = self.browse(cr, uid, ids)[0]
-        for (id, invtype, number, move_id, reference) in cr.fetchall():
-            if not number:
-                if obj_inv.journal_id.invoice_sequence_id:
-                    sid = obj_inv.journal_id.invoice_sequence_id.id
-                    number = self.pool.get('ir.sequence').get_id(cr, uid, sid, 'id', {'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id})
-                else:
-                    number = self.pool.get('ir.sequence').get(cr, uid,
-                            'account.invoice.' + invtype)
-                if invtype in ('in_invoice', 'in_refund'):
-                    ref = reference
-                else:
-                    ref = self._convert_ref(cr, uid, number)
-                cr.execute('UPDATE account_invoice SET number=%s ' \
-                        'WHERE id=%s', (number, id))
-                cr.execute('UPDATE account_move SET ref=%s ' \
-                        'WHERE id=%s AND (ref is null OR ref = \'\')',
+        #TODO: not correct fix but required a frech values before reading it.
+        self.write(cr, uid, ids, {})
+        
+        for obj_inv in self.browse(cr, uid, ids):
+            id = obj_inv.id
+            invtype = obj_inv.type
+            number = obj_inv.number
+            move_id = obj_inv.move_id and obj_inv.move_id.id or False
+            reference = obj_inv.reference or ''
+            
+            if invtype in ('in_invoice', 'in_refund'):
+                ref = reference
+            else:
+                ref = self._convert_ref(cr, uid, number)
+
+            cr.execute('UPDATE account_move SET ref=%s ' \
+                    'WHERE id=%s AND (ref is null OR ref = \'\')',
+                    (ref, move_id))
+            cr.execute('UPDATE account_move_line SET ref=%s ' \
+                    'WHERE move_id=%s AND (ref is null OR ref = \'\')',
+                    (ref, move_id))
+            cr.execute('UPDATE account_analytic_line SET ref=%s ' \
+                    'FROM account_move_line ' \
+                    'WHERE account_move_line.move_id = %s ' \
+                        'AND account_analytic_line.move_id = account_move_line.id',
                         (ref, move_id))
-                cr.execute('UPDATE account_move_line SET ref=%s ' \
-                        'WHERE move_id=%s AND (ref is null OR ref = \'\')',
-                        (ref, move_id))
-                cr.execute('UPDATE account_analytic_line SET ref=%s ' \
-                        'FROM account_move_line ' \
-                        'WHERE account_move_line.move_id = %s ' \
-                            'AND account_analytic_line.move_id = account_move_line.id',
-                            (ref, move_id))
+            for inv_id, name in self.name_get(cr, uid, [id]):
+                message = _('Invoice ') + " '" + name + "' "+ _("is validated.")
+                self.log(cr, uid, inv_id, message)
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -1161,12 +1171,18 @@ class account_invoice(osv.osv):
                    ((move_id, invoice.move_id.id),))
         lines = line.browse(cr, uid, map(lambda x: x[0], cr.fetchall()) )
         for l in lines+invoice.payment_ids:
-            if l.account_id.id==src_account_id:
+            if l.account_id.id == src_account_id:
                 line_ids.append(l.id)
                 total += (l.debit or 0.0) - (l.credit or 0.0)
+
+        inv_id, name = self.name_get(cr, uid, [invoice.id], context=context)[0]
         if (not round(total,self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))) or writeoff_acc_id:
+            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is totally paid."))
             self.pool.get('account.move.line').reconcile(cr, uid, line_ids, 'manual', writeoff_acc_id, writeoff_period_id, writeoff_journal_id, context)
         else:
+            code = invoice.currency_id.code
+            amt = str(pay_amount) + code + ' on ' + str(invoice.amount_total) + code + ' (' + str(total) + code + ' remaining)'
+            self.log(cr, uid, inv_id, _('Invoice ') + " '" + name + "' "+ _("is paid partially: ") + amt)
             self.pool.get('account.move.line').reconcile_partial(cr, uid, line_ids, 'manual', context)
 
         # Update the stored value (fields.function), so we write to trigger recompute

addons/account/partner_view.xml

@@ -10,7 +10,7 @@
                 <form string="Fiscal Position">
                     <field name="name" select="1"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-					<separator string="Mapping" colspan="4"/>
+                    <separator string="Mapping" colspan="4"/>
                     <newline/>
                     <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
                         <tree string="Tax Mapping" editable="bottom">

addons/account/process/customer_invoice_process.xml

@@ -125,9 +125,9 @@
             <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
         </record>
         
-        <record id="account.t5" model="workflow.transition">
-            <field name="role_id" ref="res_roles_invoice0"/>
-        </record>
+<!--        <record id="account.t5" model="workflow.transition">-->
+<!--            <field name="role_id" ref="res_roles_invoice0"/>-->
+<!--        </record>-->
         
         <record id="process_transition_confirmstatementfromdraft0" model="process.transition">
             <field eval="[(6,0,[])]" name="role_ids"/>
@@ -154,7 +154,7 @@
             <field eval="&quot;&quot;&quot;Draft invoices are checked, validated and printed.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_invoiceinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_draftinvoices0"/>
-            <field eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/>
+            <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
     
         <record id="process_transition_validentries0" model="process.transition">

addons/account/process/supplier_invoice_process.xml

@@ -124,7 +124,7 @@
             <field eval="&quot;&quot;&quot;Draft invoices are validated. &quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_supplierinvoiceinvoice0"/>
             <field model="process.node" name="source_node_id" ref="process_node_supplierdraftinvoices0"/>
-            <field eval="[(6,0,[ref('account.t5')])]" name="transition_ids"/>
+            <field eval="[(6,0,[ref('account.pro2_to_open')])]" name="transition_ids"/>
         </record>
     
         <record id="process_transition_suppliervalidentries0" model="process.transition">

addons/account/project/analytic_account_demo.xml

@@ -2,7 +2,7 @@
 <openerp>
     <data noupdate="1">
         <record id="analytic_root" model="account.analytic.account">
-            <field name="name">Analytic Chart</field>
+            <field name="name" model="res.company" use="name" search="[('id', '=', 1)]"/>
             <field name="code">0</field>
         </record>
         <record id="analytic_absences" model="account.analytic.account">
@@ -163,7 +163,7 @@
             <field name="partner_id" ref="base.res_partner_desertic_hispafuentes"/>
         </record>
         <record id="analytic_tiny_at_work" model="account.analytic.account">
-            <field name="name">Tiny AT Work</field>
+            <field name="name">OpenERP SA AT Work</field>
             <field name="code">15</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_tinyatwork"/>

addons/account/project/project_view.xml

@@ -23,25 +23,25 @@
             <field name="model">account.analytic.account</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Analytic Account">
-	           		<group col="8" colspan="4">
-	            		<filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
-	            		<filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
-						<separator orientation="vertical"/>
-						<field name="name" select="1"/>
-						<field name="code" select="1"/>
-						<field name="partner_id" select="1"/>
-						<field name="user_id" widget="selection"/>
-	           		</group>
-	            	<newline/>
-	            	<group expand="0" string="Group By...">
-	                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
-	                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
-	                        <separator orientation="vertical"/>
-	                        <filter string="Associated Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-	                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                <search string="Analytic Account">
+                    <group col="8" colspan="4">
+                        <filter icon="terp-check" string="Current" domain="[('state','=','open')]" help="Current Accounts"/>
+                        <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Accounts"/>
+                        <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                        <field name="code" select="1"/>
+                        <field name="partner_id" select="1"/>
+                        <field name="user_id" widget="selection"/>
                     </group>
-            	</search>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Parent" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Associated Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
 
@@ -54,17 +54,17 @@
                 <tree toolbar="True" colors="red:(date&lt;=current_date);black:(date&gt;current_date)" string="Analytic account">
                     <field name="name"/>
                     <field name="code"/>
-                    <field name="date"/>
-                    <field name="company_currency_id"/>
-                    <field name="debit"/>
-                    <field name="credit"/>
                     <field name="balance"/>
-                    <field name="quantity"/>
-                    <field name="quantity_max"/>
-                    <field name="parent_id" invisible="1"/>
-                    <field name="type" invisible="1"/>
-                    <field name="partner_id" invisible="1"/> 
-                    <field name="user_id" invisible="1"/>
+                    <field name="company_currency_id"/>
+<!--                    <field name="date"/>-->
+<!--                    <field name="debit"/>-->
+<!--                    <field name="credit"/>-->
+<!--                    <field name="quantity"/>-->
+<!--                    <field name="quantity_max"/>-->
+<!--                    <field name="parent_id" invisible="1"/>-->
+<!--                    <field name="type" invisible="1"/>-->
+<!--                    <field name="partner_id" invisible="1"/>-->
+<!--                    <field name="user_id" invisible="1"/>-->
                 </tree>
             </field>
         </record>
@@ -109,13 +109,13 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph,form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
-			<field name="context">{"search_default_user_id":uid}</field>
+            <field name="context">{"search_default_user_id":uid}</field>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
         <!--<menuitem id="menu_analytic_account" name="Analytic Accounts" parent="account.menu_analytic_accounting"/>-->
-        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic"/>
+        <menuitem action="action_account_analytic_account_form" id="account_analytic_def_account" parent="menu_analytic_accounting"/>
 
-		<record id="act_account_renew_view" model="ir.actions.act_window">
+        <record id="act_account_renew_view" model="ir.actions.act_window">
             <field name="name">Accounts to Renew</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
@@ -131,8 +131,9 @@
             <field name="res_model">account.analytic.account</field>
             <field name="domain">[('parent_id','=',False)]</field>
             <field name="view_type">tree</field>
-             <field name="view_mode">form,graph</field>
+            <field name="view_mode">form,graph</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
+            <field name="help">Analytic Charts of Accounts allows you to access to reports by analytic accounts (or cost accounts) . From this menu you can access to analytic balance, a report that relates the analytic accounts to the general accounts. It is useful for analyzing the profitability of projects, giving you the profitability of a project for the different operations that you used to carry out the project.</field>
         </record>
 <!--        <menuitem-->
 <!--            action="action_account_analytic_account_tree2"-->
@@ -140,7 +141,7 @@
 <!--            parent="account_analytic_def_account"/>-->
 <!--        <menuitem action="action_account_analytic_account_tree2" id="account_analytic_chart" parent="account.menu_finance_charts"/>-->
 
-<!--		<wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
+<!--        <wizard id="wizard_analytic_account_chart" menu="False" model="account.analytic.account" name="account.analytic.account.chart" string="Analytic Chart of Accounts"/>
         <menuitem icon="STOCK_INDENT" action="wizard_analytic_account_chart" id="menu_action_analytic_account_tree2" parent="account.menu_finance_charts" type="wizard"/>-->
 
         <menuitem id="next_id_40" name="Analytic" parent="account.menu_finance_generic_reporting" sequence="4"/>
@@ -199,22 +200,26 @@
             <field name="model">account.analytic.line</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="Search Analytic Lines">
-            		<group col='6' colspan='4'>
+                <search string="Search Analytic Lines">
+                    <group col='6' colspan='4'>
                         <field name="name" select="1"/>
-                        <field name="journal_id" select="1"/>
                         <field name="account_id" select="1"/>
+                        <field name="amount" select="1"/>
                         <field name="date" select="1"/>
                         <field name="user_id" widget="selection"/>
-            		</group>
-            		<newline/>
-            		<group string="Group By..." expand="0">
-            			<filter string="General Account" context="{'group_by':'general_account_id'}"/>
-                    	<filter string="Analytic Account" context="{'group_by':'account_id'}"/>
-                    	<filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
-                    	<filter string="Product" context="{'group_by':'product_id'}"/>
-            		</group>
-            	</search>
+                    </group>
+                    <newline/>
+                    <group col='6' colspan='4'>
+                        <field name="journal_id" select="1" widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group string="Group By..." expand="0">
+                        <filter string="General Account" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
+                        <filter string="Analytic Journal" context="{'group_by':'journal_id'}"/>
+                        <filter string="Product" context="{'group_by':'product_id'}"/>
+                    </group>
+                </search>
             </field>
         </record>
         <record id="action_account_analytic_line_form" model="ir.actions.act_window">
@@ -297,16 +302,16 @@
             </field>
         </record>
 
-		<record id="view_analytic_journal_search" model="ir.ui.view">
+        <record id="view_analytic_journal_search" model="ir.ui.view">
             <field name="name">account.analytic.journal.search</field>
             <field name="model">account.analytic.journal</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-            	<search string="analytic Journals">
-	            	<group expand="0" string="Group By...">
+                <search string="analytic Journals">
+                    <group expand="0" string="Group By...">
                         <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
                     </group>
-            	</search>
+                </search>
             </field>
         </record>
 
@@ -330,7 +335,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,search</field>
         </record>
-        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic"/>
+        <menuitem action="action_account_analytic_journal_form" id="account_def_analytic_journal" parent="menu_analytic_accounting"/>
 
         #
         # Open journal entries
@@ -376,6 +381,7 @@
             <field name="name">Print Analytic Journals</field>
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">tree</field>
+            <field name="help">To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount.</field>
         </record>
         <menuitem action="action_account_analytic_journal_tree" id="account_analytic_journal_print" parent="account.next_id_40"/>
 
@@ -444,14 +450,14 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Analytic Entries Stats">
-                	<group col="8" colspan="4">
-	                	<filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
-		               	<filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
-		               	<separator orientation="vertical"/>
-	                    <field name="name" select="1"/>
-	               		<field name="month" select="1"/>
-	                    <field name="account_id" select="1"/>
-					</group>
+                    <group col="8" colspan="4">
+                        <filter icon="terp-go-year" string="This Year" domain="[('name','=',time.strftime('%%Y'))]" help="Sale journal in this year"/>
+                           <filter icon="terp-go-month" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Sale journal in this month"/>
+                           <separator orientation="vertical"/>
+                        <field name="name" select="1"/>
+                           <field name="month" select="1"/>
+                        <field name="account_id" select="1"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -463,7 +469,7 @@
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="report_hr_timesheet_invoice_journal_search"/>
         </record>
-        <menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="account.next_id_40"/>
+<!--        <menuitem action="report_account_analytic_journal_tree" id="report_account_analytic_journal_print" parent="account.next_id_40"/>-->
 
         <act_window domain="[('account_id', '=', active_id)]" id="act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal" name="All Analytic Entries" res_model="account.analytic.line" src_model="account.analytic.account" view_mode="tree,form" view_type="form"/>
 

addons/account/report/account_analytic_entries_report_view.xml

@@ -104,6 +104,7 @@
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_analytic_entries_report_search"/>
+        <field name="help">A tool search lets you know statistics on your analytics records that match your needs.</field>
     </record>
 
     <menuitem action="action_analytic_entries_report" id="menu_action_analytic_entries_report" parent="account.menu_finance_statistic_report_statement"  sequence="4"/>

addons/account/report/account_entries_report_view.xml

@@ -6,7 +6,7 @@
         <field name="model">account.entries.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Entries Analysis">
+            <tree colors="blue:state in ('draft');black:state in ('posted')" string="Entries Analysis">
                 <field name="date" invisible="1"/>
                 <field name="date_created" invisible="1"/>
                 <field name="date_maturity" invisible="1"/>
@@ -118,6 +118,7 @@
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_profit': 1,'search_default_group_account':1,'search_default_group_month': 1, 'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="help">A tool search lets you know statistics on your different financial accounts that match your needs.</field>
     </record>
     <menuitem action="action_account_entries_report_all" id="menu_action_account_entries_report_all" parent="account.menu_finance_statistic_report_statement" sequence="2"/>
 </data>

addons/account/report/account_invoice_report.py

@@ -68,7 +68,7 @@ class account_invoice_report(osv.osv):
         'address_contact_id': fields.many2one('res.partner.address', 'Contact Address Name', readonly=True),
         'address_invoice_id': fields.many2one('res.partner.address', 'Invoice Address Name', readonly=True),
         'account_id': fields.many2one('account.account', 'Account',readonly=True),
-        'partner_bank': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
+        'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual':fields.float('Total Residual', readonly=True),
         'delay_to_pay':fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
     }
@@ -101,7 +101,7 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id as address_contact_id,
                     ai.address_invoice_id as address_invoice_id,
                     ai.account_id as account_id,
-                    ai.partner_bank as partner_bank,
+                    ai.partner_bank_id as partner_bank_id,
                     sum(case when ai.type in ('out_refund','in_invoice') then
                          ail.quantity * u.factor * -1
                         else
@@ -152,7 +152,7 @@ class account_invoice_report(osv.osv):
                     ai.address_contact_id,
                     ai.address_invoice_id,
                     ai.account_id,
-                    ai.partner_bank,
+                    ai.partner_bank_id,
                     ai.residual
             )
         """)

addons/account/report/account_invoice_report_view.xml

@@ -6,7 +6,7 @@
         <field name="model">account.invoice.report</field>
         <field name="type">tree</field>
         <field name="arch" type="xml">
-            <tree string="Invoices Analysis">
+            <tree colors="blue:state in ('draft');gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Invoices Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -25,7 +25,7 @@
                 <field name="date_due" invisible="1"/>
                 <field name="address_contact_id" invisible="1"/>
                 <field name="address_invoice_id" invisible="1"/>
-                <field name="partner_bank" invisible="1"/>
+                <field name="partner_bank_id" invisible="1"/>
                 <field name="account_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="Qty"/>
@@ -138,6 +138,8 @@
         <field name="view_mode">tree,graph</field>
         <field name="context">{'search_default_month':1,'search_default_product':1,'group_by_no_leaf':1,'group_by':[]}</field>
         <field name="search_view_id" ref="view_account_invoice_report_search"/>
+        <field name="help">A tool search lets you know statistics on invoices that match your needs.</field>
+
     </record>
 
     <menuitem action="action_account_invoice_report_all" id="menu_action_account_invoice_report_all" parent="account.menu_finance_statistic_report_statement" sequence="0"/>

addons/account/report/account_report_view.xml

@@ -89,7 +89,7 @@
             <field name="model">report.invoice.created</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state not in ('draft') " string="Invoices">
+                <tree colors="blue:state in ('draft');black:state in ('proforma','proforma2','open');gray:state in('paid','cancel') " string="Invoices">
                    	<field name="create_date" select="1"/>
                     <field name="name" select="1"/>
                     <field name="type"/>

addons/account/report/general_ledger.py

@@ -266,7 +266,7 @@ class general_ledger(rml_parse.rml_parse):
             JOIN account_journal j on (l.journal_id=j.id)
             WHERE %s AND l.account_id = %%s AND l.date<=%%s AND l.date>=%%s ORDER by %s
         """ % (self.query, sql_sort)
-        self.cr.execute(sql, (account.id,  self.date_borne['max_date'], self.date_borne['min_date']))
+        self.cr.execute(sql, (account.id, self.date_borne['max_date'], self.date_borne['min_date']))
         res = self.cr.dictfetchall()
         account_sum = 0.0
         account_move_line_obj = pooler.get_pool(self.cr.dbname).get('account.move.line')

addons/account/report/report_balance_sheet.rml

@@ -186,7 +186,7 @@
           <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -196,7 +196,7 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(sum_dr()) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -221,10 +221,10 @@
           <para style="terp_default_9"><font face="Times-Roman">[[ repeatIn(get_lines_another('asset'), 'a') ]]</font>[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_9">[[ a['code'] ]]<font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
+          <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -234,7 +234,7 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(sum_cr()) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>

addons/account/report/report_balance_sheet_horizontal.rml

@@ -197,7 +197,7 @@
 	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level']-1) ]]</font><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]]</font></para>
 	      </td>
 	      <td>
-	        <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+	        <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]</para>
 	      </td>
 	      <td>
 	        <para style="terp_default_9"><font>[[ a['level']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]]</font><font>[[ a['code1'] ]]</font></para>
@@ -206,7 +206,7 @@
 	        <para style="terp_default_9"><font color="white">[[  '. '*(a['level1']-1) ]]</font><font>[[ a['level1']&lt;4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name1'] ]]</font></para>
 	      </td>
 	      <td>
-	        <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]</para>
+	        <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(get_abs(a['balance1'])) or 0.0 ]]</para>
 	      </td>
 	   </tr>
       </blockTable>
@@ -216,13 +216,13 @@
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Balance:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>

addons/account/report/report_bs.py

@@ -37,6 +37,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
         self.result_temp=[]
         self.localcontext.update({
             'time': time,
+            'get_abs' : self.get_abs,
             'get_lines' : self.get_lines,
             'get_lines_another' : self.get_lines_another,
             'get_company': self.get_company,
@@ -48,6 +49,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse):
             
         })
         self.context = context
+
+    def get_abs(self,amount):
+        return abs(amount)
         
     def sum_dr(self):
         if self.res_pl['type'] == 'Net Profit':

addons/account/report/report_pl.py

@@ -35,6 +35,7 @@ class report_pl_account_horizontal(rml_parse.rml_parse):
         self.result_temp=[]
         self.localcontext.update( {
             'time': time,
+            'get_abs' : self.get_abs,
             'get_lines' : self.get_lines,
             'get_lines_another' : self.get_lines_another,
             'get_company': self.get_company,
@@ -45,7 +46,10 @@ class report_pl_account_horizontal(rml_parse.rml_parse):
             'final_result' : self.final_result,
         })
         self.context = context
-        
+       
+    def get_abs(self,amount):
+        return abs(amount)
+     
     def final_result(self):
         return self.res_pl
     

addons/account/report/report_pl_account.rml

@@ -201,7 +201,7 @@
           </para>
         </td>
          <td>
-          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(get_abs(a.balance)) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -214,7 +214,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(get_abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -224,7 +224,7 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -256,7 +256,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(abs(a.balance)) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ a.balance and formatLang(get_abs(a.balance)) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -269,7 +269,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(get_abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -279,7 +279,7 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>

addons/account/report/report_pl_account_horizontal.rml

@@ -214,7 +214,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]]</para>
           </td>
           <td>
             <para style="terp_default_9">
@@ -227,7 +227,7 @@
             </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ a['balance1'] and formatLang(get_abs(a['balance1'])) or 0.0 ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -240,7 +240,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and  formatLang(get_abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
         <td>
           <para style="terp_default_Bold_9"></para>
@@ -249,7 +249,7 @@
           <para style="terp_default_Bold_9">[[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(abs(final_result()['balance'])) or 0.0 ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and  formatLang(get_abs(final_result()['balance'])) or 0.0 ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -260,13 +260,13 @@
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]]</u></para>
         </td>
         <td>
           <para style="terp_default_Bold_9">Total:([[ get_currency(data['form']) ]])</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]]</u></para>
+          <para style="terp_default_Right_9_Bold"><u>[[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]]</u></para>
         </td>
       </tr>
     </blockTable>

addons/account/security/ir.model.access.csv

@@ -62,6 +62,7 @@
 "access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1
 "access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0
 "access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0
+"access_account_fiscalyear_partner_manager","account.fiscalyear.partnermanager","model_account_fiscalyear","base.group_partner_manager",1,0,0,0
 "access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1
 "access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1
 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0

addons/account/sequence.py

@@ -19,19 +19,23 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 
 class ir_sequence_fiscalyear(osv.osv):
     _name = 'account.sequence.fiscalyear'
     _rec_name = "sequence_main_id"
     _columns = {
-        "sequence_id": fields.many2one("ir.sequence", 'Sequence', required=True, ondelete='cascade'),
-        "sequence_main_id": fields.many2one("ir.sequence", 'Main Sequence', required=True, ondelete='cascade'),
-        "fiscalyear_id": fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, ondelete='cascade')
+        "sequence_id": fields.many2one("ir.sequence", 'Sequence', required=True,
+            ondelete='cascade'),
+        "sequence_main_id": fields.many2one("ir.sequence", 'Main Sequence',
+            required=True, ondelete='cascade'),
+        "fiscalyear_id": fields.many2one('account.fiscalyear', 'Fiscal Year',
+            required=True, ondelete='cascade')
     }
 
     _sql_constraints = [
-        ('main_id', 'CHECK (sequence_main_id != sequence_id)',  'Main Sequence must be different from current !'),
+        ('main_id', 'CHECK (sequence_main_id != sequence_id)',
+            'Main Sequence must be different from current !'),
     ]
 
 ir_sequence_fiscalyear()
@@ -39,17 +43,25 @@ ir_sequence_fiscalyear()
 class ir_sequence(osv.osv):
     _inherit = 'ir.sequence'
     _columns = {
-        'fiscal_ids' : fields.one2many('account.sequence.fiscalyear', 'sequence_main_id', 'Sequences')
+        'fiscal_ids' : fields.one2many('account.sequence.fiscalyear',
+            'sequence_main_id', 'Sequences')
     }
-    def get_id(self, cr, uid, sequence_id, test='id', context={}):
-        cr.execute('select id from ir_sequence where '+test+'=%s and active=%s', (sequence_id, True,))
+    def get_id(self, cr, uid, sequence_id, test='id', context=None):
+        if context is None:
+            context = {}
+        cr.execute('select id from ir_sequence where ' 
+                   + test + '=%s and active=%s', (sequence_id, True,))
         res = cr.dictfetchone()
         if res:
-            for line in self.browse(cr, uid, res['id'], context=context).fiscal_ids:
-                if line.fiscalyear_id.id==context.get('fiscalyear_id', False):
-                    return super(ir_sequence, self).get_id(cr, uid, line.sequence_id.id, test="id", context=context)
-        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test, context)
+            for line in self.browse(cr, uid, res['id'],
+                                    context=context).fiscal_ids:
+                if line.fiscalyear_id.id == context.get('fiscalyear_id', False):
+                    return super(ir_sequence, self).get_id(cr, uid,
+                                                           line.sequence_id.id,
+                                                           test="id",
+                                                           context=context)
+        return super(ir_sequence, self).get_id(cr, uid, sequence_id, test,
+                                               context=context)
 ir_sequence()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/sequence_view.xml

@@ -12,8 +12,12 @@
                         <field name="fiscal_ids" nolabel="1" colspan="4">
                             <tree string="Fiscal Year Sequences" editable="bottom">
                                 <field name="fiscalyear_id"/>
-                                <field name="sequence_id"/>
+                                <field name="sequence_id" domain="[('code','=',parent.code)]"/>
                             </tree>
+                            <form string="Fiscal Year Sequence">
+                                <field name="fiscalyear_id"/>
+                                <field name="sequence_id" domain="[('code','=',parent.code)]"/>
+                            </form>
                         </field>
                     </page>
                 </page>

addons/account/test/account_customer_invoice.yml

@@ -32,6 +32,12 @@
 -
   !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'proforma2'
+-
+  I check that there is no move attached to the invoice
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
+    assert acc_id.move_id, "Move not created"
 -
   I create invoice by clicking on Create button
 -
@@ -41,6 +47,13 @@
 -
   !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'open'
+    
+-
+  I check that now there is a move attached to the invoice
+-
+  !python {model: account.invoice}: |
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
+    assert acc_id.move_id, "Move created"
 -
   I create a record for partial payment of 1000 EUR.
 -

addons/account/test/account_fiscalyear_close.yml

@@ -59,33 +59,33 @@
       "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"),
-      })
+#-
+#  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"),
+#      })
 
 
 

addons/account/test/account_sequence_test.yml

@@ -0,0 +1,45 @@
+- In order to test the invoice numbering, I create a sequence for out invoices.
+- !record {model: ir.sequence, id: seq_out_invoice_test}:
+    name: Account Invoice Out for the demonstration Fiscal Year # XXX indicate the name of the fiscal year
+    code: account.invoice.out_invoice
+    padding: 3
+    prefix: FY-
+    suffix: -TEST
+    number_next: 42
+
+- I link the new sequence to the demo sequence and the demo fiscal years.
+- !record {model: account.sequence.fiscalyear, id: seq_out_invoice_test_fy}:
+    sequence_id: seq_out_invoice_test
+    sequence_main_id: seq_out_invoice
+    fiscalyear_id: data_fiscalyear
+
+- I create a draft customer invoice in a period of the demo fiscal year
+- !record {model: account.invoice, id: invoice_seq_test}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_zen
+    address_invoice_id: base.res_partner_address_zen
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC3] Medium PC'
+        price_unit: 900.0
+        quantity: 10.0
+        product_id: product.product_product_pc3
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_3
+    reference_type: none
+    period_id: period_1
+    
+- I create the invoice, as is I clicked on the "Create" button
+- !workflow {model: account.invoice, action: invoice_open, ref: invoice_seq_test}
+
+- I check that the invoice state is "Open"
+- !assert {model: account.invoice, id: invoice_seq_test}:
+    - state == 'open'
+    
+- I check that the invoice got the right number using our sequence
+  # This used to fail because of bug #602188
+- !assert {model: account.invoice, id: invoice_seq_test}:
+    - number == 'FY-042-TEST'

addons/account/test/chart_of_account.yml

@@ -25,21 +25,19 @@
       "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_account_tree2")],
       "tz": False, "active_id": ref("account.menu_action_account_tree2"), })
 
--
-  In order to test Account Move Line Wizard I check the move line entries using this wizard
--
-  !record {model: account.move.line.select, id: account_move_line_select_0}:
-    {}
--
-  I clicked on Button to open the account move lines
--
-  !python {model: account.move.line.select}: |
-    self.open_window(cr, uid, [ref("account_move_line_select_0")], {"lang": 'en_US',
-      "state": "all", "tz": False, "active_model": "account.account", "active_ids":
-      [ref("account.a_recv")], "fiscalyear": 1, "active_id": ref("account.a_recv"),
-      })
-
-
+#-
+#  In order to test Account Move Line Wizard I check the move line entries using this wizard
+#-
+#  !record {model: account.move.line.select, id: account_move_line_select_0}:
+#    {}
+#-
+#  I clicked on Button to open the account move lines
+#-
+#  !python {model: account.move.line.select}: |
+#    self.open_window(cr, uid, [ref("account_move_line_select_0")], {"lang": 'en_US',
+#      "state": "all", "tz": False, "active_model": "account.account", "active_ids":
+#      [ref("account.a_recv")], "fiscalyear": 1, "active_id": ref("account.a_recv"),
+#      })
 -
   In order to test the Analytic Charts of Account wizard I will generate chart
 

addons/account/wizard/__init__.py

@@ -45,7 +45,9 @@ import account_open_closed_fiscalyear
 import account_compare_account_balance_report
 import account_invoice_state
 import account_chart
-import account_move_line_select
+#TODO: remove this file no moe used 
+# also remove related view fiel
+#import account_move_line_select
 
 import account_validate_account_move
 import account_use_model

addons/account/wizard/account_aged_trial_balance_view.xml

@@ -35,6 +35,7 @@
              <field name="view_id" ref="account_aged_balance_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
+             <field name="help">Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, Open ERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). Open ERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. </field>
        </record>
 
  	   <menuitem

addons/account/wizard/account_automatic_reconcile.py

@@ -29,15 +29,15 @@ class account_automatic_reconcile(osv.osv_memory):
     _description = 'Automatic Reconcile'
 
     _columns = {
-        'account_ids': fields.many2many('account.account', 'reconcile_account_rel', 'reconcile_id', 'account_id', 'Account to reconcile', domain = [('reconcile','=',1)], \
+        'account_ids': fields.many2many('account.account', 'reconcile_account_rel', 'reconcile_id', 'account_id', 'Accounts to Reconcile', domain = [('reconcile','=',1)], \
                                         help = 'If no account is specified, the reconciliation will be made using every accounts that can be reconcilied'),
         'writeoff_acc_id': fields.many2one('account.account', 'Account'),
         'journal_id': fields.many2one('account.journal', 'Journal'),
         'period_id': fields.many2one('account.period', 'Period'),
         'max_amount': fields.float('Maximum write-off amount'),
         'power': fields.selection([(p, str(p)) for p in range(2, 10)], 'Power', required=True, help='Number of partial amounts that can be combined to find a balance point can be chosen as the power of the automatic reconciliation'),
-        'date1': fields.date('Start of period', required=True),
-        'date2': fields.date('End of period', required=True),
+        'date1': fields.date('Starting Date', required=True),
+        'date2': fields.date('Ending Date', required=True),
         'reconciled': fields.integer('Reconciled transactions', readonly=True),
         'unreconciled': fields.integer('Not reconciled transactions', readonly=True),
         'allow_write_off': fields.boolean('Allow write off')
@@ -54,6 +54,7 @@ class account_automatic_reconcile(osv.osv_memory):
         'date2': time.strftime('%Y-%m-%d'),
         'reconciled': _get_reconciled,
         'unreconciled': _get_unreconciled,
+        'power':2
     }
 
     #TODO: cleanup and comment this code... For now, it is awfulllll
@@ -245,4 +246,4 @@ class account_automatic_reconcile(osv.osv_memory):
 
 account_automatic_reconcile()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_automatic_reconcile_view.xml

@@ -7,33 +7,33 @@
              <field name="model">account.automatic.reconcile</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-				<form string="Reconciliation">
-					<group width="660" height="430">
-				    <separator string="Options" colspan="4"/>
-				    <group>
-				    <field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
-				    <field name="date1"/>
-				    <field name="date2"/>
-				    <field name="power"/>
-				    <field name="allow_write_off"/>
-				    </group>
-				    <newline/>
-				    <group attrs="{'readonly':[('allow_write_off', '!=', True)]}">
-					    <separator string="Write-Off Move" colspan="4"/>
-					    <field name="max_amount"/>
-					    <field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
-					    <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
-					    <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
-				    </group>
-				    <separator string ="" colspan="4"/>
-				    <group colspan="2" col="4">
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
- 					</group>
- 				 </group>
-				</form>
+                <form string="Reconciliation">
+                    <group width="660" height="430">
+                    <separator string="Options" colspan="4"/>
+                    <group>
+                    <field name="account_ids" colspan="4" domain="[('reconcile','=',1)]"/>
+                    <field name="date1"/>
+                    <field name="date2"/>
+                    <field name="power"/>
+                    <field name="allow_write_off"/>
+                    </group>
+                    <newline/>
+                    <group attrs="{'readonly':[('allow_write_off', '!=', True)]}">
+                        <separator string="Write-Off Move" colspan="4"/>
+                        <field name="max_amount"/>
+                        <field name="writeoff_acc_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
+                        <field name="journal_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
+                        <field name="period_id" attrs="{ 'required':[('allow_write_off', '=', True)]}"/>
+                    </group>
+                    <separator string ="" colspan="4"/>
+                    <group colspan="2" col="4">
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                           <button name="reconcile" string="Reconcile" type="object" icon="terp-stock_effects-object-colorize"/>
+                     </group>
+                  </group>
+                </form>
              </field>
- 		</record>
+         </record>
 
         <record id="action_account_automatic_reconcile" model="ir.actions.act_window">
              <field name="name">Account Automatic Reconcile</field>
@@ -44,31 +44,32 @@
              <field name="view_id" ref="account_automatic_reconcile_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
+             <field name="help">For an invoice to be considered as paid, the invoice entries must be reconciled with counterparts, usually payments. With the automatic reconciliation functionality, OpenERP make its own search for entries to reconcile in a series of accounts. It tries to find entries for each partner where the amounts correspond.</field>
        </record>
 
- 	   <menuitem
- 	   		icon="STOCK_EXECUTE"
- 	   		name="Automatic Reconciliation"
- 	   		action="action_account_automatic_reconcile"
- 			id="menu_automatic_reconcile"
- 			parent="periodical_processing_reconciliation"/>
+        <menuitem
+                icon="STOCK_EXECUTE"
+                name="Automatic Reconciliation"
+                action="action_account_automatic_reconcile"
+             id="menu_automatic_reconcile"
+             parent="periodical_processing_reconciliation"/>
 
         <record id="account_automatic_reconcile_view1" model="ir.ui.view">
              <field name="name">Automatic reconcile unreconcile</field>
              <field name="model">account.automatic.reconcile</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-				<form string="Reconciliation result">
-	    			<field name="reconciled"/>
-	    			<newline/>
-	    			<field name="unreconciled"/>
-     				<group colspan="4" col="6">
-                       	<separator colspan="6"/>
-     					<button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
- 					</group>
-				</form>
+                <form string="Reconciliation result">
+                    <field name="reconciled"/>
+                    <newline/>
+                    <field name="unreconciled"/>
+                     <group colspan="4" col="6">
+                           <separator colspan="6"/>
+                         <button special="cancel" string="Ok" icon="terp-dialog-close" default_focus="1"/>
+                     </group>
+                </form>
              </field>
- 		</record>
+         </record>
 
-	</data>
+    </data>
 </openerp>

addons/account/wizard/account_balance_report_view.xml

@@ -7,41 +7,41 @@
              <field name="model">account.balance.report</field>
              <field name="type">form</field>
              <field name="arch" type="xml">
-              	<form string="Select period">
-              		<group width="650" height="200">
-				    <field name="company_id" groups="base.group_multi_company"/>
-				    <field name="display_account" required = "True"/>
-				    <newline/>
-				    <field name="fiscalyear"/>
-				    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
-				    <newline/>
-				    <separator string="Filters" colspan="4"/>
-				    <field name="state" required="True"/>
-				    <newline/>
-				    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
-				        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
-				            <separator string="Date Filter" colspan="4"/>
-				            <field name="date_from"/>
-				            <field name="date_to"/>
-				        </group>
-				        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
-				            <separator string="Filter on Periods" colspan="4"/>
-				            <field name="periods" colspan="4" nolabel="1"/>
-				        </group>
-				    </group>
-				    <newline/>
-     				<group colspan="4" col="6">
-                       	<separator colspan="4"/>
-                       	<newline/>
-     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-               			<button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
- 					</group>
- 					</group>
-				</form>
+                  <form string="Select period">
+                      <group width="650" height="200">
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="display_account" required = "True"/>
+                    <newline/>
+                    <field name="fiscalyear"/>
+                    <label colspan="2" string="(Keep empty for all open fiscal years)" align="0.0"/>
+                    <newline/>
+                    <separator string="Filters" colspan="4"/>
+                    <field name="state" required="True"/>
+                    <newline/>
+                    <group attrs="{'invisible':[('state','=','none')]}" colspan="4">
+                        <group attrs="{'invisible':[('state','=','byperiod')]}" colspan="4">
+                            <separator string="Date Filter" colspan="4"/>
+                            <field name="date_from"/>
+                            <field name="date_to"/>
+                        </group>
+                        <group attrs="{'invisible':[('state','=','bydate')]}" colspan="4">
+                            <separator string="Filter on Periods" colspan="4"/>
+                            <field name="periods" colspan="4" nolabel="1"/>
+                        </group>
+                    </group>
+                    <newline/>
+                     <group colspan="4" col="6">
+                           <separator colspan="4"/>
+                           <newline/>
+                         <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                           <button name="check_state" string="Print" type="object" icon="gtk-print" default_focus="1"/>
+                     </group>
+                     </group>
+                </form>
              </field>
- 		</record>
+         </record>
 
- 		<record id="action_account_balance_report" model="ir.actions.act_window">
+         <record id="action_account_balance_report" model="ir.actions.act_window">
              <field name="name">Account Balance</field>
              <field name="res_model">account.balance.report</field>
              <field name="type">ir.actions.act_window</field>
@@ -51,7 +51,7 @@
              <field name="target">new</field>
        </record>
 
-		<record model="ir.values" id="action_account_balance_report_values">
+        <record model="ir.values" id="action_account_balance_report_values">
             <field name="model_id" ref="account.model_account_account" />
             <field name="object" eval="1" />
             <field name="name">Account Balance</field>
@@ -59,19 +59,19 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_balance_report'))" />
             <field name="key">action</field>
             <field name="model">account.account</field>
-		</record>
+        </record>
 
-		<record id="account_balance_report_account_view" model="ir.ui.view">
+        <record id="account_balance_report_account_view" model="ir.ui.view">
             <field name="name">Account Balance</field>
              <field name="model">account.balance.report</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-		        <form string="Select Chart">
-		        	<field name="Account_list"/>
-		        	<separator colspan="4"/>
-	            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-		            <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
-		        </form>
+                <form string="Select Chart">
+                    <field name="Account_list"/>
+                    <separator colspan="4"/>
+                <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                    <button name="next_view" string="Next" type="object" icon="gtk-go-forward" default_focus="1"/>
+                </form>
             </field>
         </record>
 
@@ -86,11 +86,11 @@
              <field name="target">new</field>
        </record>
 
- 	   <menuitem icon="STOCK_PRINT"
- 	   		name="Account Balance"
- 	   		action="action_account_balance_account_report"
- 			id="menu_account_balance_report"
- 			parent="account.menu_generic_report"/>
+      <menuitem icon="STOCK_PRINT"
+         name="Account Balance"
+         action="action_account_balance_account_report"
+         id="menu_account_balance_report"
+         parent="account.final_accounting_reports"/>
 
-	</data>
+    </data>
 </openerp>

addons/account/wizard/account_bs_report.py

@@ -114,14 +114,12 @@ class account_bs_report(osv.osv_memory):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.balancesheet.horizontal',
                 'datas': data,
-                'nodestroy':True,
                 }
         else:
             return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'account.balancesheet',
                 'datas': data,
-                'nodestroy':True,
                 }
             
     def _check_date(self, cr, uid, data, context=None):

addons/account/wizard/account_central_journal_view.xml

@@ -2,27 +2,27 @@
 <openerp>
     <data>
 
-		<record id="view_account_central_journal" model="ir.ui.view">
+        <record id="view_account_central_journal" model="ir.ui.view">
             <field name="name">Account central Journal</field>
             <field name="model">account.central.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print Central Journal">
-				<group height="370" width="400">
-				    <group>
-					    <separator string="Journals"/><newline/>
-					    <field name="journal_id" nolabel="1"/><newline/>
-					    <separator string="Periods"/><newline/>
-					    <field name="period_id" nolabel="1"/><newline/>
-					</group>
-					<newline/>
-				    <group>
-			    		<separator colspan="4"/>
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
-					</group>
-				</group>
-			</form>
+            <form string="Print Central Journal">
+                <group height="370" width="400">
+                    <group>
+                        <separator string="Journals"/><newline/>
+                        <field name="journal_id" nolabel="1"/><newline/>
+                        <separator string="Periods"/><newline/>
+                        <field name="period_id" nolabel="1"/><newline/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <separator colspan="4"/>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -35,12 +35,12 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-	        name="Central Journals"
-	        parent="account.menu_generic_report"
-	        action="action_account_central_journal"
-	        id="menu_account_central_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="Central Journals"
+            parent="account.menu_journals_report"
+            action="action_account_central_journal"
+            id="menu_account_central_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
-</openerp>
+    </data>
+</openerp>

addons/account/wizard/account_chart.py

@@ -33,7 +33,7 @@ class account_chart(osv.osv_memory):
                                     help = 'Keep empty for all open fiscal years'),
        'target_move': fields.selection([('all', 'All Entries'),
                                         ('posted', 'All Posted Entries')], 'Target Moves', required = True),
-              }
+    }
 
     def _get_fiscalyear(self, cr, uid, context=None):
         """Return default Fiscalyear value"""

addons/account/wizard/account_chart_view.xml

@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-          <record id="view_account_chart" model="ir.ui.view">
+        <record id="view_account_chart" model="ir.ui.view">
             <field name="name">account.chart.form</field>
             <field name="model">account.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts">
                     <group colspan="4" >
-                         <field name="fiscalyear"/>
-                           <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-                         <field name="target_move"/>
+                        <field name="fiscalyear"/>
+                        <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
+                        <field name="target_move"/>
                     </group>
-                            <separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
-                    	<button icon="terp-gtk-go-back-rtl" string="Open Charts"
-                    		name="account_chart_open_window" type="object" />
+                       <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="terp-gtk-go-back-rtl" string="Open Charts" name="account_chart_open_window" type="object" />
                     </group>
                 </form>
             </field>
-          </record>
+        </record>
 
         <record id="action_account_chart" model="ir.actions.act_window">
             <field name="name">Chart of Accounts</field>
             <field name="res_model">account.chart</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_chart"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_chart"/>
+            <field name="target">new</field>
         </record>
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"

addons/account/wizard/account_fiscalyear_close_state.py

@@ -58,6 +58,11 @@ cancelled, please check the box !'))
                     'WHERE fiscalyear_id = %s', ('done', fy_id))
             cr.execute('UPDATE account_fiscalyear ' \
                     'SET state = %s WHERE id = %s', ('done', fy_id))
+
+            # Log message for Fiscalyear
+            fy_pool = self.pool.get('account.fiscalyear')
+            fy_code = fy_pool.browse(cr, uid, fy_id, context=context).code
+            fy_pool.log(cr, uid, fy_id, "Fiscal year '%s' is closed, no more modification allowed." % (fy_code))
             return {}
 
 account_fiscalyear_close_state()

addons/account/wizard/account_general_journal_view.xml

@@ -2,27 +2,27 @@
 <openerp>
     <data>
 
-		<record id="view_account_general_journal" model="ir.ui.view">
+        <record id="view_account_general_journal" model="ir.ui.view">
             <field name="name">Account Genral Journal</field>
             <field name="model">account.general.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print General Journal">
-				<group height="380" width="400">
-				    <group>
-					    <separator string="Journals"/><newline/>
-					    <field name="journal_id" nolabel="1"/><newline/>
-					    <separator string="Periods"/><newline/>
-					    <field name="period_id" nolabel="1"/><newline/>
-					</group>
-					<newline/>
-				    <group>
-			    		<separator colspan="4"/>
-	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
-					</group>
-				</group>
-			</form>
+            <form string="Print General Journal">
+                <group height="380" width="400">
+                    <group>
+                        <separator string="Journals"/><newline/>
+                        <field name="journal_id" nolabel="1"/><newline/>
+                        <separator string="Periods"/><newline/>
+                        <field name="period_id" nolabel="1"/><newline/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <separator colspan="4"/>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
 
@@ -35,12 +35,12 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-	        name="General Journals"
-	        parent="account.menu_generic_report"
-	        action="action_account_general_journal"
-	        id="menu_account_general_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="General Journals"
+            parent="account.menu_journals_report"
+            action="action_account_general_journal"
+            id="menu_account_general_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
-</openerp>
+    </data>
+</openerp>

addons/account/wizard/account_general_ledger_report_view.xml

@@ -96,7 +96,7 @@
         <menuitem
         	icon="STOCK_PRINT"
 	        name="General Ledger"
-	        parent="account.menu_generic_report"
+	        parent="account.final_accounting_reports"
 	        action="action_account_general_ledger_menu"
 	        id="menu_general_ledger"
 	       />

addons/account/wizard/account_invoice_refund_view.xml

@@ -2,31 +2,37 @@
 <openerp>
     <data>
 
-    	<record id="view_account_invoice_refund" model="ir.ui.view">
+        <record id="view_account_invoice_refund" model="ir.ui.view">
             <field name="name">account.invoice.refund.form</field>
             <field name="model">account.invoice.refund</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Credit Note">
-                	<separator string="This wizard is used to refund the invoice" colspan="4"/>
-                	<group colspan="4" >
-                    	 <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
-                    	 <newline/>
-                    	 <field name="date"/>
-                    	 <field name="period"/>
-                    	 <field name="description"/>
+                    <separator string="This wizard is used to refund the invoice" colspan="4"/>
+                    <group colspan="4" >
+                         <label string="Are you sure you want to refund this invoice ?" colspan="2"/>
+                         <newline/>
+                         <field name="date"/>
+                         <field name="period"/>
+                         <field name="description"/>
                     </group>
-                       	<separator colspan="4"/>
+                    <separator colspan="4"/>
+                    <group col="4" colspan="4" fill="1">
+                        <label align="0.0" width="300" string="Refund Invoice: creates a refund invoice"/>
+                        <label align="0.0" width="500" colspan="4" string="Cancel Invoice: creates a reverse accounting entries to cancel the invoice"/>
+                        <label align="0.0" width="550" colspan="4" string="Modify Invoice: creates a refund invoice, and new copy of the same invoice ready for editing"/>
+                    </group>
+                    <separator colspan="4"/>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-redo" string="Refund Invoice" name="invoice_refund" type="object"/>
-                    	<button icon="gtk-ok" string="Cancel Invoice" name="invoice_cancel" type="object"/>
-                    	<button icon="gtk-undo" string="Modify Invoice" name="invoice_modify" type="object"/>
+                        <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-redo" string="Refund Invoice" name="invoice_refund" type="object"/>
+                        <button icon="gtk-ok" string="Cancel Invoice" name="invoice_cancel" type="object"/>
+                        <button icon="gtk-undo" string="Modify Invoice" name="invoice_modify" type="object"/>
                    </group>
                </form>
             </field>
-    	</record>
+        </record>
 
         <record id="action_account_invoice_refund" model="ir.actions.act_window">
             <field name="name">Credit Note</field>

addons/account/wizard/account_invoice_state_view.xml

@@ -25,15 +25,15 @@
            <field name="target">new</field>
         </record>
 
-        <record model="ir.values" id="action_account_invoice_confirm_values">
-            <field name="model_id" ref="account.model_account_invoice" />
-            <field name="object" eval="1" />
-            <field name="name">Confirm Draft Invoices</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />
-            <field name="key">action</field>
-            <field name="model">account.invoice</field>
-        </record>
+<!--        <record model="ir.values" id="action_account_invoice_confirm_values">-->
+<!--            <field name="model_id" ref="account.model_account_invoice" />-->
+<!--            <field name="object" eval="1" />-->
+<!--            <field name="name">Confirm Draft Invoices</field>-->
+<!--            <field name="key2">client_action_multi</field>-->
+<!--            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />-->
+<!--            <field name="key">action</field>-->
+<!--            <field name="model">account.invoice</field>-->
+<!--        </record>-->
 
         <record id="account_invoice_cancel_view" model="ir.ui.view">
             <field name="name">account.invoice.cancel.form</field>
@@ -59,15 +59,15 @@
            <field name="target">new</field>
         </record>
 
-        <record model="ir.values" id="action_account_invoice_cancel_values">
-            <field name="model_id" ref="account.model_account_invoice" />
-            <field name="object" eval="1" />
-            <field name="name">Cancel Selected Invoices</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />
-            <field name="key">action</field>
-            <field name="model">account.invoice</field>
-        </record>
+<!--        <record model="ir.values" id="action_account_invoice_cancel_values">-->
+<!--            <field name="model_id" ref="account.model_account_invoice" />-->
+<!--            <field name="object" eval="1" />-->
+<!--            <field name="name">Cancel Selected Invoices</field>-->
+<!--            <field name="key2">client_action_multi</field>-->
+<!--            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />-->
+<!--            <field name="key">action</field>-->
+<!--            <field name="model">account.invoice</field>-->
+<!--        </record>-->
 
     </data>
 </openerp>

addons/account/wizard/account_journal_select.py

@@ -38,10 +38,11 @@ class account_journal_select(osv.osv_memory):
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
         result = act_obj.read(cr, uid, [id])[0]
         cr.execute('select journal_id, period_id from account_journal_period where id=%s', (context['active_id'],))
-        journal_id, period_id = cr.fetchone()
-
-        result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
-        result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
+        res = cr.fetchone()
+        if res:
+            journal_id, period_id = res
+            result['domain'] = str([('journal_id', '=', journal_id), ('period_id', '=', period_id)])
+            result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
         return result
 
 

addons/account/wizard/account_move_bank_reconcile_view.xml

@@ -25,9 +25,10 @@
             <field name="res_model">account.move.bank.reconcile</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_move_bank_reconcile"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_move_bank_reconcile"/>
+            <field name="target">new</field>
+            <field name="help">Bank Reconciliation consists of verifying that your bank statement corresponds with the entries (or records) of that account in your accounting system.</field>
         </record>
 
     </data>
-</openerp>
+</openerp>

addons/account/wizard/account_move_line_select_view.xml

@@ -7,12 +7,12 @@
             <field name="model">account.move.line.select</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Account Select">
-                		<label string="Are you sure you want to open Account move line entries!" colspan="4"/>
-                       	<separator string="" colspan="4" />
+                <form string="Account Select">
+                    <label string="Are you sure you want to open Account move line entries!" colspan="4"/>
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
-                    	<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
+                        <button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                        <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
@@ -27,13 +27,13 @@
            <field name="target">new</field>
         </record>
 
-        <record id="ir_account_move_line_select" model="ir.values">
-            <field name="key2">tree_but_open</field>
-            <field name="model">account.account</field>
-            <field name="name">Open Account</field>
-            <field eval="'ir.actions.act_window,%d'%action_account_move_line_select_button" name="value"/>
-            <field eval="True" name="object"/>
-        </record>
+<!--        <record id="ir_account_move_line_select" model="ir.values">-->
+<!--            <field name="key2">tree_but_open</field>-->
+<!--            <field name="model">account.account</field>-->
+<!--            <field name="name">Open Account</field>-->
+<!--            <field eval="'ir.actions.act_window,%d'%action_account_move_line_select_button" name="value"/>-->
+<!--            <field eval="True" name="object"/>-->
+<!--        </record>-->
 
     </data>
 </openerp>

addons/account/wizard/account_partner_balance_report_view.xml

@@ -50,6 +50,7 @@
              <field name="view_id" ref="account_partner_balance_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
+             <field name="help">This report is analysis by partner. It is a PDF report containing one line per partner representing the cumulative credit balance.</field>
        </record>
 
  	   <menuitem icon="STOCK_PRINT"
@@ -59,4 +60,4 @@
  			parent="account.next_id_22"/>
 
      </data>
- </openerp>
+ </openerp>

addons/account/wizard/account_period_close.py

@@ -46,6 +46,11 @@ class account_period_close(osv.osv_memory):
                 for id in context['active_ids']:
                     cr.execute('update account_journal_period set state=%s where period_id=%s', (mode, id))
                     cr.execute('update account_period set state=%s where id=%s', (mode, id))
+
+                    # Log message for Period
+                    period_pool = self.pool.get('account.period')
+                    for period_id, name in period_pool.name_get(cr, uid, [id]):
+                        period_pool.log(cr, uid, period_id, "Period '%s' is closed, no more modification allowed for this period." % (name))
         return {}
 
 account_period_close()

addons/account/wizard/account_period_close_view.xml

@@ -27,8 +27,8 @@
             <field name="res_model">account.period.close</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_account_period_close"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="view_account_period_close"/>
+            <field name="target">new</field>
         </record>
 
         <record id="action_idea_post_vote_values" model="ir.values">
@@ -42,4 +42,4 @@
 	    </record>
 
     </data>
-</openerp>
+</openerp>

addons/account/wizard/account_pl_report.py

@@ -68,7 +68,7 @@ class account_pl_report(osv.osv_memory):
         'fiscalyear' : False,
         'display_account': 'bal_all',
         'display_type': True,
-        }
+    }
 
     def next_view(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
@@ -111,14 +111,12 @@ class account_pl_report(osv.osv_memory):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'pl.account.horizontal',
                 'datas': data,
-                'nodestroy':True,
                 }
         else:
             return {
                 'type': 'ir.actions.report.xml',
                 'report_name': 'pl.account',
                 'datas': data,
-                'nodestroy':True,
                 }
             
     def _check_date(self, cr, uid, data, context=None):

addons/account/wizard/account_pl_report_view.xml

@@ -55,6 +55,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Select Chart">
+                    <label string="Select account chart to print profit and loss account report" colspan="4"/>
+                    <separator colspan="4"/>
                     <field name="Account_list"/>
                     <separator colspan="4"/>
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -74,11 +76,6 @@
              <field name="target">new</field>
        </record>
        
-       <menuitem 
-            parent="account.menu_finance_legal_statement" 
-            id="final_accounting_reports"
-            name="Accounting Reports"/>
-
         <menuitem icon="STOCK_PRINT"
                 name="Profit And Loss"
                 action="action_pl_balance_account_report"

addons/account/wizard/account_print_journal_view.xml

@@ -2,51 +2,51 @@
 <openerp>
     <data>
 <!---->
-<!--		<record id="view_account_print_journal" model="ir.ui.view">-->
+<!--        <record id="view_account_print_journal" model="ir.ui.view">-->
 <!--            <field name="name">Account Print Journal</field>-->
 <!--            <field name="model">account.print.journal</field>-->
 <!--            <field name="type">form</field>-->
 <!--            <field name="arch" type="xml">-->
-<!--			<form string="Print Journal">-->
-<!--			    <group col="4" colspan="6">-->
-<!--				    <field name="journal_id"/>-->
-<!--				    <field name="period_id"/>-->
-<!--				    <newline/>-->
-<!--				    <field name="sort_selection"/>-->
-<!--				</group>-->
-<!--				<separator colspan="4"/>-->
-<!--			    <group col="2" colspan="4">-->
-<!--	            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>-->
-<!--						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>-->
-<!--				</group>-->
-<!--			</form>-->
+<!--            <form string="Print Journal">-->
+<!--                <group col="4" colspan="6">-->
+<!--                    <field name="journal_id"/>-->
+<!--                    <field name="period_id"/>-->
+<!--                    <newline/>-->
+<!--                    <field name="sort_selection"/>-->
+<!--                </group>-->
+<!--                <separator colspan="4"/>-->
+<!--                <group col="2" colspan="4">-->
+<!--                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>-->
+<!--                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>-->
+<!--                </group>-->
+<!--            </form>-->
 <!--            </field>-->
 <!--        </record>-->
 
 
-		<record id="view_account_print_journal" model="ir.ui.view">
+        <record id="view_account_print_journal" model="ir.ui.view">
             <field name="name">Account Print Journal</field>
             <field name="model">account.print.journal</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Print Journal">
-				<group height="400" width="400">
-			    <group>
-			    	<separator string="Journals"/><newline/>
-				    <field name="journal_id" nolabel="1"/><newline/>
-				    <separator string="Periods"/><newline/>
-				    <field name="period_id" nolabel="1"/><newline/>
-				</group>
-				<newline/>
-				<group>
-				    <field name="sort_selection"/>
-				    <newline/>
-					<separator colspan="4"/>
-            		<button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-					<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
-				</group>
-				</group>
-			</form>
+            <form string="Print Journal">
+                <group height="430" width="420">
+                    <group>
+                        <separator string="Journals"/><newline/>
+                        <field name="journal_id" nolabel="1"/><newline/>
+                        <separator string="Periods"/><newline/>
+                        <field name="period_id" nolabel="1"/><newline/>
+                    </group>
+                    <newline/>
+                    <group>
+                        <field name="sort_selection"/>
+                        <newline/>
+                        <separator colspan="4"/>
+                        <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                        <button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+                    </group>
+                </group>
+            </form>
             </field>
         </record>
         
@@ -59,12 +59,12 @@
             <field name="target">new</field>
         </record>
 
-		<menuitem
-	        name="Journals"
-	        parent="account.menu_generic_report"
-	        action="action_account_print_journal"
-	        id="menu_account_print_journal"
-	        icon="STOCK_PRINT"/>
+        <menuitem
+            name="Journals"
+            parent="account.menu_journals_report"
+            action="action_account_print_journal"
+            id="menu_account_print_journal"
+            icon="STOCK_PRINT"/>
 
-	</data>
-</openerp>
+    </data>
+</openerp>

addons/account/wizard/account_subscription_generate_view.xml

@@ -2,34 +2,34 @@
 <openerp>
     <data>
 
-          <record id="view_account_subscription_generate" model="ir.ui.view">
+        <record id="view_account_subscription_generate" model="ir.ui.view">
             <field name="name">account.subscription.generate.form</field>
             <field name="model">account.subscription.generate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute">
                     <group colspan="4" >
-                         <separator string="Generate entries before:" colspan="4"/>
-                           <field name="date"/>
+                        <separator string="Generate entries before:" colspan="4"/>
+                        <field name="date"/>
                     </group>
-                           <separator string="" colspan="4" />
+                    <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                           <label string ="" colspan="2"/>
+                        <label string ="" colspan="2"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel" />
                         <button icon="gtk-execute" string="Compute Entry Dates"
-                            name="action_generate" type="object" />
+                        name="action_generate" type="object" />
                     </group>
                </form>
             </field>
-          </record>
+        </record>
 
         <record id="action_account_subscription_generate" model="ir.actions.act_window">
-            <field name="name">Automatic Recurring</field>
+            <field name="name">Generate Entries</field>
             <field name="res_model">account.subscription.generate</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-               <field name="view_id" ref="view_account_subscription_generate"/>
-               <field name="target">new</field>
+            <field name="view_id" ref="view_account_subscription_generate"/>
+            <field name="target">new</field>
         </record>
 
         <menuitem action="action_account_subscription_generate" id="menu_generate_subscription" parent="account.menu_finance_recurrent_entries" />

addons/account/wizard/account_third_party_ledger.xml

@@ -53,6 +53,7 @@
              <field name="view_id" ref="account_partner_ledger_view"/>
              <field name="context">{'record_id':active_id}</field>
              <field name="target">new</field>
+             <field name="help">To get detailed information about a partner you can ask for the Partner Ledgers.</field>
        </record>
 
  	   <menuitem icon="STOCK_PRINT"

addons/account/wizard/account_use_model_view.xml

@@ -10,7 +10,8 @@
             <form string="Create Entries From Models">
                 <group height="240" width="510">
                     <separator string="This wizard will create recurring accounting entries" colspan="4"/>
-                    <field name="model"/>
+                    <label string="Select recurring to create a manualy recurring accounting entries" width="400"/>
+                    <field name="model" colspan="4" nolabel="1"/>
                     <separator colspan="4"/>
                     <group colspan="4" col="2">
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
@@ -41,8 +42,8 @@
             <field name="model">account.move.line</field>
         </record>
 
-        <menuitem action="action_view_account_use_model"
-                    parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>
+<!--        <menuitem action="action_view_account_use_model"-->
+<!--                    parent="account.menu_finance_recurrent_entries" id="menu_account_use_model"/>-->
 
         <record id="view_account_use_model_open_entry" model="ir.ui.view">
             <field name="name">account.use.model.open.entry.form</field>
@@ -50,7 +51,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="6" width="300" height="70">
                            <label string = "Entry Lines Created." colspan="2"/>
                            <newline/>
                         <button icon="gtk-ok" special="cancel" string="Ok"/>
@@ -66,7 +67,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Use Model">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="6" width="300" height="70">
                            <label string = "Are you sure you want to create entries?" colspan="2"/>
                            <newline/>
                         <button icon="terp-gtk-stop" special="cancel" string="Cancel"/>

addons/account/wizard/account_validate_move_view.xml

@@ -16,7 +16,7 @@
                 <field name="period_id"/>
                 <group colspan="4" col="6">
                     <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    <button icon="terp-camera_test" string="Validate" name="validate_move" type="object"/>
+                    <button icon="terp-camera_test" string="Approve" name="validate_move" type="object"/>
                </group>
                </form>
             </field>
@@ -27,8 +27,9 @@
             <field name="res_model">validate.account.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-           <field name="view_id" ref="validate_account_move_view"/>
-           <field name="target">new</field>
+            <field name="view_id" ref="validate_account_move_view"/>
+            <field name="target">new</field>
+            <field name="help">The process of ledger is the process of transferring debit and credit amounts from a journal of original entry to a ledger book.</field>
         </record>
 
         <menuitem
@@ -47,7 +48,7 @@
               <form string="Validate Moves">
               <separator string="Validate Ledger Postings" colspan="4"/>
                   <button special="cancel" string="Cancel" icon="gtk-cancel"/>
-                <button name="validate_move_lines" string="Validate" type="object" icon="gtk-go-forward" default_focus="1"/>
+                <button name="validate_move_lines" string="Approve" type="object" icon="gtk-go-forward" default_focus="1"/>
             </form>
             </field>
         </record>

addons/account/wizard/account_vat_view.xml

@@ -33,6 +33,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="help">This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by Open ERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
         </record>
 
 		<menuitem

addons/account_analytic_analysis/i18n/nl_BE.po

@@ -1,23 +1,27 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_analysis
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:34:14+0000\n"
-"PO-Revision-Date: 2009-08-28 15:34:14+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-07-20 12:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
-msgid "Number of hours that can be invoiced plus those that already have been invoiced."
+msgid ""
+"Number of hours that can be invoiced plus those that already have been "
+"invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -41,6 +45,7 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
 
 #. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
 msgid "All Analytic Accounts"
 msgstr ""
@@ -78,8 +83,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
@@ -110,7 +117,9 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
-msgid "If invoice from the costs, this is the date of the latest work or cost that have been invoiced."
+msgid ""
+"If invoice from the costs, this is the date of the latest work or cost that "
+"have been invoiced."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -130,7 +139,9 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
-msgid "Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."
+msgid ""
+"Number of hours you spent on the analytic account (from timesheet). It "
+"computes on all journal of type 'general'."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -140,7 +151,10 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
-msgid "Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."
+msgid ""
+"Based on the costs you had on the project, what would have been the revenue "
+"if all these costs have been invoiced at the normal sale price provided by "
+"the pricelist."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -174,7 +188,8 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
-msgid "Modify account analytic view to show\n"
+msgid ""
+"Modify account analytic view to show\n"
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
@@ -252,7 +267,9 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid "Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."
+msgid ""
+"Number of hours (from journal of type 'general') that can be invoiced if you "
+"invoice based on analytic account."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -267,7 +284,9 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
-msgid "If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs."
+msgid ""
+"If invoice from analytic account, the remaining amount you can invoice to "
+"the customer based on the total costs."
 msgstr ""
 
 #. module: account_analytic_analysis
@@ -312,6 +331,7 @@ msgstr ""
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
-msgid "Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets."
+msgid ""
+"Total of costs for this account. It includes real costs (from invoices) and "
+"indirect costs, like time spent on timesheets."
 msgstr ""
-

addons/account_analytic_analysis/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-13 03:49+0000\n"
+"PO-Revision-Date: 2010-07-13 04:28+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-13 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -21,7 +21,7 @@ msgstr ""
 msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
-msgstr ""
+msgstr "小时数能加在已开的发票上"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -31,7 +31,7 @@ msgstr "用户的小时数合计"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "最近开票日期"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -270,12 +270,12 @@ msgstr "计算公式为:(实际利润/总成本×100)"
 msgid ""
 "Number of hours (from journal of type 'general') that can be invoiced if you "
 "invoice based on analytic account."
-msgstr "如果你的发票基于这辅助核算项目"
+msgstr "如果你的发票基于这辅助核算项, 小时数(从记录集合类型是\"普通\")可以开发票"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic accounts"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -287,7 +287,7 @@ msgstr "剩余的收入"
 msgid ""
 "If invoice from analytic account, the remaining amount you can invoice to "
 "the customer based on the total costs."
-msgstr "如果是辅助核算项目的发票,剩余金额你能给客户开基于总成本的发票"
+msgstr "如果是辅助核算项的发票, 剩余金额你能给客户开基于总成本的发票"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
@@ -315,23 +315,23 @@ msgstr "月"
 #: field:account_analytic_analysis.summary.month,account_id:0
 #: field:account_analytic_analysis.summary.user,account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_overpassed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_managed_overpassed
 msgid "Overpassed Accounts"
-msgstr "已废弃项目"
+msgstr "已废弃项"
 
 #. module: account_analytic_analysis
 #: 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 "All Uninvoiced Entries"
-msgstr "所有未开发票凭证"
+msgstr "所有未开发票"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
 msgid ""
 "Total of costs for this account. It includes real costs (from invoices) and "
 "indirect costs, like time spent on timesheets."
-msgstr "这科目的成本合计,它包括实际成本(发票)和间接成本,如花费的时间表"
+msgstr "这项的成本合计,它包括实际成本(发票)和间接成本,如花费的时间表"

addons/account_analytic_default/__openerp__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -31,7 +31,7 @@ Allows to automatically select analytic accounts based on criterions:
 * Company
 * Date
     """,
-    'author'    : 'Tiny',
+    'author'    : 'OpenERP SA',
     'website'   : 'http://www.openerp.com',
     'depends'   : ['sale'],
     'init_xml'  : [],

addons/account_analytic_default/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-29 00:37+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-07-13 04:32+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -21,7 +21,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_form
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_defaul_form
 msgid "Analytic Defaults"
-msgstr "默认辅助核算科目"
+msgstr "默认辅助核算项"
 
 #. module: account_analytic_default
 #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information
@@ -31,13 +31,13 @@ msgstr "默认科目辅助核算"
 #. module: account_analytic_default
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构xml文件"
+msgstr "无效XML视图结构!"
 
 #. module: account_analytic_default
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr "这对象名必须以x_开头并且不能包含特殊的字符!"
+msgstr "对象名称必须以“x_”开头且不能包含任何特殊字符！"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -67,7 +67,7 @@ msgstr "产品"
 #. module: account_analytic_default
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "辅助核算科目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
@@ -82,12 +82,12 @@ msgstr "用户"
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "动作定义里模块名无效"
+msgstr "在动作定义使用了无效的模块名。"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open
 msgid "Entries"
-msgstr "条目"
+msgstr "记录"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,partner_id:0
@@ -102,7 +102,7 @@ msgstr "开始日期"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Conditions"
-msgstr "情况"
+msgstr "条件"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner

addons/account_analytic_plans/__openerp__.py

@@ -54,7 +54,7 @@ for one account entry.
 The analytic plan validates the minimum and maximum percentage at the time of creation
 of distribution models.
         """,
-    'author'    : 'Tiny',
+    'author'    : 'OpenERP SA',
     'website'   : 'http://www.openerp.com',
     'depends'   : ['account', 'account_analytic_default'],
     'init_xml'  : [],

addons/account_analytic_plans/account_analytic_plans_view.xml

@@ -192,8 +192,8 @@
         <field name="view_mode">tree,form</field>
     </record>
 
-	<menuitem
-        parent="account.menu_analytic"
+    <menuitem
+        parent="account.menu_analytic_accounting"
         name="Multi Plans"
         id="menu_account_analytic_multi_plan_action"
         />

addons/account_analytic_plans/i18n/pt_BR.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-12 23:52+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2010-07-27 20:25+0000\n"
+"Last-Translator: Leandro Chaves <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-28 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -136,7 +136,7 @@ msgstr "Selecione Informação"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr ""
+msgstr "ID Conta3"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
@@ -157,27 +157,27 @@ msgstr "Ref. Conta Analítica"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Conta Analítica:"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 msgid "Analytic Plan Line"
-msgstr ""
+msgstr "Linha do Plano Analítico"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "Conta Analítica Referencia"
 
 #. module: account_analytic_plans
 #: model:ir.actions.wizard,name:account_analytic_plans.create_model
 msgid "Create Model"
-msgstr ""
+msgstr "Criar Modelo"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr ""
+msgstr "Lançamentos padrões"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -185,32 +185,32 @@ msgstr ""
 #: field:account.journal,plan_id:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 msgid "Analytic Plans"
-msgstr ""
+msgstr "Planos Analíticos"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr ""
+msgstr "Mínimo Permitido (%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr ""
+msgstr "Id Conta1"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
 msgid "Maximum Allowed (%)"
-msgstr ""
+msgstr "Máximo Permitido (%)"
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
 msgid "Distribution Model Saved"
-msgstr ""
+msgstr "Modelo de Distribuição Arquivado (Salvo)"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr ""
+msgstr "Instância do Plano Analítico"
 
 #. module: account_analytic_plans
 #: constraint:ir.ui.view:0
@@ -220,7 +220,7 @@ msgstr "Invalido XML para Arquitetura da View"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr ""
+msgstr "Modelos de Distribuição"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
@@ -256,17 +256,47 @@ msgid ""
 "for one account entry.\n"
 "        "
 msgstr ""
+"Este modelo permite o uso de vários planos analíticos, de acordo com o "
+"diário geral,\n"
+"de forma que várias linhas analíticas são criadas quando a fatura ou "
+"lançamento\n"
+"são confirmadas.\n"
+"\n"
+"Por exemplo, você pode definir a seguinte estrutura analítica:\n"
+"  Projetos\n"
+"      Projeto 1\n"
+"        SubProj 1.1\n"
+"        SubProj 1.2\n"
+"      Projeto 2\n"
+"  Vendedor\n"
+"      Erico\n"
+"      Fabiano\n"
+"\n"
+"No exemplo temos dois planos: Projetos e Vendedores. Uma fatura deve\n"
+"ser capaz de escrever lançamentos analíticos nos 2 planos: SubProj 1.1 e\n"
+"Fabiano. A conta também pode ser separada. O exemplo a seguir é para\n"
+"uma fatura que envolve os 2 subprojetos e está associada a um vendedor:\n"
+"\n"
+"Plano1:\n"
+"    SubProjeto 1.1: 50%\n"
+"    SubProjeto 1.2: 50%\n"
+"Plano2:\n"
+"    Eric: 100%\n"
+"\n"
+"Quando esta linha da fatura for confirmada, ela vai gerar 3 linhas\n"
+"analíticas, para um lançamento na conta,\n"
+"        "
 
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
+msgstr "Múltiplos-planos gerenciados na Contabilidade Analítica"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Lines"
-msgstr ""
+msgstr "Linhas do Plano Analítico"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -276,68 +306,69 @@ msgstr ""
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
-msgstr ""
+msgstr "Plano do Modelo"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr ""
+msgstr "Id Conta2"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr ""
+msgstr "Valor"
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr ""
+msgstr "Conta raiz para este plano."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr ""
+msgstr "Id Conta6"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantidade"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr ""
+msgstr "Id Conta"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: account_analytic_plans
 #: wizard_button:create.model,info,end:0
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Conta Raiz"
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
 msgid ""
 "This distribution model has been saved. You will be able to reuse it later."
 msgstr ""
+"Este modelo de distribuição foi salvo. Você poderá reutilizá-lo mais tarde."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sequência"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta analítica"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -346,29 +377,29 @@ msgstr ""
 #: field:account.invoice.line,analytics_id:0
 #: field:account.move.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Distribuição Analítica"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
 msgid "Analytic Distribution's models"
-msgstr ""
+msgstr "Modelos de Distribuição Analítica"
 
 #. module: account_analytic_plans
 #: wizard_button:wizard.crossovered.analytic,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date1:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de Início"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "Data Inicial"

addons/account_analytic_plans/i18n/vi.po

@@ -1,20 +1,21 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_analytic_plans
+# Vietnamese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-07-20 03:43+0000\n"
+"Last-Translator: Business Link Development Technologies <Unknown>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-21 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -23,8 +24,9 @@ msgstr ""
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "Tên đối tượng phải bắt đầu bằng chữ x_ và không chứa ký tự đặc biệt"
 
 #. module: account_analytic_plans
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
@@ -222,374 +224,9 @@ msgstr ""
 
 #. module: account_analytic_plans
 #: model:ir.module.module,description:account_analytic_plans.module_meta_information
-msgid "This module allows to use several analytic plans, according to the general journal,\n"
-"so that multiple analytic lines are created when the invoice or the entries\n"
-"are confirmed.\n"
-"\n"
-"For example, you can define the following analytic structure:\n"
-"  Projects\n"
-"      Project 1\n"
-"          SubProj 1.1\n"
-"          SubProj 1.2\n"
-"      Project 2\n"
-"  Salesman\n"
-"      Eric\n"
-"      Fabien\n"
-"\n"
-"Here, we have two plans: Projects and Salesman. An invoice line must\n"
-"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n"
-"Fabien. The amount can also be split. The following example is for\n"
-"an invoice that touches the two subproject and assigned to one salesman:\n"
-"\n"
-"Plan1:\n"
-"    SubProject 1.1 : 50%\n"
-"    SubProject 1.2 : 50%\n"
-"Plan2:\n"
-"    Eric: 100%\n"
-"\n"
-"So when this line of invoice will be confirmed, it will generate 3 analytic lines,\n"
-"for one account entry.\n"
-"        "
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.line:0
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
-msgid "Analytic Plan Lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Crossovered Analytic -"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,plan_id:0
-msgid "Model's Plan"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account2_ids:0
-msgid "Account2 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Amount"
-msgstr ""
-
-#. module: account_analytic_plans
-#: help:account.analytic.plan.line,root_analytic_id:0
-msgid "Root account of this plan."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account6_ids:0
-msgid "Account6 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Quantity"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account_ids:0
-msgid "Account Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_button:create.model,info,end:0
-msgid "OK"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,root_analytic_id:0
-msgid "Root Account"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_view:create.model,info:0
-msgid "This distribution model has been saved. You will be able to reuse it later."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,analytic_account_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.default,analytics_id:0
-#: view:account.analytic.plan.instance:0
-#: field:account.analytic.plan.instance,name:0
-#: field:account.invoice.line,analytics_id:0
-#: field:account.move.line,analytics_id:0
-msgid "Analytic Distribution"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action
-msgid "Analytic Distribution's models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_button:wizard.crossovered.analytic,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date1:0
-msgid "Start Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "at"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "From Date"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* account_analytic_plans
-#
 msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account4_ids:0
-msgid "Account4 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
-#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report
-msgid "Crossovered Analytic"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account5_ids:0
-msgid "Account5 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,date2:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,rate:0
-msgid "Rate (%)"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan:0
-#: field:account.analytic.plan,name:0
-#: field:account.analytic.plan.line,plan_id:0
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
-msgid "Analytic Plan"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
-msgid "Analytic Instance Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_button:wizard.crossovered.analytic,init,print:0
-msgid "Print"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "To Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,plan_id:0
-msgid "Plan Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
-msgid "Analytic Distribution's Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Account Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,code:0
-msgid "Distribution Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,name:0
-msgid "Plan Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Printing date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Percentage"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,empty_line:0
-msgid "Dont show empty lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_view:wizard.crossovered.analytic,init:0
-msgid "Select Information"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account3_ids:0
-msgid "Account3 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,journal_id:0
-#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
-msgid "Analytic Journal"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "100.00%"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_field:wizard.crossovered.analytic,init,ref:0
-msgid "Analytic Account Ref."
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account :"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.line:0
-msgid "Analytic Plan Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: rml:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account Reference:"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.wizard,name:account_analytic_plans.create_model
-msgid "Create Model"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan,default_instance_id:0
-msgid "Default Entries"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan:0
-#: field:account.analytic.plan,plan_ids:0
-#: field:account.journal,plan_id:0
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
-msgid "Analytic Plans"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,min_required:0
-msgid "Minimum Allowed (%)"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account1_ids:0
-msgid "Account1 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,max_required:0
-msgid "Maximum Allowed (%)"
-msgstr ""
-
-#. module: account_analytic_plans
-#: wizard_view:create.model,info:0
-msgid "Distribution Model Saved"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
-msgid "Analytic Plan Instance"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
-msgid "Distribution Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.module.module,description:account_analytic_plans.module_meta_information
-msgid "This module allows to use several analytic plans, according to the general journal,\n"
+"This module allows to use several analytic plans, according to the general "
+"journal,\n"
 "so that multiple analytic lines are created when the invoice or the entries\n"
 "are confirmed.\n"
 "\n"
@@ -614,7 +251,8 @@ msgid "This module allows to use several analytic plans, according to the genera
 "Plan2:\n"
 "    Eric: 100%\n"
 "\n"
-"So when this line of invoice will be confirmed, it will generate 3 analytic lines,\n"
+"So when this line of invoice will be confirmed, it will generate 3 analytic "
+"lines,\n"
 "for one account entry.\n"
 "        "
 msgstr ""
@@ -687,7 +325,8 @@ msgstr ""
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
-msgid "This distribution model has been saved. You will be able to reuse it later."
+msgid ""
+"This distribution model has been saved. You will be able to reuse it later."
 msgstr ""
 
 #. module: account_analytic_plans
@@ -733,4 +372,3 @@ msgstr ""
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
 msgstr ""
-

addons/account_analytic_plans/i18n/zh_CN.po

@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 06:54+0000\n"
+"PO-Revision-Date: 2010-07-13 08:33+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr "科目4ID"
+msgstr "项4ID"
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
@@ -36,7 +36,7 @@ msgstr "交叉辅助核算"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr "科目5ID"
+msgstr "项5ID"
 
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,date2:0
@@ -75,7 +75,7 @@ msgstr "打印"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr "至今为止"
+msgstr "日期到"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
@@ -90,7 +90,7 @@ msgstr "辅助核算分配模型"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "科目名称"
+msgstr "项名称"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -135,13 +135,13 @@ msgstr "选择信息"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr "科目3ID"
+msgstr "项3ID"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
 #: wizard_field:wizard.crossovered.analytic,init,journal_ids:0
 msgid "Analytic Journal"
-msgstr "辅助核算分类帐"
+msgstr "辅助核算记录集合"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -151,12 +151,12 @@ msgstr "100.00%"
 #. module: account_analytic_plans
 #: wizard_field:wizard.crossovered.analytic,init,ref:0
 msgid "Analytic Account Ref."
-msgstr "辅助核算项目参考"
+msgstr "辅助核算项参考"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr "辅助核算项目:"
+msgstr "辅助核算项:"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
@@ -166,7 +166,7 @@ msgstr "辅助核算方案明细"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr "辅助核算项目参考:"
+msgstr "辅助核算项参考:"
 
 #. module: account_analytic_plans
 #: model:ir.actions.wizard,name:account_analytic_plans.create_model
@@ -176,7 +176,7 @@ msgstr "创建模型"
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr "默认凭证"
+msgstr "默认记录"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -194,7 +194,7 @@ msgstr "最小允许(%)"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr "科目1ID"
+msgstr "项1ID"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
@@ -209,7 +209,7 @@ msgstr "分配模型保存"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr "核算方案实例"
+msgstr "辅助核算方案实例"
 
 #. module: account_analytic_plans
 #: constraint:ir.ui.view:0
@@ -255,8 +255,8 @@ msgid ""
 "for one account entry.\n"
 "        "
 msgstr ""
-"这模块允许使用几个辅助核算方案并根据他们生成分类帐\n"
-"\t所以当开发票或确认凭证时\n"
+"这模块允许使用几个辅助核算方案并根据他们生成记录集合\n"
+"\t所以当开发票或确认记录时\n"
 "建立多个辅助核算明细\n"
 "\t\n"
 "\t例子:你可以定义以下辅助核算结构:\n"
@@ -307,7 +307,7 @@ msgstr "模型方案"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr "科目2ID"
+msgstr "项2ID"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -317,12 +317,12 @@ msgstr "金额"
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
 msgid "Root account of this plan."
-msgstr "这方案的根辅助核算项目"
+msgstr "这方案的根辅助核算项"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr "科目6ID"
+msgstr "项6ID"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -332,7 +332,7 @@ msgstr "数量"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr "科目ID"
+msgstr "项ID"
 
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
@@ -347,7 +347,7 @@ msgstr "确定"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr "根辅助核算项目"
+msgstr "根项"
 
 #. module: account_analytic_plans
 #: wizard_view:create.model,info:0
@@ -363,7 +363,7 @@ msgstr "序列"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -397,4 +397,4 @@ msgstr "在"
 #. module: account_analytic_plans
 #: rml:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr "根据日期"
+msgstr "日期从"

addons/account_anglo_saxon/__openerp__.py

@@ -21,7 +21,7 @@
 {
     "name"      : "Stock Accounting for Anglo Saxon countries",
     "version"   : "1.2",
-    "author"    : "Tiny, Veritos",
+    "author"    : "OpenERP SA, Veritos",
     "website"   : "http://tinyerp.com - http://veritos.nl",
     "description" : """This module will support the Anglo-Saxons accounting methodology by
     changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries

addons/account_anglo_saxon/i18n/nl.po

@@ -0,0 +1,66 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-07-16 15:49+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <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: 2010-07-17 03:53+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr "Voorraadrekening"
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Prijsverschillen rekening"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
+"Deze rekening wordt gebruikt om de prijsverschillen tussen inkoop- en "
+"kostprijs te boeken."

addons/account_anglo_saxon/i18n/zh_CN.po

@@ -0,0 +1,64 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-07-13 08:42+0000\n"
+"Last-Translator: Black Jack <onetimespeed@hotmail.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: 2010-07-14 03:37+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " 会计属性"
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+"    changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+"    and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+"    Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+"    This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+"    when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr "库存科目"
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "无效XML视图结构!"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "价格差异科目"
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr "这科目将用于在采购价格和销售价格之间的价格差异"

addons/account_budget/__openerp__.py

@@ -43,7 +43,7 @@ Three reports are available:
     3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts, of the Master Budgets per Budgets.
 
 """,
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],

addons/account_budget/crossovered_budget_view.xml

@@ -148,7 +148,7 @@
                             <field name="state" select="1"/>
                             <group col="4" colspan="2">
                                 <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
-                                <button string="Validate" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
+                                <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
                                 <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
                                 <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
                                 <!--<button string="Set to Draft" name="action_set_to_draft" states="cancel" type="object"/>-->
@@ -163,7 +163,7 @@
             <field name="model">crossovered.budget</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Budget">
+            	 <tree colors="blue:state in ('draft');gray:state in ('done','cancel');black:state in ('confirm','validate')" string="Budget">
                     <field name="name" colspan="1" select="1"/>
                     <field name="code" colspan="1" select="1" />
                     <field name="state"/>
@@ -181,7 +181,7 @@
                <search string="Budget">
                    <group col="20" colspan="4">
                        <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help="Draft Budgets"  default="1"/>
-                       <filter string="To Validate" icon="terp-gtk-go-back-rtl" domain="[('state','=','validate')]" help="To Validate Budgets" />
+                       <filter string="To Approve" icon="terp-gtk-go-back-rtl" domain="[('state','=','validate')]" help="To Approve Budgets" />
                        <separator orientation="vertical"/>
                        <field name="name" select="1"/>
                        <field name="code" select="1" />

addons/account_budget/i18n/pt_BR.po

@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:30+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
+"PO-Revision-Date: 2010-07-27 20:39+0000\n"
+"Last-Translator: Leandro Chaves <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-28 03:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Usuário responsável"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -30,28 +30,28 @@ msgstr "% desempenho"
 #: 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 "Posições Orçamentárias"
 
 #. module: account_budget
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Printed at:"
-msgstr ""
+msgstr "Impresso em:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Confirm"
-msgstr ""
+msgstr "confirmar"
 
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "Validar usuário"
 
 #. module: account_budget
 #: constraint:ir.model:0
@@ -64,12 +64,12 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Confirmado"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Período"
 
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date2:0
@@ -77,61 +77,61 @@ msgstr ""
 #: wizard_field:wizard.crossovered.budget,init,date_to:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
 msgid "End of period"
-msgstr ""
+msgstr "Fim do período"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Printing date:"
-msgstr ""
+msgstr "Data de impressão:"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Provisório"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #. module: account_budget
 #: view:account.budget.post:0
 msgid "Dotations"
-msgstr ""
+msgstr "Dotações"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Performance"
-msgstr ""
+msgstr "Desempenho"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Currency:"
-msgstr ""
+msgstr "Moeda:"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "From"
-msgstr ""
+msgstr "De"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentagem"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Results"
-msgstr ""
+msgstr "Resultados"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr ""
+msgstr "Estado"
 
 #. module: account_budget
 #: model:ir.module.module,description:account_budget.module_meta_information
@@ -162,23 +162,46 @@ msgid ""
 "Budgets per Budgets.\n"
 "\n"
 msgstr ""
+"Este módulo permite um gerenciamento de orçamentos analíticos e cruzamento "
+"com outros módulos.\n"
+"\n"
+"Uma vez definido o Orçamento Principal e Orçamentos acessórios (em "
+"Finanças/Gerenciamento/Orçamento/), os Gerentes de Projeto podem marcar o "
+"montante planejado em cada Conta Analítica.\n"
+"\n"
+"O contador tem a possibilidade de ver o montante total planejado por cada "
+"Orçamento (Principal e Acessório) para poder se assegurar de que o total "
+"planejado não é maior ou menor do que o planejado para esse Orçamento. Cada "
+"lista de registros poderá ser alternada para o modo gráfico. \n"
+"\n"
+"Três relatórios estão disponíveis:\n"
+"\n"
+"1. O primeiro está disponível na Lista de Orçamentos. Este demonstra a "
+"alocação, para os Orçamentos, das Contas Analíticas por Orçamento "
+"Principal.\n"
+"2. O segundo é um resumo do primeiro. Somente demonstra a alocação, para os "
+"Orçamentos selecionados, das Contas Analíticas.\n"
+"3. O último está disponível no Plano de Contas Analítico. Demonstra a "
+"alocação, para as Contas selecionadas, do Orçamento Principal, por "
+"Orçamento.\n"
+"\n"
 
 #. module: account_budget
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Description"
-msgstr ""
+msgstr "Descrição"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "Conta Analítica:"
 
 #. module: account_budget
 #: wizard_button:account.budget.report,init,report:0
@@ -186,12 +209,12 @@ msgstr ""
 #: wizard_button:wizard.crossovered.budget,init,report:0
 #: wizard_button:wizard.crossovered.budget.summary,init,report:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "A/c No."
-msgstr ""
+msgstr "No.Cta."
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
@@ -205,60 +228,60 @@ msgstr "para"
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 #: rml:crossovered.budget.report:0
 msgid "Planned Amount"
-msgstr ""
+msgstr "Valor Planejado"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "Perc(%)"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Period Budget"
-msgstr ""
+msgstr "Orçamento do Período"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Analysis"
-msgstr ""
+msgstr "Análise do Orçamento"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 #: selection:crossovered.budget,state:0
 msgid "Done"
-msgstr ""
+msgstr "Completo"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Validate"
-msgstr ""
+msgstr "Validar"
 
 #. module: account_budget
 #: wizard_view:wizard.crossovered.budget,init:0
 #: wizard_view:wizard.crossovered.budget.summary,init:0
 msgid "Select Options"
-msgstr ""
+msgstr "Selecione Opções"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 #: rml:crossovered.budget.report:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "Valor Real"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
 #: field:crossovered.budget.lines,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Data Final"
 
 #. module: account_budget
 #: constraint:ir.ui.view:0
@@ -268,7 +291,7 @@ msgstr "Invalido XML para Arquitetura da View"
 #. module: account_budget
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "Valor Estimado"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -280,18 +303,18 @@ msgstr "Nome"
 #. module: account_budget
 #: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu_1
 msgid "Print Summary of Budgets"
-msgstr ""
+msgstr "Imprimir Resumo dos Orçamentos"
 
 #. module: account_budget
 #: model:ir.actions.wizard,name:account_budget.wizard_budget_spread
 msgid "Spread amount"
-msgstr ""
+msgstr "Valor Alocado"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 #: view:account.budget.post:0
 msgid "Lines"
-msgstr ""
+msgstr "Linhas"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -302,58 +325,58 @@ msgstr ""
 #: model:ir.model,name:account_budget.model_crossovered_budget
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_view
 msgid "Budget"
-msgstr ""
+msgstr "Orçamento"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,post_id:0
 msgid "Item"
-msgstr ""
+msgstr "Item"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,amount:0
 #: wizard_field:account.budget.spread,init,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Valor"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr ""
+msgstr "Data do Pagamento"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_post_tree
 #: model:ir.ui.menu,name:account_budget.menu_action_account_budget_post_tree
 #: model:ir.ui.menu,name:account_budget.next_id_31
 msgid "Budgets"
-msgstr ""
+msgstr "Orçamentos"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: account_budget
 #: view:account.budget.post.dotation:0
 #: model:ir.model,name:account_budget.model_account_budget_post_dotation
 msgid "Budget Dotation"
-msgstr ""
+msgstr "Dotação Orçamentária"
 
 #. module: account_budget
 #: view:account.budget.post.dotation:0
 msgid "Budget Dotations"
-msgstr ""
+msgstr "Dotações Orçamentárias"
 
 #. module: account_budget
 #: rml:account.budget:0
 msgid "Budget Item Detail"
-msgstr ""
+msgstr "Detalhe do Item do Orçamento"
 
 #. 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 "Posição Orçamentária"
 
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date1:0
@@ -361,7 +384,7 @@ msgstr ""
 #: wizard_field:wizard.crossovered.budget,init,date_from:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
 msgid "Start of period"
-msgstr ""
+msgstr "Início do período"
 
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
@@ -369,49 +392,49 @@ msgstr ""
 #: model:ir.actions.wizard,name:account_budget.account_analytic_account_budget_report
 #: model:ir.actions.wizard,name:account_budget.wizard_crossovered_budget_menu
 msgid "Print Budgets"
-msgstr ""
+msgstr "Imprimir Orçamentos"
 
 #. module: account_budget
 #: field:account.budget.post,code:0
 #: field:crossovered.budget,code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: account_budget
 #: field:account.budget.post.dotation,tot_planned:0
 msgid "Total Planned Amount"
-msgstr ""
+msgstr "Valor Total Planejado"
 
 #. module: account_budget
 #: wizard_view:wizard.analytic.account.budget.report,init:0
 msgid "Select Dates Period"
-msgstr ""
+msgstr "Selecione as Datas do Período"
 
 #. module: account_budget
 #: field:account.budget.post,dotation_ids:0
 msgid "Spreading"
-msgstr ""
+msgstr "Alocação"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "Valor Planejado"
 
 #. module: account_budget
 #: wizard_field:account.budget.spread,init,fiscalyear:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Ano Fiscal"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Conta Analítica"
 
 #. module: account_budget
 #: rml:crossovered.budget.report:0
 msgid "Budget :"
-msgstr ""
+msgstr "Orçamento:"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -419,18 +442,18 @@ msgstr ""
 #: wizard_view:account.budget.spread,init:0
 #: wizard_button:account.budget.spread,init,spread:0
 msgid "Spread"
-msgstr ""
+msgstr "Alocação"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:account.budget.post,account_ids:0
 msgid "Accounts"
-msgstr ""
+msgstr "Contas"
 
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_budget
 msgid "Print Budget"
-msgstr ""
+msgstr "Imprimir Orçamento"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -445,7 +468,7 @@ msgstr ""
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 #: model:ir.ui.menu,name:account_budget.menu_act_crossovered_budget_lines_view
 msgid "Budget Lines"
-msgstr ""
+msgstr "Linhas do Orçamento"
 
 #. module: account_budget
 #: wizard_button:account.budget.report,init,end:0
@@ -455,31 +478,31 @@ msgstr ""
 #: wizard_button:wizard.crossovered.budget,init,end:0
 #: wizard_button:wizard.crossovered.budget.summary,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_budget
 #: model:ir.module.module,shortdesc:account_budget.module_meta_information
 msgid "Budget Management"
-msgstr ""
+msgstr "Administração do Orçamento"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data de Início"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "Análise de"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Validado"
 
 #. module: account_budget
 #: wizard_view:account.budget.report,init:0
 msgid "Select period"
-msgstr ""
+msgstr "Selecione período"

addons/account_budget/i18n/zh_CN.po

@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 06:58+0000\n"
+"PO-Revision-Date: 2010-07-13 08:55+0000\n"
 "Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n"
+"X-Launchpad-Export-Date: 2010-07-14 03:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "责任用户"
+msgstr "负责用户"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -30,7 +30,7 @@ msgstr "% 执行%"
 #: 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 "预算状况"
 
 #. module: account_budget
 #: constraint:ir.actions.act_window:0
@@ -75,7 +75,7 @@ msgstr "会计期间"
 #: wizard_field:wizard.crossovered.budget,init,date_to:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_to:0
 msgid "End of period"
-msgstr "会计期间结束"
+msgstr "结束会计期间"
 
 #. module: account_budget
 #: rml:account.budget:0
@@ -183,7 +183,7 @@ msgstr ""
 #: rml:account.budget:0
 #: rml:crossovered.budget.report:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
@@ -194,7 +194,7 @@ msgstr "说明"
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
 msgid "Analytic Account :"
-msgstr "辅助核算项目:"
+msgstr "辅助核算项:"
 
 #. module: account_budget
 #: wizard_button:account.budget.report,init,report:0
@@ -207,7 +207,7 @@ msgstr "打印"
 #. module: account_budget
 #: rml:account.budget:0
 msgid "A/c No."
-msgstr ""
+msgstr "A/c No."
 
 #. module: account_budget
 #: rml:account.analytic.account.budget:0
@@ -369,7 +369,7 @@ msgstr "预算项详情"
 #: field:crossovered.budget.lines,general_budget_id:0
 #: model:ir.model,name:account_budget.model_account_budget_post
 msgid "Budgetary Position"
-msgstr "预算位于"
+msgstr "预算状况"
 
 #. module: account_budget
 #: wizard_field:account.budget.report,init,date1:0
@@ -377,7 +377,7 @@ msgstr "预算位于"
 #: wizard_field:wizard.crossovered.budget,init,date_from:0
 #: wizard_field:wizard.crossovered.budget.summary,init,date_from:0
 msgid "Start of period"
-msgstr "期初日期"
+msgstr "开始会计期间"
 
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_analytic_account_budget
@@ -422,7 +422,7 @@ msgstr "会计年度"
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "辅助核算项目"
+msgstr "辅助核算项"
 
 #. module: account_budget
 #: rml:crossovered.budget.report:0
@@ -441,7 +441,7 @@ msgstr "延伸"
 #: view:account.budget.post:0
 #: field:account.budget.post,account_ids:0
 msgid "Accounts"
-msgstr "科目"
+msgstr "项"
 
 #. module: account_budget
 #: model:ir.actions.report.xml,name:account_budget.account_budget

addons/account_cancel/__openerp__.py

@@ -22,7 +22,7 @@
 {
     "name" : "Account Cancel",
     "version" : "1.1",
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Accounting',
     "description": """
     Module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices.

addons/account_chart/__openerp__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -25,7 +25,7 @@
     'version': '1.1',
     'category': 'Generic Modules/Accounting',
     'description': """Remove minimal account chart""",
-    'author': 'Tiny',
+    'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],

addons/account_coda/__openerp__.py

@@ -22,7 +22,7 @@
 {
     "name"      : "Account CODA - import bank statements from coda file",
     "version"   : "1.0",
-    "author"    : "Tiny",
+    "author"    : "OpenERP SA",
     "category"  : "Account CODA",
     "description": """
     Module provides functionality to import