[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: ksa@tinyerp.co.in-20100720055445-iojkpg3rb5smadhs

addons/account/__openerp__.py

@@ -21,7 +21,6 @@
 {
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
-    "depends" : ["product", "analytic", "process","board"],
     "author" : "Tiny",
     "category": 'Generic Modules/Accounting',
     "description": """Financial and accounting module that covers:
@@ -42,6 +41,7 @@ The processes like maintaining of general ledger is done through the defined fin
 grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
 module named account_vouchers
     """,
+    "depends" : ["product", "analytic", "process","board"],
     'website': 'http://www.openerp.com',
     'init_xml': [],
     'update_xml': [
@@ -119,7 +119,6 @@ module named account_vouchers
         "wizard/account_bs_report_view.xml"
     ],
     'demo_xml': [
-        #'demo/price_accuracy00.yml',
         'account_demo.xml',
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',

addons/account/account.py

@@ -81,7 +81,7 @@ class account_payment_term(osv.osv):
             if amt:
                 next_date = datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days)
                 if line.days2 < 0:
-                    next_date += relativedelta(day=line.days2)
+                    next_date += relativedelta(day=31)
                 if line.days2 > 0:
                     next_date += relativedelta(day=line.days2, months=1)
                 result.append( (next_date.strftime('%Y-%m-%d'), amt) )
@@ -136,7 +136,6 @@ class account_account_type(osv.osv):
         'name': fields.char('Acc. Type Name', size=64, required=True, translate=True),
         'code': fields.char('Code', size=32, required=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of account types."),
-        'partner_account': fields.boolean('Partner account'),
         'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True),
         'sign': fields.selection([(-1, 'Negative'), (1, 'Positive')], 'Sign on Reports', required=True, help='Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts.'),
         'report_type':fields.selection([
@@ -366,11 +365,11 @@ class account_account(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Secondary Currency', help="Forces all moves for this account to have this secondary currency."),
         'code': fields.char('Code', size=64, required=True),
         'type': fields.selection([
+            ('view', 'View'),
+            ('other', 'Regular'),
             ('receivable', 'Receivable'),
             ('payable', 'Payable'),
-            ('view', 'View'),
             ('consolidation', 'Consolidation'),
-            ('other', 'Others'),
             ('closed', 'Closed'),
         ], 'Internal Type', required=True, help="This type is used to differentiate types with "\
             "special effects in Open ERP: view can not have entries, consolidation are accounts that "\
@@ -586,7 +585,6 @@ class account_journal_column(osv.osv):
         for col in cols:
             if col in ('period_id', 'journal_id'):
                 continue
-                
             result.append( (col, cols[col].string) )
         result.sort()
         return result
@@ -624,7 +622,7 @@ class account_journal(osv.osv):
         'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
         'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
         'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
-        'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=True),
+        'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=False),
         'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
@@ -639,6 +637,7 @@ class account_journal(osv.osv):
         'user_id': lambda self,cr,uid,context: uid,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+
     def write(self, cr, uid, ids, vals, context=None):
         obj=[]
         if 'company_id' in vals:
@@ -647,8 +646,58 @@ class account_journal(osv.osv):
                 raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
         return super(account_journal, self).write(cr, uid, ids, vals, context=context)
 
+    def create_sequence(self, cr, uid, ids, context={}):
+        """
+        Create new entry sequence for every new Joural
+        @param cr: cursor to database
+        @param user: id of current user
+        @param ids: list of record ids to be process
+        @param context: context arguments, like lang, time zone
+        @return: return a result
+        """
+
+        seq_pool = self.pool.get('ir.sequence')
+        seq_typ_pool = self.pool.get('ir.sequence.type')
+
+        result = True
+
+        journal = self.browse(cr, uid, ids[0], context)
+        code = journal.code.lower()
+        types = {
+            'name':journal.name,
+            'code':code
+        }
+        type_id = seq_typ_pool.create(cr, uid, types)
+
+        seq = {
+            'name':journal.name,
+            'code':code,
+            'active':True,
+            'prefix':journal.code + "/%(year)s/",
+            'padding':4,
+            'number_increment':1
+        }
+        seq_id = seq_pool.create(cr, uid, seq)
+
+        res = {}
+        if not journal.sequence_id:
+            res.update({
+                'sequence_id':seq_id
+            })
+
+        if not journal.invoice_sequence_id:
+            res.update({
+                'invoice_sequence_id':seq_id
+            })
+
+        result = self.write(cr, uid, [journal.id], res)
+
+        return result
+
     def create(self, cr, uid, vals, context={}):
         journal_id = super(account_journal, self).create(cr, uid, vals, context)
+        self.create_sequence(cr, uid, [journal_id], context)
+
 #       journal_name = self.browse(cr, uid, [journal_id])[0].code
 #       periods = self.pool.get('account.period')
 #       ids = periods.search(cr, uid, [('date_stop','>=',time.strftime('%Y-%m-%d'))])
@@ -670,14 +719,41 @@ class account_journal(osv.osv):
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
-    def onchange_type(self, cr, uid, ids, type):
-        res={}
-        for line in self.browse(cr, uid, ids):
-            if type == 'situation':
-                  res= {'value':{'centralisation': True}}
-            else:
-                  res= {'value':{'centralisation': False}}
-        return res
+    def onchange_type(self, cr, uid, ids, type, currency):
+        data_pool = self.pool.get('ir.model.data')
+        user_pool = self.pool.get('res.users')
+
+        type_map = {
+            'sale':'account_sp_journal_view',
+            'sale_refund':'account_sp_refund_journal_view',
+            'purchase':'account_sp_journal_view',
+            'purchase_refund':'account_sp_refund_journal_view',
+            'expense':'account_sp_journal_view',
+            'cash':'account_journal_bank_view',
+            'bank':'account_journal_bank_view',
+            'general':'account_journal_view',
+            'situation':'account_journal_view'
+        }
+
+        res = {}
+
+        view_id = type_map.get(type, 'general')
+
+        user = user_pool.browse(cr, uid, uid)
+        if type in ('cash', 'bank') and currency and user.company_id.currency_id.id != currency:
+            view_id = 'account_journal_bank_view_multi'
+
+        data_id = data_pool.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
+        data = data_pool.browse(cr, uid, data_id[0])
+
+        res.update({
+            'centralisation':type == 'situation',
+            'view_id':data.res_id,
+        })
+
+        return {
+            'value':res
+        }
 
 account_journal()
 
@@ -687,8 +763,7 @@ class account_fiscalyear(osv.osv):
     _columns = {
         'name': fields.char('Fiscal Year', size=64, required=True),
         'code': fields.char('Code', size=6, required=True),
-        'company_id': fields.many2one('res.company', 'Company',
-            help="Keep empty if the fiscal year belongs to several companies.", required=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
         'date_start': fields.date('Start Date', required=True),
         'date_stop': fields.date('End Date', required=True),
         'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'),
@@ -772,7 +847,7 @@ class account_period(osv.osv):
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
         'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
-        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
+        'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company'),
     }
     _defaults = {
         'state': lambda *a: 'draft',
@@ -1144,7 +1219,7 @@ class account_move(osv.osv):
         return amount
 
     def _centralise(self, cr, uid, move, mode, context=None):
-        assert(mode in ('debit', 'credit'), 'Invalid Mode') #to prevent sql injection
+        assert mode in ('debit', 'credit'), 'Invalid Mode' #to prevent sql injection
         if context is None:
             context = {}
 
@@ -1200,12 +1275,15 @@ class account_move(osv.osv):
     #
     # Validate a balanced move. If it is a centralised journal, create a move.
     #
+
     def validate(self, cr, uid, ids, context={}):
         if context and ('__last_update' in context):
             del context['__last_update']
-        ok = True
+
+        valid_moves = [] #Maintains a list of moves which can be responsible to create analytic entries
+
         for move in self.browse(cr, uid, ids, context):
-            #unlink analytic lines on move_lines
+            # Unlink old analytic lines on move_lines
             for obj_line in move.line_id:
                 for obj in obj_line.analytic_lines:
                     self.pool.get('account.analytic.line').unlink(cr,uid,obj.id)
@@ -1214,7 +1292,7 @@ class account_move(osv.osv):
             amount = 0
             line_ids = []
             line_draft_ids = []
-            company_id=None
+            company_id = None
             for line in move.line_id:
                 amount += line.debit - line.credit
                 line_ids.append(line.id)
@@ -1230,52 +1308,60 @@ class account_move(osv.osv):
                     if line.account_id.currency_id.id != line.currency_id.id and (line.account_id.currency_id.id != line.account_id.company_id.currency_id.id or line.currency_id):
                         raise osv.except_osv(_('Error'), _("""Couldn't create move with currency different from the secondary currency of the account "%s - %s". Clear the secondary currency field of the account definition if you want to accept all currencies.""" % (line.account_id.code, line.account_id.name)))
 
-            # Check that the move balances, the tolerance for debit/credit must
-            # be smaller than the smallest value according to price accuracy
-            # (hence the +1 below)
-            # Example:
-            #    difference == 0.01 is OK iff price_accuracy <= 1!
-            #    difference == 0.0001 is OK iff price_accuracy <= 3!
-            if abs(amount) < 10 ** -(int(config['price_accuracy'])+1):
+            if abs(amount) < 10 ** -4:
+                # If the move is balanced
+                # Add to the list of valid moves
+                # (analytic lines will be created later for valid moves)
+                valid_moves.append(move)
+
+                # Check whether the move lines are confirmed
+
                 if not len(line_draft_ids):
                     continue
+                # Update the move lines (set them as valid)
+
                 self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
                     'journal_id': move.journal_id.id,
                     'period_id': move.period_id.id,
                     'state': 'valid'
                 }, context, check=False)
-                todo = []
+
                 account = {}
                 account2 = {}
-                if journal.type not in ('purchase','sale'):
-                    continue
 
-                for line in move.line_id:
-                    code = amount = 0
-                    key = (line.account_id.id, line.tax_code_id.id)
-                    if key in account2:
-                        code = account2[key][0]
-                        amount = account2[key][1] * (line.debit + line.credit)
-                    elif line.account_id.id in account:
-                        code = account[line.account_id.id][0]
-                        amount = account[line.account_id.id][1] * (line.debit + line.credit)
-                    if (code or amount) and not (line.tax_code_id or line.tax_amount):
-                        self.pool.get('account.move.line').write(cr, uid, [line.id], {
-                            'tax_code_id': code,
-                            'tax_amount': amount
-                        }, context, check=False)
+                if journal.type in ('purchase','sale'):
+                    for line in move.line_id:
+                        code = amount = 0
+                        key = (line.account_id.id, line.tax_code_id.id)
+                        if key in account2:
+                            code = account2[key][0]
+                            amount = account2[key][1] * (line.debit + line.credit)
+                        elif line.account_id.id in account:
+                            code = account[line.account_id.id][0]
+                            amount = account[line.account_id.id][1] * (line.debit + line.credit)
+                        if (code or amount) and not (line.tax_code_id or line.tax_amount):
+                            self.pool.get('account.move.line').write(cr, uid, [line.id], {
+                                'tax_code_id': code,
+                                'tax_amount': amount
+                            }, context, check=False)
+            elif journal.centralisation:
+                # If the move is not balanced, it must be centralised...
+
+                # Add to the list of valid moves
+                # (analytic lines will be created later for valid moves)
+                valid_moves.append(move)
+
                 #
-                # Compute VAT
+                # Update the move lines (set them as valid)
                 #
-                continue
-            if journal.centralisation:
                 self._centralise(cr, uid, move, 'debit', context=context)
                 self._centralise(cr, uid, move, 'credit', context=context)
                 self.pool.get('account.move.line').write(cr, uid, line_draft_ids, {
                     'state': 'valid'
                 }, context, check=False)
-                continue
             else:
+                # We can't validate it (it's unbalanced)
+                # Setting the lines as draft
                 self.pool.get('account.move.line').write(cr, uid, line_ids, {
                     'journal_id': move.journal_id.id,
                     'period_id': move.period_id.id,
@@ -1283,13 +1369,12 @@ class account_move(osv.osv):
                     #'tax_amount': False,
                     'state': 'draft'
                 }, context, check=False)
-                ok = False
-            if ok:
-                list_ids = []
-                for tmp in move.line_id:
-                    list_ids.append(tmp.id)
-                self.pool.get('account.move.line').create_analytic_lines(cr, uid, list_ids, context)
-        return ok
+        # Create analytic lines for the valid moves
+        for record in valid_moves:
+            self.pool.get('account.move.line').create_analytic_lines(cr, uid, [line.id for line in record.line_id], context)
+
+        return len(valid_moves) > 0
+
 account_move()
 
 class account_move_reconcile(osv.osv):
@@ -2057,7 +2142,6 @@ class account_add_tmpl_wizard(osv.osv_memory):
     def _get_def_cparent(self, cr, uid, context):
         acc_obj=self.pool.get('account.account')
         tmpl_obj=self.pool.get('account.account.template')
-        #print "Searching for ",context
         tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
         if not tids or not tids[0]['parent_id']:
             return False
@@ -2099,7 +2183,6 @@ class account_add_tmpl_wizard(osv.osv_memory):
             # 'tax_ids': [(6,0,tax_ids)], todo!!
             'company_id': company_id,
             }
-        # print "Creating:", vals
         new_account = acc_obj.create(cr, uid, vals)
         return {'type':'state', 'state': 'end' }
 
@@ -2120,7 +2203,7 @@ class account_tax_code_template(osv.osv):
         'info': fields.text('Description'),
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
-        'sign': fields.float('Sign for parent', required=True),
+        'sign': fields.float('Sign for parent', required=True, help="Choose 1.00 to add the total to the parent account or -1.00 to subtract it"),
         'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
     }
 
@@ -2152,7 +2235,7 @@ class account_chart_template(osv.osv):
 
     _columns={
         'name': fields.char('Name', size=64, required=True),
-        'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)]),
+        'account_root_id': fields.many2one('account.account.template','Root Account',required=True,domain=[('parent_id','=',False)], help=""),
         'tax_code_root_id': fields.many2one('account.tax.code.template','Root Tax Code',required=True,domain=[('parent_id','=',False)]),
         'tax_template_ids': fields.one2many('account.tax.template', 'chart_template_id', 'Tax Template List', help='List of all the taxes that have to be installed by the wizard'),
         'bank_account_view_id': fields.many2one('account.account.template','Bank Account',required=True),
@@ -2329,6 +2412,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_acc_template = self.pool.get('account.account.template')
         obj_fiscal_position_template = self.pool.get('account.fiscal.position.template')
         obj_fiscal_position = self.pool.get('account.fiscal.position')
+        data_pool = self.pool.get('ir.model.data')
 
         # Creating Account
         obj_acc_root = obj_multi.chart_template_id.account_root_id
@@ -2439,7 +2523,10 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Creating Journals
         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_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 obj_multi.seq_journal:
@@ -2476,8 +2563,15 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         obj_journal.create(cr,uid,vals_journal)
 
         # Bank Journals
-        view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Cash Journal View')])[0]
-        view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Multi-Currency Cash Journal View')])[0]
+        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

addons/account/account_bank_statement.py

@@ -159,7 +159,7 @@ class account_bank_statement(osv.osv):
         'period_id': _get_period,
     }
 
-    def button_confirm(self, cr, uid, ids, context={}):
+    def button_confirm_bank(self, cr, uid, ids, context={}):
         done = []
         res_currency_obj = self.pool.get('res.currency')
         res_users_obj = self.pool.get('res.users')

addons/account/account_cash_statement.py

@@ -67,19 +67,25 @@ class account_cash_statement(osv.osv):
     
     _inherit = 'account.bank.statement'
     
-    def _get_starting_balance(self, cr, uid, ids, name, arg, context=None):
+    def _get_starting_balance(self, cr, uid, ids, context=None):
 
-        """ Find starting balance  "
+        """ Find starting balance
         @param name: Names of fields.
         @param arg: User defined arguments
         @return: Dictionary of values.
-        """          
+        """
         res ={}
         for statement in self.browse(cr, uid, ids):
             amount_total=0.0
+            
+            if statement.journal_id.type not in('cash'):
+                continue
+            
             for line in statement.starting_details_ids:
                 amount_total+= line.pieces * line.number
-            res[statement.id]=amount_total
+            res[statement.id] = {
+                'balance_start':amount_total
+            }
         return res
     
     def _balance_end_cash(self, cr, uid, ids, name, arg, context=None):
@@ -116,7 +122,7 @@ class account_cash_statement(osv.osv):
         """ To get default journal for the object" 
         @param name: Names of fields.
         @return: journal 
-        """  
+        """
         company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
         journal = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', company_id)])
         if journal:
@@ -166,11 +172,10 @@ class account_cash_statement(osv.osv):
             company_id = company_pool.search(cr, uid, [])[0]
         
         return company_id
-        
+
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-        'balance_start': fields.function(_get_starting_balance, store=True, method=True, string='Opening Balance', type='float',digits=(16,2), help="Opening balance based on cashBox"),
         'balance_end_real': fields.float('Closing Balance', digits=(16,2), states={'confirm':[('readonly', True)]}, help="closing balance entered by the cashbox verifier"),
         'state': fields.selection(
             [('draft', 'Draft'),
@@ -178,7 +183,7 @@ class account_cash_statement(osv.osv):
             ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"),
         'total_entry_encoding':fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"),
         'closing_date':fields.datetime("Closed On"),
-        'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on transactions"),
+        'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"),
         'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"),
         'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'),
         'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'),
@@ -205,8 +210,31 @@ class account_cash_statement(osv.osv):
                 for i in starting_details_ids:
                     if i and i[0] and i[1]:
                         i[0], i[1] = 0, 0
-        res = super(account_cash_statement, self).create(cr, uid, vals, context=context)
-        return res
+        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):
+        """
+        Update redord(s) comes in {ids}, with new value comes as {vals}
+        return True on success, False otherwise
+    
+        @param cr: cursor to database
+        @param user: id of current user
+        @param ids: list of record ids to be update
+        @param vals: dict of new values to be set
+        @param context: context arguments, like lang, time zone
+        
+        @return: True on success, False otherwise
+        """
+        
+        super(account_cash_statement, self).write(cr, uid, ids, vals)
+        res = self._get_starting_balance(cr, uid, ids)
+        for rs in res:
+            super(account_cash_statement, self).write(cr, uid, rs, res.get(rs))
+        return True
     
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context={}):
         """ Changes balance start and starting details if journal_id changes" 
@@ -251,8 +279,8 @@ class account_cash_statement(osv.osv):
         statement = statement_pool.browse(cr, uid, ids[0])
         
         if not self._user_allow(cr, uid, ids, statement, context={}):
-            raise osv.except_osv(_('Error !'), _('User %s have no rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
-            
+            raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name)))
+        
         number = self.pool.get('ir.sequence').get(cr, uid, statement.journal_id.sequence_id.code)
         
         if len(statement.starting_details_ids) > 0:
@@ -285,7 +313,7 @@ class account_cash_statement(osv.osv):
         self.write(cr, uid, ids, vals)
         return True
 
-    def button_confirm(self, cr, uid, ids, context={}):
+    def button_confirm_cash(self, cr, uid, ids, context={}):
         
         """ Check the starting and ending detail of  statement 
         @return: True 
@@ -296,20 +324,24 @@ class account_cash_statement(osv.osv):
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
-
+        
         company_currency_id = res_users_obj.browse(cr, uid, uid, context=context).company_id.currency_id.id
 
         for st in self.browse(cr, uid, ids, context):
+            
+            self.write(cr, uid, [st.id], {'balance_end_real':st.balance_end})
+            st.balance_end_real = st.balance_end
+            
             if not st.state == 'open':
                 continue
                 
             if not self._equal_balance(cr, uid, ids, st, context):
-                raise osv.except_osv(_('Error !'), _('Cash balance is not matching with closing balance !'))
-                
-            if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
-                raise osv.except_osv(_('Error !'),
-                        _('The statement balance is incorrect !\n') +
-                        _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
+                raise osv.except_osv(_('Error !'), _('CashBox Balance is not matching with Calculated Balance !'))
+            
+#            if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
+#                raise osv.except_osv(_('Error !'),
+#                        _('The statement balance is incorrect !\n') +
+#                        _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end))
             if (not st.journal_id.default_credit_account_id) \
                     or (not st.journal_id.default_debit_account_id):
                 raise osv.except_osv(_('Configuration Error !'),
@@ -435,7 +467,7 @@ class account_cash_statement(osv.osv):
 
                 if move.reconcile_id and move.reconcile_id.line_ids:
                     torec += map(lambda x: x.id, move.reconcile_id.line_ids)
-                    #try:
+
                     if abs(move.reconcile_amount-move.amount)<0.0001:
 
                         writeoff_acc_id = False
@@ -447,13 +479,16 @@ class account_cash_statement(osv.osv):
                         account_move_line_obj.reconcile(cr, uid, torec, 'statement', writeoff_acc_id=writeoff_acc_id, writeoff_period_id=st.period_id.id, writeoff_journal_id=st.journal_id.id, context=context)
                     else:
                         account_move_line_obj.reconcile_partial(cr, uid, torec, 'statement', context)
-                    #except:
-                    #    raise osv.except_osv(_('Error !'), _('Unable to reconcile entry "%s": %.2f') % (move.name, move.amount))
 
                 if st.journal_id.entry_posted:
                     account_move_obj.write(cr, uid, [move_id], {'state':'posted'})
             done.append(st.id)
-        self.write(cr, uid, done, {'state':'confirm'}, context=context)
+        
+        vals = {
+            'state':'confirm',
+            'closing_date':time.strftime("%Y-%m-%d %H:%M:%S")
+        }
+        self.write(cr, uid, done, vals, context=context)
         return True
 
     def button_cancel(self, cr, uid, ids, context={}):

addons/account/account_demo.xml

@@ -3,8 +3,8 @@
     <data noupdate="1">
         
         <!--
-	Fiscal year
-	-->	
+    Fiscal year
+    -->    
         
         <record id="data_fiscalyear" model="account.fiscalyear">
             <field eval="'Fiscal Year '+time.strftime('%Y')" name="name"/>
@@ -15,8 +15,8 @@
         </record>
         
         <!--
-	Fiscal Periods
-	-->	
+    Fiscal Periods
+    -->    
         
         <record id="period_1" model="account.period">
             <field eval="'Jan.'+time.strftime('%Y')" name="name"/>

addons/account/account_invoice_view.xml

@@ -205,7 +205,7 @@
                                     <button name="invoice_open" states="draft,proforma2" string="Validate" 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="stock_effects-object-colorize"/>
+                                    <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>
@@ -257,7 +257,7 @@
                     <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 Currency"/>
+                    <button name="%(action_account_change_currency)d" type="action" icon="terp-stock_effects-object-colorize" string="Change"/>
                     <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 domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
@@ -490,7 +490,7 @@
 
         <act_window domain="[('account_analytic_id', '=', active_id)]" id="act_account_analytic_account_2_account_invoice_line" name="Invoice lines" res_model="account.invoice.line" src_model="account.analytic.account"/>
 
-        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
+        <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Entries" res_model="account.move.line" src_model="account.invoice"/>
 
     </data>
 </openerp>

addons/account/account_menuitem.xml

@@ -8,7 +8,7 @@
         <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="Journal Entries Validation" 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"/>

addons/account/account_move_line.py

@@ -482,7 +482,6 @@ class account_move_line(osv.osv):
         cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
         if not cr.fetchone():
             cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
-            cr.commit()
 
     def _check_no_view(self, cr, uid, ids):
         lines = self.browse(cr, uid, ids)
@@ -675,6 +674,7 @@ class account_move_line(osv.osv):
             account_id = line['account_id']['id']
             partner_id = (line['partner_id'] and line['partner_id']['id']) or False
         writeoff = debit - credit
+
         # Ifdate_p in context => take this date
         if context.has_key('date_p') and context['date_p']:
             date=context['date_p']
@@ -797,7 +797,6 @@ class account_move_line(osv.osv):
         title = 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')
-        
         ids = journal_pool.search(cr, uid, [])
         journals = journal_pool.browse(cr, uid, ids)
         all_journal = [None]
@@ -814,14 +813,12 @@ class account_move_line(osv.osv):
                 else:
                     fields.get(field.field).append(journal.id)
                     common_fields[field.field] = common_fields[field.field] + 1
-        
         fld.append(('period_id', 3))
         fld.append(('journal_id', 10))
         flds.append('period_id')
         flds.append('journal_id')
         fields['period_id'] = all_journal
         fields['journal_id'] = all_journal
-        
         from operator import itemgetter
         fld = sorted(fld, key=itemgetter(1))
 
@@ -835,13 +832,10 @@ class account_move_line(osv.osv):
 
         for field_it in fld:
             field = field_it[0]
-            
             if common_fields.get(field) == total:
                 fields.get(field).append(None)
-            
             if field=='state':
                 state = 'colors="red:state==\'draft\'"'
-            
             attrs = []
             if field == 'debit':
                 attrs.append('sum="Total debit"')
@@ -864,7 +858,6 @@ class account_move_line(osv.osv):
 
             if field in widths:
                 attrs.append('width="'+str(widths[field])+'"')
-            
             attrs.append("invisible=\"context.get('visible_id') not in %s\"" % (fields.get(field)))
             xml += '''<field name="%s" %s/>\n''' % (field,' '.join(attrs))
 
@@ -914,7 +907,7 @@ class account_move_line(osv.osv):
                 journal = self.pool.get('account.journal').browse(cr, uid, [journal_id])[0]
                 if journal.allow_date and period_id:
                     period = self.pool.get('account.period').browse(cr, uid, [period_id])[0]
-                    if not time.strptime(vals['date'],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') or not time.strptime(vals['date'],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'):
+                    if not time.strptime(vals['date'][:10],'%Y-%m-%d')>=time.strptime(period.date_start,'%Y-%m-%d') or not time.strptime(vals['date'][:10],'%Y-%m-%d')<=time.strptime(period.date_stop,'%Y-%m-%d'):
                         raise osv.except_osv(_('Error'),_('The date of your Ledger Posting is not in the defined period !'))
         else:
             return True

addons/account/account_view.xml

@@ -3,8 +3,8 @@
     <data>
 
         <!--
-     Fiscal Year
-    -->
+            Fiscal Year
+        -->
 
         <record id="view_account_fiscalyear_form" model="ir.ui.view">
             <field name="name">account.fiscalyear.form</field>
@@ -12,12 +12,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Fiscalyear">
-                    <field name="name" select="1"/>
-                    <field name="code" select="1"/>
+                    <group>
+                    <field name="name"/>
+                    <field name="code"/>
                     <field name="date_start"/>
                     <field name="date_stop"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="end_journal_period_id" groups="base.group_extended"/>
+                    </group>
                     <separator colspan="4" string="Periods"/>
                     <field colspan="4" name="period_ids" nolabel="1" widget="one2many_list">
                         <form string="Period">
@@ -29,8 +31,8 @@
                         </form>
                     </field>
                     <separator colspan="4" string="States"/>
-                    <field name="state" select="1" readonly="1"/>
-                    <group col="2" colspan="2">
+                    <group>
+                        <field name="state" select="1" readonly="1"/>
                         <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="gtk-dnd"/>
                         <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="gtk-dnd"/>
                     </group>
@@ -49,11 +51,32 @@
                 </tree>
             </field>
         </record>
+        <record id="view_account_fiscalyear_search" model="ir.ui.view">
+            <field name="name">account.fiscalyear.search</field>
+            <field name="model">account.fiscalyear</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Fiscalyear">
+                    <group>
+                        <filter string="Done" domain="[('state','=','done')]" icon="terp-dolar_ok!"/>
+                        <filter string="Draft" domain="[('state','=','draft')]" icon="terp-document-new"/>
+                        <separator orientation="vertical"/>
+                        <field name="code"/>
+                        <field name="name"/>
+                        <field name="state"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="State" context="{'group_by': 'state'}" icon="terp-stock_effects-object-colorize"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="action_account_fiscalyear_form" model="ir.actions.act_window">
             <field name="name">Fiscal Years</field>
             <field name="res_model">account.fiscalyear</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
         </record>
         <menuitem id="next_id_23" name="Periods" parent="account.menu_finance_accounting"/>
         <menuitem action="action_account_fiscalyear_form" id="menu_action_account_fiscalyear_form" parent="next_id_23"/>
@@ -110,9 +133,8 @@
 
 
         <!--
-    Accounts
-    -->
-
+            Accounts
+        -->
         <record id="view_account_form" model="ir.ui.view">
             <field name="name">account.account.form</field>
             <field name="model">account.account</field>
@@ -120,21 +142,21 @@
             <field name="arch" type="xml">
                 <form string="Account">
                     <group col="6" colspan="4">
-                    <field name="name" select="1" colspan="4"/>
+                    <field name="name" select="1"/>
                     <field name="code" select="1"/>
-                    <field name="parent_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                    <newline/>
+                    <field name="parent_id"/>
+                    <field name="type" select="1"/>
                     <field name="user_type" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
                             <newline/>
                             <field name="currency_id"/>
+                            <field name="active"/>
                             <field name="currency_mode"/>
                             <field name="reconcile"/>
-                            <field name="active"/>
-                            <field name="check_history"/>
-                            <field name="type" select="1"/>
                             <newline/>
                             <separator string="Default Taxes" colspan="4"/>
                             <field colspan="4" name="tax_ids" nolabel="1" domain="[('parent_id','=',False)]"/>
@@ -155,10 +177,22 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Accounts">
-                    <field name="code" select="1"/>
-                    <field name="name" select="1"/>
-                    <field name="user_type" select="1"/>
-                    <field name="type" select="1"/>
+                    <group col="10" colspan="4">
+                        <filter icon="terp-sale" string="Receivable Accounts" domain="[('type','=','receivable')]"/>
+                        <filter icon="terp-purchase" string="Purchase Accounts" domain="[('type','=','purchase')]"/>
+                        <separator orientation="vertical"/>
+                        <field name="code"/>
+                        <field name="name"/>
+                        <field name="user_type"/>
+                        <field name="type"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Parent Account" icon="terp-folder-orange" domain="" context="{'group_by':'parent_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="User Type" icon="terp-folder-blue" domain="" context="{'group_by':'user_type'}"/>
+                        <filter string="Internal Type" icon="terp-folder-yellow" domain="" context="{'group_by':'type'}"/>
+                    </group>
                 </search>
             </field>
         </record>
@@ -182,6 +216,8 @@
                 <tree string="Chart of accounts" toolbar="1" colors="blue:type in ('view');black:type not in ('view')">
                     <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"/>
@@ -259,11 +295,34 @@
                 <tree string="Account Journal">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="type" invisible="1"/>
+                    <field name="user_id" invisible="1"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                 </tree>
             </field>
         </record>
-
+        <record id="view_account_journal_search" model="ir.ui.view">
+            <field name="name">account.journal.search</field>
+            <field name="model">account.journal</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <tree string="Search Account Journal">
+                    <group>
+                    <filter domain="[('type', '=', 'sale')]" string="Sale Journals" icon="terp-sale"/>
+                    <filter domain="[('type', '=', 'purchase')]" string="Purchase Journals" icon="terp-purchase"/>
+                    <filter domain="[('centralisation', '=', 'True')]" string="Centralized Journals" icon="terp-stock"/>
+                    <separator orientation="vertical"/>
+                    <field name="code"/>
+                    <field name="name"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                    <filter string="Type" context="{'group_by':'type'}" icon="terp-stock_effects-object-colorize"/>
+                    <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
+                    </group>
+                </tree>
+            </field>
+        </record>
         <record id="view_account_journal_form" model="ir.ui.view">
             <field name="name">account.journal.form</field>
             <field name="model">account.journal</field>
@@ -273,51 +332,45 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1" colspan="4"/>
                         <field name="code" select="1"/>
-                        <field name="type" on_change="onchange_type(type)"/>
-                        <field name="refund_journal" attrs="{'readonly':[('type','=','general'),('type','=','cash'),('type','=','situation')]}"/>
+                        <field name="type" on_change="onchange_type(type, currency)"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
-                            <group colspan="2" col="2">
-                                <separator string="Journal View" colspan="4"/>
-                                <field name="view_id" widget="selection"/>
+                            <group col="2" colspan="2">
+                                <group colspan="2" col="2">
+                                    <separator string="Accounts" colspan="4"/>
+                                    <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                    <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                                </group>
+                                <group colspan="2" col="2">
+                                    <separator string="Journal View" colspan="4"/>
+                                    <field name="view_id" widget="selection"/>
+                                </group>
                             </group>
 
-                            <group colspan="2" col="2">
-                                <separator string="Sequence" colspan="4"/>
-                                <field name="sequence_id"/>
-                            </group>
-
-                            <group colspan="2" col="2">
-                                <separator string="Accounts" colspan="4"/>
-                                <field name="default_debit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                                <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            </group>
-                            
-                            <group colspan="2" col="2">
-                                <separator string="Invoicing Data" colspan="4"/>
-                                <field name="invoice_sequence_id"/>
-                                <field name="group_invoice_lines"/>
-                            </group>
-                            
                             <group colspan="2" col="2">
                                 <separator string="Company" colspan="4"/>
                                 <field name="company_id" groups="base.group_multi_company"/>
                                 <field name="user_id" groups="base.group_extended"/>
                                 <field name="currency"/>
                             </group>
-                            <group col="2" colspan="2">
-                                <group colspan="2" col="2">
-                                    <separator string="Validations" colspan="4"/>
-                                    <field name="allow_date" groups="base.group_extended"/>
-                                </group>
-
-                                <group colspan="2" col="2">
-                                    <separator string="Other Configuration" colspan="4"/>
-                                    <field name="centralisation" groups="base.group_extended"/>
-                                    <field name="entry_posted"/>
-                                    <field name="update_posted"/>
-                                </group>
+                            <group colspan="2" col="2">
+                                <separator string="Validations" colspan="4"/>
+                                <field name="allow_date" groups="base.group_extended"/>
+                            </group>
+                            <group colspan="2" col="2">
+                                <separator string="Other Configuration" colspan="4"/>
+                                <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>
                         </page>
                         <page string="Entry Controls" groups="base.group_extended">
@@ -337,7 +390,6 @@
             <field name="view_mode">tree,form</field>
         </record>
         <menuitem action="action_account_journal_form" id="menu_action_account_journal_form" parent="account_account_menu"/>
-        
         <record id="view_account_bank_statement_filter" model="ir.ui.view">
             <field name="name">account.bank.statement.select</field>
             <field name="model">account.bank.statement</field>
@@ -359,7 +411,6 @@
                 </search>
             </field>
         </record>
-        
         <record id="view_bank_statement_tree" model="ir.ui.view">
             <field name="name">account.bank.statement.tree</field>
             <field name="model">account.bank.statement</field>
@@ -374,10 +425,35 @@
                     <field name="balance_end_real"/>
                     <field name="balance_end"/>
                     <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_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>
         </record>
-
+        <record id="view_bank_statement_search" model="ir.ui.view">
+            <field name="name">account.bank.statement.search</field>
+            <field name="model">account.bank.statement</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Bank Statements">
+                    <group>
+                        <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="date"/>
+                        <field name="name"/>
+                        <field name="journal_id"/>
+                    </group>
+                    <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>
+        </record>
         <record id="view_bank_statement_form" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
@@ -390,7 +466,7 @@
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" select="1"/>
                         <field name="period_id"/>
                         <field name="balance_start"/>
-                    <field name="balance_end_real"/>
+                        <field name="balance_end_real"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Transaction">
@@ -430,7 +506,7 @@
                         <field name="state"/>
                         <field name="balance_end"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
-                        <button name="button_confirm" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
+                        <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
                         <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
                     </group>
                 </form>
@@ -443,13 +519,25 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('journal_id.type', '=', 'bank')]</field>
         </record>
+        <record model="ir.actions.act_window.view" id="action_bank_statement_tree_bank">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_bank_statement_tree"/>
+            <field name="act_window_id" ref="action_bank_statement_tree"/>
+        </record>
+        <record model="ir.actions.act_window.view" id="action_bank_statement_form_bank">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_bank_statement_form"/>
+            <field name="act_window_id" ref="action_bank_statement_tree"/>
+        </record>
         <menuitem string="Bank Statements" action="action_bank_statement_tree" id="menu_bank_statement_tree" parent="menu_finance_bank_and_cash" sequence="7"/>
 
         <record id="action_bank_statement_draft_tree" model="ir.actions.act_window">
             <field name="name">Draft 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,search</field>
             <field name="domain">[('state','=','draft')]</field>
             <field name="filter" eval="True"/>
         </record>
@@ -514,11 +602,10 @@
             <field name="arch" type="xml">
                 <form string="Account Type">
                     <group col="6" colspan="4">
-                        <field name="name" select="1" colspan="4"/>
+                        <field name="name" select="1"/>
                         <field name="code" select="1"/>
                         <field name="sequence"/>
                         <field name="parent_id"/>
-                        <field name="partner_account"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Reporting Configuration" colspan="4"/>
@@ -620,7 +707,8 @@
                     <field name="sum"/>
                     <field name="sum_period"/>
                     <newline/>
-                    <field colspan="4" name="info"/>
+                    <separator string="Description" colspan="4"/>
+                    <field colspan="4" name="info" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -648,9 +736,30 @@
                     <field name="name"/>
                     <field name="price_include" groups="base.group_extended"/>
                     <field name="description"/>
+                    <field name="tax_group" invisible="1"/>
                 </tree>
             </field>
         </record>
+        <record id="view_account_tax_search" model="ir.ui.view">
+            <field name="name">account.tax.search</field>
+            <field name="model">account.tax</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Taxes">
+                    <group col="10" colspan="4">
+                        <filter icon="terp-folder-blue" string="Vat Taxes" domain="[('tax_group','=','vat')]" help="Vat Taxes"/>
+                        <filter icon="terp-folder-yellow" string="Other Taxes" domain="[('tax_group','=','other')]" help="Other Taxes"/>
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="description"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Tax Group" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'tax_group'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="view_tax_form" model="ir.ui.view">
             <field name="name">account.tax.form</field>
             <field name="model">account.tax</field>
@@ -714,7 +823,6 @@
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
         <menuitem action="action_tax_form" id="menu_action_tax_form" parent="next_id_27"/>
-        
         <record id="action_tax_code_tree" model="ir.actions.act_window">
             <field name="name">Chart of Taxes</field>
             <field name="res_model">account.tax.code</field>
@@ -728,7 +836,6 @@
             parent="menu_finance_charts"
             sequence="12"/>
 <!--       <wizard id="action_move_journal_line_form" menu="False" model="account.move.line" name="account.move.journal" string="Entries by Line"/-->
-        
         <!--
     Entries lines
     -->
@@ -1045,6 +1152,23 @@
             </field>
         </record>
 
+
+       <record id="action_move_journal_line" model="ir.actions.act_window">
+            <field name="name">Journal Entries</field>
+            <field name="res_model">account.move</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="search_view_id" ref="view_account_move_filter"/>
+        </record>
+
+        <menuitem
+            icon="STOCK_JUSTIFY_FILL"
+            action="action_move_journal_line"
+            id="menu_action_move_journal_line_form"
+            parent="account.menu_finance_entries"
+            sequence="5"/>
+
         <record id="action_move_line_form" model="ir.actions.act_window">
             <field name="name">Entries</field>
             <field name="type">ir.actions.act_window</field>
@@ -1053,7 +1177,7 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
-        
+
         <act_window
             domain="[('move_id','=',active_id)]"
             id="act_account_move_to_account_move_line_open"
@@ -1061,22 +1185,27 @@
             context="{'move_id':active_id}"
             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 to Review</field>
+            <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)]</field>
+            <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
+            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"/>-->
 
-        <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
-            <field name="name">Journal Vouchers</field>
+        <!-- <record id="action_move_line_form_encode_by_move" 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>
@@ -1084,8 +1213,8 @@
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
 
-<!--        <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>-->
-        
+        <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>-->
+
         <record id="action_account_moves_sale" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
@@ -1093,7 +1222,7 @@
             <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">[('journal_id.type', 'in', ['sale', 'sale_refund'])]</field>
+            <field name="domain">[('journal_id.type', 'in', ['sale', 'purchase_refund'])]</field>
         </record>
 
         <menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
@@ -1105,7 +1234,7 @@
             <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">[('journal_id.type', 'in', ['purchase', 'purchase_refund'])]</field>
+            <field name="domain">[('journal_id.type', 'in', ['purchase', 'sale_refund'])]</field>
             <field name="context">{'journal_id':1}</field>
         </record>
 
@@ -1131,18 +1260,19 @@
             <field name="view_mode">form</field>
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
-        <record id="action_move_line_search_view4" model="ir.actions.act_window">
-            <field name="name">Checks Register</field>
-            <field name="type">ir.actions.act_window</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">[('journal_id.type', '=', 'bank')]</field>
-        </record>
-        
-        <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
+
+<!--        <record id="action_move_line_search_view4" model="ir.actions.act_window">-->
+<!--            <field name="name">Cheque Register</field>-->
+<!--            <field name="type">ir.actions.act_window</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">[('journal_id.type', '=', 'bank')]</field>-->
+<!--        </record>-->
+<!--        -->
+<!--        <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>-->
 
 <!--        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
 
@@ -1151,7 +1281,7 @@
         <menuitem icon="STOCK_INDENT" action="wizard_account_chart" id="menu_action_account_tree2" parent="account.menu_finance_charts" type="wizard"/>
  -->
 
-        
+
         <record id="view_bank_statement_reconcile_form" model="ir.ui.view">
             <field name="name">account.bank.statement.reconcile.form</field>
             <field name="model">account.bank.statement</field>
@@ -1345,7 +1475,7 @@
                     <field colspan="4" nolabel="1" name="lines_id" height="250" widget="one2many_list"/>
                     <separator string="Legend" colspan="4"/>
                     <field name="legend" colspan="4" nolabel="1"/>
-                    <group col="1" colspan="4"> 
+                    <group col="1" colspan="4">
                         <button name="%(action_account_use_model_create_entry)d" string="Create entries" type="action" icon="gtk-execute"/>
                     </group>
                 </form>
@@ -1418,12 +1548,32 @@
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
                     <separator colspan="4" string="Description on invoices"/>
-                    <field colspan="4" name="note"/>
+                    <field colspan="4" name="note" nolabel="1"/>
                     <separator colspan="4" string="Computation"/>
-                    <field colspan="4" name="line_ids"/>
+                    <field colspan="4" name="line_ids" nolabel="1"/>
                 </form>
             </field>
         </record>
+<!--        <record id="view_account_move_line_filter" model="ir.ui.view">-->
+<!--            <field name="name">Payment Terms</field>-->
+<!--            <field name="model">account.payment.term</field>-->
+<!--            <field name="type">search</field>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <search string="Search Payment Terms">-->
+<!--                    <group col='10' colspan='4'>-->
+<!--                        <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'/>-->
+<!--                        <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>-->
+<!--                </search>-->
+<!--            </field>-->
+<!--        </record>-->
         <record id="action_payment_term_form" model="ir.actions.act_window">
             <field name="name">Payment Terms</field>
             <field name="res_model">account.payment.term</field>
@@ -1615,13 +1765,14 @@
         <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"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
-            <field name="name">Account Add wizard</field>
+            <field name="name">Create Account</field>
             <field name="model">account.addtmpl.wizard</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Account Add">
-                    <separator col="4" colspan="4" string="Select the common parent for the accounts"/>
+                <form string="Create Account">
+                    <separator col="4" colspan="4" string="Create an Account based on this template"/>
                     <field name="cparent_id"/>
+                    <newline/>
                     <group col="2" colspan="2">
                         <button icon="gtk-cancel" special="cancel" string="Cancel" name="action_cancel" type="object"/>
                         <button icon="gtk-ok" name="action_create" string="Add" type="object"/>
@@ -1631,7 +1782,8 @@
         </record>
 
         <act_window domain="[]" id="action_account_addtmpl_wizard_form"
-            name="Add account Wizard"
+            name="Create Account"
+            target="new"
             res_model="account.addtmpl.wizard"
             context="{'tmpl_ids': active_id}"
             src_model="account.account.template"
@@ -1664,16 +1816,17 @@
                     <notebook>
                         <page string="General Information">
                             <field name="name"/>
-                            <field name="code" select="1"/>
+                            <field name="code"/>
                             <newline/>
-                            <field name="parent_id" select="1"/>
+                            <field name="parent_id"/>
                             <field name="shortcut"/>
-                            <field name="type" select="1"/>
-                            <field name="user_type" select="1"/>
+                            <field name="type"/>
+                            <field name="user_type"/>
 
                             <field name="currency_id"/>
                             <field name="reconcile"/>
-                            <field name="tax_ids" colspan="4"/>
+                            <separator string="Default taxes" colspan="4"/>
+                            <field name="tax_ids" colspan="4" nolabel="1"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
@@ -1691,15 +1844,41 @@
                 <tree string="Account Template">
                     <field name="code"/>
                     <field name="name"/>
+                    <field name="type" invisible="1"/>
+                    <field name="user_type" invisible="1"/>
                 </tree>
             </field>
         </record>
 
+        <record id="view_account_template_search" model="ir.ui.view">
+            <field name="name">account.account.template.search</field>
+            <field name="model">account.account.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Account Templates">
+                    <group>
+                        <filter icon="terp-sale" string="Receivale Accounts" domain="[('type','=','receivable')]"/>
+                         <filter icon="terp-purchase" string="Payable Accounts" domain="[('type','=','payable')]"/>
+                         <separator orientation="vertical"/>
+                         <field name="code"/>
+                        <field name="parent_id"/>
+                        <field name="type"/>
+                        <field name="user_type"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Internal Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                        <filter string="Account Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'user_type'}"/>
+                   </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_account_template_form" model="ir.actions.act_window">
             <field name="name">Account Templates</field>
             <field name="res_model">account.account.template</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
         </record>
 
 
@@ -1713,21 +1892,50 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Chart of Accounts Template">
-                    <field name="name" select="1"/>
-                    <field name="account_root_id" select="1"/>
-                    <field name="bank_account_view_id" select="1"/>
+                    <group>
+                    <field name="name"/>
+                    <field name="account_root_id"/>
+                    <field name="bank_account_view_id"/>
                     <field name="tax_code_root_id"/>
-                    <field name="tax_template_ids" colspan="4" readonly="1" />
+                    </group>
+                    <field name="tax_template_ids" colspan="4" readonly="1" nolabel="1"/>
                     <separator string="Properties" colspan="4"/>
+                    <group>
                     <field name="property_account_receivable"/>
                     <field name="property_account_payable"/>
                     <field name="property_account_expense_categ" />
                     <field name="property_account_income_categ"/>
                     <field name="property_account_expense"/>
                     <field name="property_account_income"/>
+                    </group>
                 </form>
             </field>
         </record>
+        <record id="view_account_chart_template_seacrh" model="ir.ui.view">
+            <field name="name">account.chart.template.search</field>
+            <field name="model">account.chart.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Chart of Account Templates">
+                      <group>
+                          <field name="name"/>
+                        <field name="account_root_id"/>
+                        <field name="bank_account_view_id"/>
+                      </group>
+                      <newline/>
+                      <group expand="0" string="Group By...">
+                        <filter string="Root Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_root_id'}"/>
+                        <filter string="Bank Account" icon="terp-folder-blue" domain="[]" context="{'group_by':'bank_account_view_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Receivable Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_receivable'}"/>
+                        <filter string="Payable Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_payable'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Income Account" icon="terp-sale" domain="[]" context="{'group_by':'property_account_income_categ'}"/>
+                        <filter string="Expense Account" icon="terp-purchase" domain="[]" context="{'group_by':'property_account_expense_categ'}"/>
+                      </group>
+                </search>
+            </field>
+        </record>
         <record id="view_account_chart_template_tree" model="ir.ui.view">
             <field name="name">account.chart.template.tree</field>
             <field name="model">account.chart.template</field>
@@ -1738,6 +1946,10 @@
                     <field name="account_root_id"/>
                     <field name="tax_code_root_id"/>
                     <field name="bank_account_view_id"/>
+                    <field name="property_account_receivable" invisible="1"/>
+                    <field name="property_account_payable" invisible="1"/>
+                    <field name="property_account_expense_categ" invisible="1"/>
+                    <field name="property_account_income_categ" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -1745,7 +1957,7 @@
             <field name="name">Chart of Accounts Templates</field>
             <field name="res_model">account.chart.template</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
         </record>
 
         <menuitem action="action_account_chart_template_form" id="menu_action_account_chart_template_form" parent="account_template_accounts"/>
@@ -1759,11 +1971,11 @@
             <field name="arch" type="xml">
                 <form string="Account Tax Template">
                     <group colspan="4">
-                        <field name="name" select="1"/>
-                        <field name="description" select="1"/>
+                        <field name="name"/>
+                        <field name="description"/>
                         <newline/>
-                        <field name="chart_template_id" select="1"/>
-                        <field name="tax_group" select="1"/>
+                        <field name="chart_template_id"/>
+                        <field name="tax_group"/>
                         <field name="type"/>
                         <field name="type_tax_use"/>
                     </group>
@@ -1817,6 +2029,27 @@
                 </tree>
             </field>
         </record>
+        <record id="view_account_tax_template_search" model="ir.ui.view">
+            <field name="name">account.tax.template.search</field>
+            <field name="model">account.tax.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Tax Templates">
+                    <group col="10" colspan="4">
+                        <filter icon="terp-sale" string="Sale" domain="[('type_tax_use','=','sale')]" help="Taxes used in Sales"/>
+                        <filter icon="terp-purchase" string="Purchase" domain="[('type_tax_use','=','purchase')]" help="Taxes used in Purchases"/>
+                        <separator orientation="vertical"/>
+                        <filter icon="terp-folder-blue" string="Vat Taxes" domain="[('tax_group','=','vat')]" help="Vat Taxes"/>
+                        <filter icon="terp-folder-yellow" string="Other Taxes" domain="[('tax_group','=','other')]" help="Other Taxes"/>
+                        <separator orientation="vertical"/>
+                        <field name="name"/>
+                        <field name="description"/>
+                        <field name="chart_template_id"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="action_account_tax_template_form" model="ir.actions.act_window">
             <field name="name">Tax Templates</field>
             <field name="res_model">account.tax.template</field>
@@ -1836,10 +2069,30 @@
                 <tree string="Account Tax Code Template" toolbar="1">
                     <field name="name"/>
                     <field name="code"/>
+                    <field name="parent_id" invisible="1"/>
                 </tree>
             </field>
         </record>
 
+        <record id="view_tax_code_template_search" model="ir.ui.view">
+            <field name="name">account.tax.code.template.search</field>
+            <field name="model">account.tax.code.template</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search tax template">
+                    <group>
+                        <field name="name"/>
+                        <field name="code"/>
+                        <field name="parent_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Parent Code" icon="terp-folder-orange" domain="[]" context="{'group_by':'parent_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
         <record id="view_tax_code_template_form" model="ir.ui.view">
             <field name="name">account.tax.code.template.form</field>
             <field name="model">account.tax.code.template</field>
@@ -1851,7 +2104,8 @@
                     <field name="parent_id" select="1"/>
                     <field name="sign"/>
                     <newline/>
-                    <field colspan="4" name="info"/>
+                    <separator string="Description" colspan="4"/>
+                    <field colspan="4" name="info" nolabel="1"/>
                 </form>
             </field>
         </record>
@@ -1860,7 +2114,7 @@
             <field name="name">Tax Code Templates</field>
             <field name="res_model">account.tax.code.template</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
         </record>
         <menuitem action="action_account_tax_code_template_form" id="menu_action_account_tax_code_template_form" parent="account_template_taxes" sequence="14"/>
 
@@ -1948,7 +2202,7 @@
                     <field name="name" select="1"/>
                     <field name="chart_template_id"/>
                     <newline/>
-                    <field name="tax_ids" colspan="4">
+                    <field name="tax_ids" colspan="4" nolabel="1">
                         <tree string="Taxes Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@@ -1958,7 +2212,7 @@
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
-                    <field name="account_ids" colspan="4">
+                    <field name="account_ids" colspan="4" nolabel="1">
                         <tree string="Accounts Mapping" editable="bottom">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
@@ -1994,22 +2248,6 @@
             id="menu_action_account_fiscal_position_form_template"
             parent="account_template_folder" sequence="20"/>
 
-        <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_id" ref="view_move_tree"/>
-            <field name="search_view_id" ref="view_account_move_filter"/>
-        </record>
-        
-        <menuitem
-            icon="STOCK_JUSTIFY_FILL" 
-            action="action_move_journal_line" 
-            id="menu_action_move_journal_line_form" 
-            parent="account.menu_finance_entries" 
-            sequence="5"/>
-        
         <record id="action_account_moves_all" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
@@ -2019,10 +2257,10 @@
             <field name="search_view_id" ref="view_account_move_line_filter"/>
         </record>
 
-        <menuitem 
-            action="action_account_moves_all" 
-            icon="STOCK_JUSTIFY_FILL" 
-            id="menu_eaction_account_moves_all" 
+        <menuitem
+            action="action_account_moves_all"
+            icon="STOCK_JUSTIFY_FILL"
+            id="menu_eaction_account_moves_all"
             parent="account.menu_finance_entries"
             sequence="4"
         />
@@ -2044,12 +2282,11 @@
                         <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" states="open" icon="terp-gtk-go-back-rtl"/>
+                    <button type="object" string="Confirm" name="button_confirm_cash" states="open" icon="terp-gtk-go-back-rtl"/>
                     <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
                 </tree>
             </field>
         </record>
-        
         <record id="view_bank_statement_form2" model="ir.ui.view">
             <field name="name">account.bank.statement.form</field>
             <field name="model">account.bank.statement</field>
@@ -2062,9 +2299,7 @@
                         <field name="journal_id" on_change="onchange_journal_id(journal_id)" domain="[('type','=','cash')]" select="1" />
                         <field name="user_id" select="1" readonly="1"/>
                         <field name="period_id" select="1"/>
-                        <field name="balance_end_real"/>
                     </group>
-                    
                     <notebook colspan="4">
                         <page string="Cash Transactions" attrs="{'invisible': [('state','=','draft')]}">
                             <field colspan="4" name="line_ids" nolabel="1">
@@ -2095,7 +2330,7 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Cash Box">
+                        <page string="CashBox">
                             <group col="2" colspan="2" expand="1">
                                 <field name="starting_details_ids" nolabel="1" colspan="2" attrs="{'readonly':[('state','=','draft')]}">
                                     <tree string = "Opening Balance" editable="bottom">
@@ -2126,7 +2361,7 @@
                             </group>
                         </page>
                         <page string="Accounting Entries" attrs="{'invisible': [('state','!=','confirm')]}">
-                            <field colspan="4" name="move_line_ids" nolabel="1"/>
+                            <field colspan="4" name="move_line_ids" nolabel="1" string="Accounting Entries"/>
                         </page>
                     </notebook>
                     <group col="6" colspan="4">
@@ -2137,18 +2372,18 @@
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Opening Balance" colspan="4"/>
-                            <field name="balance_start"/>
+                            <field name="balance_start" readonly="1" string="Opening Balance"/>
                             <field name="total_entry_encoding"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Closing Balance" colspan="4"/>
-                            <field name="balance_end" string="Approx"/>
-                            <field name="balance_end_cash" string="Cash Balance"/>
+                            <field name="balance_end" string="Calculated Balance"/>
+                            <field name="balance_end_cash" string="CashBox Balance"/>
                         </group>
                     </group>
                     <group col="8" colspan="4">
                         <field name="state" colspan="4"/>
-                        <button name="button_confirm" states="open" string="Close CashBox" icon="terp-check" type="object"/>
+                        <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-check" type="object"/>
                         <button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
                         <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
                     </group>
@@ -2178,6 +2413,5 @@
             <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>
 </openerp>

addons/account/board_account_view.xml

@@ -48,10 +48,8 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_account_form"/>
         </record>
-        
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem id="next_id_68" name="Accounting" parent="base.dashboard"
-            groups="account.group_account_manager"/>
-        <menuitem action="open_board_account" icon="terp-graph" id="menu_board_account" parent="next_id_68" sequence="1"/>
+
+        <menuitem icon="terp-graph" 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/company.py

@@ -28,7 +28,7 @@ class res_company(osv.osv):
     }
 
     _defaults = {
-        'overdue_msg': lambda *a: 'Would your payment have been carried \
+        'overdue_msg': 'Would your payment have been carried \
 out after this mail was sent, please consider the present one as \
 void. Do not hesitate to contact our accounting department'
     }

addons/account/data/account_data2.xml

@@ -3,8 +3,8 @@
     <data noupdate="1">
 
         <!--
-		Payment term
-		-->
+        Payment term
+        -->
         <record id="account_payment_term" model="account.payment.term">
             <field name="name">30 Days End of Month</field>
         </record>
@@ -17,10 +17,10 @@
         </record>
 
         <!--
-		Account Journal View
-		-->
+        Account Journal View
+        -->
         <record id="account_journal_bank_view" model="account.journal.view">
-            <field name="name">Cash Journal View</field>
+            <field name="name">Bank/Cash Journal View</field>
         </record>
         <record id="bank_col1" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view"/>
@@ -74,12 +74,6 @@
             <field name="field">credit</field>
             <field eval="11" name="sequence"/>
         </record>
-        <record id="bank_col11" model="account.journal.column">
-            <field name="view_id" ref="account_journal_bank_view"/>
-            <field name="name">Tax</field>
-            <field name="field">account_tax_id</field>
-            <field eval="12" 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>
@@ -100,7 +94,7 @@
         </record>
 
         <record id="account_journal_bank_view_multi" model="account.journal.view">
-            <field name="name">Multi-Currency Cash Journal View</field>
+            <field name="name">Bank/Cash Journal (Multi-Currency) View</field>
         </record>
         <record id="bank_col1_multi" model="account.journal.column">
             <field name="view_id" ref="account_journal_bank_view_multi"/>
@@ -203,6 +197,12 @@
             <field name="field">ref</field>
             <field eval="3" name="sequence"/>
         </record>
+        <record id="journal_col5" model="account.journal.column">
+            <field name="view_id" ref="account_journal_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="4" name="sequence"/>
+        </record>
         <record id="journal_col4" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Account</field>
@@ -210,12 +210,6 @@
             <field eval="True" name="required"/>
             <field eval="5" name="sequence"/>
         </record>
-        <record id="journal_col5" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Partner</field>
-            <field name="field">partner_id</field>
-            <field eval="4" name="sequence"/>
-        </record>
         <record id="journal_col6" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Name</field>
@@ -223,12 +217,6 @@
             <field eval="6" name="sequence"/>
             <field eval="True" name="required"/>
         </record>
-        <record id="journal_col7" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Maturity Date</field>
-            <field name="field">date_maturity</field>
-            <field eval="7" name="sequence"/>
-        </record>
         <record id="journal_col8" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Debit</field>
@@ -241,41 +229,206 @@
             <field name="field">credit</field>
             <field eval="9" name="sequence"/>
         </record>
-        <record id="journal_col10" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Tax</field>
-            <field name="field">account_tax_id</field>
-            <field eval="10" name="sequence"/>
-        </record>
         <record id="journal_col11" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">Analytic Account</field>
             <field name="field">analytic_account_id</field>
             <field eval="11" name="sequence"/>
         </record>
-        <record id="journal_col25" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Tax Acc.</field>
-            <field name="field">tax_code_id</field>
-            <field eval="12" name="sequence"/>
-        </record>
-        <record id="journal_col26" model="account.journal.column">
-            <field name="view_id" ref="account_journal_view"/>
-            <field name="name">Tax</field>
-            <field name="field">tax_amount</field>
-            <field eval="13" name="sequence"/>
-        </record>
         <record id="journal_col24" model="account.journal.column">
             <field name="view_id" ref="account_journal_view"/>
             <field name="name">State</field>
             <field name="field">state</field>
             <field eval="14" name="sequence"/>
         </record>
-
-
+        
+        
+        <record id="account_sp_journal_view" model="account.journal.view">
+            <field name="name">Sale/Purchase Journal View</field>
+        </record>
+        <record id="sp_journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Date</field>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="sp_journal_col2" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">N. Piece</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="sp_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Ref</field>
+            <field name="field">ref</field>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="sp_journal_col4" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Account</field>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="sp_journal_col5" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="sp_journal_col6" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="6" name="sequence"/>
+            <field eval="True" name="required"/>
+        </record>
+        <record id="sp_journal_col7" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Maturity Date</field>
+            <field name="field">date_maturity</field>
+            <field eval="7" name="sequence"/>
+        </record>
+        <record id="sp_journal_col8" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Debit</field>
+            <field name="field">debit</field>
+            <field eval="8" name="sequence"/>
+        </record>
+        <record id="sp_journal_col9" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Credit</field>
+            <field name="field">credit</field>
+            <field eval="9" name="sequence"/>
+        </record>
+        <record id="sp_journal_col10" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">account_tax_id</field>
+            <field eval="10" name="sequence"/>
+        </record>
+        <record id="sp_journal_col11" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="11" name="sequence"/>
+        </record>
+        <record id="sp_journal_col25" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Tax Acc.</field>
+            <field name="field">tax_code_id</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="sp_journal_col26" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">tax_amount</field>
+            <field eval="13" name="sequence"/>
+        </record>
+        <record id="sp_journal_col24" model="account.journal.column">
+            <field name="view_id" ref="account_sp_journal_view"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="14" name="sequence"/>
+        </record>
+        
+        <record id="account_sp_refund_journal_view" model="account.journal.view">
+            <field name="name">Sale/Purchase Refund Journal View</field>
+        </record>
+        <record id="sp_refund_journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Date</field>
+            <field name="field">date</field>
+            <field eval="True" name="required"/>
+            <field eval="1" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col2" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">N. Piece</field>
+            <field name="field">move_id</field>
+            <field eval="False" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Ref</field>
+            <field name="field">ref</field>
+            <field eval="3" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col4" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Account</field>
+            <field name="field">account_id</field>
+            <field eval="True" name="required"/>
+            <field eval="5" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col5" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Partner</field>
+            <field name="field">partner_id</field>
+            <field eval="4" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col6" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Name</field>
+            <field name="field">name</field>
+            <field eval="6" name="sequence"/>
+            <field eval="True" name="required"/>
+        </record>
+        <record id="sp_refund_journal_col7" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Maturity Date</field>
+            <field name="field">date_maturity</field>
+            <field eval="7" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col8" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Debit</field>
+            <field name="field">debit</field>
+            <field eval="8" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col9" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Credit</field>
+            <field name="field">credit</field>
+            <field eval="9" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col10" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">account_tax_id</field>
+            <field eval="10" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col11" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Analytic Account</field>
+            <field name="field">analytic_account_id</field>
+            <field eval="11" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col25" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Tax Acc.</field>
+            <field name="field">tax_code_id</field>
+            <field eval="12" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col26" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">Tax</field>
+            <field name="field">tax_amount</field>
+            <field eval="13" name="sequence"/>
+        </record>
+        <record id="sp_refund_journal_col24" model="account.journal.column">
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
+            <field name="name">State</field>
+            <field name="field">state</field>
+            <field eval="14" name="sequence"/>
+        </record>
         <!--
-		Account Journal Sequences
-		-->
+        Account Journal Sequences
+        -->
 
         <record id="sequence_journal_type" model="ir.sequence.type">
             <field name="name">Account Journal</field>
@@ -298,8 +451,8 @@
         </record>
 
         <!--
-		Account Statement Sequences
-		-->
+        Account Statement Sequences
+        -->
 
         <record id="sequence_reconcile" model="ir.sequence.type">
             <field name="name">Account reconcile sequence</field>

addons/account/data/account_invoice.xml

@@ -5,10 +5,10 @@
             <field name="name">Invoice</field>
             <field name="object">account.invoice</field>
         </record>
-        
+
         <!--
-	Sequences types for invoices
-	-->
+    Sequences types for invoices
+    -->
         <record id="seq_type_out_invoice" model="ir.sequence.type">
             <field name="name">Account Invoice Out</field>
             <field name="code">account.invoice.out_invoice</field>
@@ -27,8 +27,8 @@
         </record>
         
         <!--
-	Sequences for invoices
-	-->
+    Sequences for invoices
+    -->
         <record id="seq_out_invoice" model="ir.sequence">
             <field name="name">Account Invoice Out</field>
             <field name="code">account.invoice.out_invoice</field>
@@ -55,16 +55,16 @@
         </record>
         
         <!--
-	Sequences types for analytic account 
-	-->
+    Sequences types for analytic account 
+    -->
         <record id="seq_type_analytic_account" model="ir.sequence.type">
             <field name="name">Analytic account</field>
             <field name="code">account.analytic.account</field>
         </record>
         
         <!-- 
-	Sequence for analytic account 
-	-->
+    Sequence for analytic account 
+    -->
         <record id="seq_analytic_account" model="ir.sequence">
             <field name="name">Analytic account sequence</field>
             <field name="code">account.analytic.account</field>

addons/account/demo/account_minimal.xml

@@ -18,42 +18,42 @@
             <field name="close_method">balance</field>
         </record>
         <record id="account_type_receivable" model="account.account.type">
-            <field name="name">Receivable</field> 
+            <field name="name">Receivable</field>
             <field name="code">receivable</field>
             <field name="report_type">asset</field>
             <field name="close_method">unreconciled</field>
         </record>
         <record id="account_type_liability" model="account.account.type">
-            <field name="name">Liability</field> 
+            <field name="name">Liability</field>
             <field name="code">liability</field>
             <field name="report_type">liability</field>
             <field name="close_method">balance</field>
         </record>
         <record id="account_type_payable" model="account.account.type">
-            <field name="name">Payable</field> 
+            <field name="name">Payable</field>
             <field name="code">payable</field>
             <field name="report_type">liability</field>
             <field name="close_method">unreconciled</field>
         </record>
         <record id="account_type_income" model="account.account.type">
-            <field name="name">Income</field> 
+            <field name="name">Income</field>
             <field name="code">income</field>
             <field name="report_type">income</field>
             <field name="close_method">none</field>
         </record>
         <record id="account_type_expense" model="account.account.type">
-            <field name="name">Expense</field> 
+            <field name="name">Expense</field>
             <field name="code">expense</field>
             <field name="report_type">expense</field>
             <field name="close_method">none</field>
         </record>
         <record id="account_type_cash_equity" model="account.account.type">
-            <field name="name">Equity</field> 
+            <field name="name">Equity</field>
             <field name="code">equity</field>
             <field name="close_method">balance</field>
         </record>
         <record id="account_type_cash_moves" model="account.account.type">
-            <field name="name">Cash</field> 
+            <field name="name">Cash</field>
             <field name="code">cash</field>
             <field name="report_type">asset</field>
             <field name="close_method">balance</field>
@@ -170,15 +170,16 @@ your own chart of account.
 
 
         <!--
-		Account Journal
-		-->
+        Account Journal
+        -->
 
         <record id="sales_journal" model="account.journal">
             <field name="name">x Sales Journal</field>
             <field name="code">SAJ</field>
             <field name="type">sale</field>
-            <field name="view_id" ref="account_journal_view"/>
+            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
+            <field name="invoice_sequence_id" ref="seq_type_out_invoice"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
             <field name="user_id" ref="base.user_root"/>
@@ -186,9 +187,8 @@ your own chart of account.
         <record id="refund_sales_journal" model="account.journal">
             <field name="name">x Sales Credit Note Journal</field>
             <field name="code">SCNJ</field>
-            <field name="type">sale</field>
-            <field name="refund_journal">True</field>
-            <field name="view_id" ref="account_journal_view"/>
+            <field name="type">sale_refund</field>
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_sale_journal"/>
             <field model="account.account" name="default_credit_account_id" ref="a_sale"/>
             <field model="account.account" name="default_debit_account_id" ref="a_sale"/>
@@ -199,8 +199,9 @@ your own chart of account.
             <field name="name">x Expenses Journal</field>
             <field name="code">EXJ</field>
             <field name="type">purchase</field>
-            <field name="view_id" ref="account_journal_view"/>
+            <field name="view_id" ref="account_sp_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
+            <field name="invoice_sequence_id" ref="seq_type_in_invoice"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
             <field name="user_id" ref="base.user_root"/>
@@ -208,9 +209,8 @@ your own chart of account.
         <record id="refund_expenses_journal" model="account.journal">
             <field name="name">x Expenses Credit Notes Journal</field>
             <field name="code">ECNJ</field>
-            <field name="type">purchase</field>
-            <field name="refund_journal">True</field>
-            <field name="view_id" ref="account_journal_view"/>
+            <field name="type">purchase_refund</field>
+            <field name="view_id" ref="account_sp_refund_journal_view"/>
             <field name="sequence_id" ref="sequence_purchase_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="a_expense"/>
             <field model="account.account" name="default_credit_account_id" ref="a_expense"/>
@@ -239,19 +239,19 @@ your own chart of account.
         </record>
 
         <!--
-		Product income and expense accounts, default parameters
-	-->
-        
+        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="False" name="value"/>
+            <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="False" name="value"/>
+            <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">

addons/account/i18n/account.pot

@@ -5794,3 +5794,332 @@ 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.balance.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 ""
+

addons/account/i18n/bs.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-02-12 13:05+0000\n"
-"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
+"PO-Revision-Date: 2010-07-07 08:48+0000\n"
+"Last-Translator: Bojan Markovic <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:03+0000\n"
+"X-Launchpad-Export-Date: 2010-07-08 03:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -319,7 +319,7 @@ msgstr "Izvor"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr ""
+msgstr "Pomjeri ime"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -365,7 +365,7 @@ msgstr "Analitičko konto"
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr ""
+msgstr "Dječiji porez"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -942,7 +942,7 @@ msgstr "Količina"
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
 msgid "End date"
-msgstr ""
+msgstr "Krajnji datum"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2151,7 +2151,7 @@ msgstr "Stavka analitike"
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Poruka o dospjelim plaćanjima."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
@@ -2804,6 +2804,9 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
+"Polje sekvence koristi se da se poredaju porezni retci od najniže sekvence "
+"prema višima. Red je bitan ako imate porez koji ima više podporeza. U ovom "
+"slućaju, redosljed evaluacije je bitan."
 
 #. module: account
 #: field:account.journal.column,view_id:0
@@ -3458,7 +3461,7 @@ msgstr "Današnji datum"
 msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
-msgstr ""
+msgstr "Iznos izražen u opcionalnoj drugoj valuti ako je viševalutni unos."
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3618,6 +3621,8 @@ msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
 msgstr ""
+"Ovi uvjeti plaćanja će se koristiti umjesto podrazumijevanih za trenutnog "
+"partnera."
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,comment:0
@@ -4020,7 +4025,7 @@ msgstr "Konto za povrat poreza"
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Podšifre"
 
 #. module: account
 #: field:account.invoice,move_name:0
@@ -4196,6 +4201,8 @@ msgid ""
 "reports, so that you can see positive figures instead of negative ones in "
 "expenses accounts."
 msgstr ""
+"Omogućuje da mijenjate predznak bilanse prikazane na izvještaju, tako da "
+"vidite pozitivne iznose (umjesto negativnih) na kontima troškova"
 
 #. module: account
 #: help:account.config.wizard,code:0
@@ -4413,7 +4420,7 @@ msgstr "Datoteka izvoda"
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr ""
+msgstr "Sekvenca fiskalne godine"
 
 #. module: account
 #: view:account.model.line:0
@@ -4592,7 +4599,7 @@ msgstr "Unos stavaka po prijenosu"
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Analitički kontni planovi"
 
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,result_selection:0
@@ -5301,7 +5308,7 @@ msgstr "Jeste li sigurni?"
 #: rml:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr "Predračun"
+msgstr "PRO-FORMA"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
@@ -5867,6 +5874,8 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category"
 msgstr ""
+"Ovaj konto će se koristiti za vrijednost izlazne količine trenutne "
+"kategorije proizvoda"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -5974,3 +5983,333 @@ msgstr "Provjeri da li je korisniku dozvoljeno poravnavanje unosa na kontu."
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Izračunaj datume stavaka"
+
+#. 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 "Zastarjela potraživanja"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Tabla za računovođu"
+
+#. 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.balance.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 ""
+"Možda ste napravili sljedeće pogreške. Ispravite ih i pokušajte ponovno."
+
+#. 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 "Izvještaj o fakturama unesenim u zadnjih 15 dana"
+
+#. 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 ""

addons/account/i18n/es.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-24 10:03+0000\n"
+"PO-Revision-Date: 2010-06-29 22:11+0000\n"
 "Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
 "Language-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-26 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-07-01 03:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -6076,5 +6076,364 @@ msgstr ""
 msgid "Compute Entry Dates"
 msgstr "Calcular fechas asiento"
 
+#. module: account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Cuentas analíticas a cerrar"
+
+#. module: account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr "Facturas borrador"
+
+#. 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 "Tablero de contabilidad"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.act_my_account
+msgid "Accounts to invoice"
+msgstr "Cuentas a facturar"
+
+#. module: account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Costos a facturar"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Efectos vencidos a cobrar"
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Board for accountant"
+msgstr "Tablero para contables"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_aged_income
+msgid "Income Accounts"
+msgstr "Cuentas de ingresos"
+
+#. module: account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Mis indicadores"
+
+#. module: account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Tablero de contabilidad"
+
+#. module: account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Ingresos vencidos"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,show_columns:0
+msgid "Show Debit/Credit Information"
+msgstr "Mostrar información débito/crédito"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,account_choice:0
+msgid "All accounts"
+msgstr "Todas las cuentas"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,period_manner:0
+msgid "Entries Selection Based on"
+msgstr "Selección de entradas basada en"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+#: wizard_view:account.balance.account.balance.report,zero_years:0
+msgid "Notification"
+msgstr "Notificación"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Financial Period"
+msgstr "Periodo financiero"
+
+#. 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 "Balance contable"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period(s)"
+msgstr "Seleccione período(s)"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Percentage"
+msgstr "Porcentaje"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Compare Selected Years In Terms Of"
+msgstr "Comparar ejercicios seleccionados en términos de"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Fiscal Year(s)(Maximum Three Years)"
+msgstr "Seleccionar ejercicio(s) fiscal(es) (máximo 3 años)"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,select_account:0
+msgid "Select Reference Account(for  % comparision)"
+msgstr "Seleccione cuenta de referencia (para comparación %)"
+
+#. module: account
+#: model:ir.actions.wizard,name:account.wizard_account_balance_report
+msgid "Account balance-Compare Years"
+msgstr "Balance contable-Compara ejercicios"
+
+#. 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 ""
+"El módulo de balance de cuentas es una funcionalidad añadida al módulo de "
+"gestión financiera.\n"
+"\n"
+"    Este módulo ofrece diversas opciones de impresión de balances.\n"
+"\n"
+"    1. Se puede comparar el balance de distintos años.\n"
+"\n"
+"    2. Puede establecer la comparación en importe o porcentual entre dos "
+"años.\n"
+"\n"
+"    3. Puede establecer la cuenta de referencia para la comparación "
+"porcentual para años en particular.\n"
+"\n"
+"    4. Puede seleccionar períodos como una fecha real o períodos como fecha "
+"de creación.\n"
+"\n"
+"    5. Puede imprimir el informe que desee en formato apaisado.\n"
+"    "
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You have to select 'Landscape' option. Please Check it."
+msgstr "Debe seleccionar la opción 'Horizontal'. Por favor, márquela."
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,landscape:0
+msgid "Show Report in Landscape Form"
+msgstr "Mostrar informe en formato horizontal"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,format_perc:0
+msgid "Show Comparision in %"
+msgstr "Mostrar comparación en %"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Select Period"
+msgstr "Seleccionar periodo"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Report Options"
+msgstr "Opciones del informe"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,compare_pattern:0
+msgid "Don't Compare"
+msgstr "No comparar"
+
+#. module: account
+#: wizard_field:account.balance.account.balance.report,init,account_choice:0
+msgid "Show Accounts"
+msgstr "Mostrar cuentas"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "1. You have selected more than 3 years in any case."
+msgstr "1. Ha seleccionado más de 3 ejercicios en cualquier caso."
+
+#. module: account
+#: model:ir.module.module,shortdesc:account.module_meta_information
+msgid "Accounting and financial management-Compare Accounts"
+msgstr "Gestión contable y financiera - Comparación de cuentas"
+
+#. module: account
+#: rml:account.account.balance.landscape:0
+#: rml:account.balance.account.balance:0
+msgid "Year :"
+msgstr "Ejercicio :"
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,backtoinit:0
+msgid "You can select maximum 3 years. Please check again."
+msgstr ""
+"Puede seleccionar un máximo de 3 ejercicios. Por favor, seleccione otra vez."
+
+#. 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 ""
+"3. Ha seleccionado la opción 'Porcentaje' con más de 2 ejercicios, pero no "
+"ha seleccionado formato horizontal."
+
+#. 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 ""
+"Podría haber cometido los siguientes errores. Por favor, corríjalos e "
+"inténtelo de nuevo."
+
+#. module: account
+#: help:account.balance.account.balance.report,init,select_account:0
+msgid "Keep empty for comparision to its parent"
+msgstr "Dejarlo vacío para comparar con sus padres"
+
+#. module: account
+#: selection:account.balance.account.balance.report,init,period_manner:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. 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 ""
+"2. No ha seleccionado la opción 'Porcentaje', pero ha seleccionado más de 2 "
+"ejercicios."
+
+#. 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 ""
+"Puede haber seleccionado las opciones comparar con más de 1 ejercicio con "
+"columnas crédito/débito y opción %. Esto pueden ocasionar que hayan "
+"contenidos que se impriman fuera del papel. Por favor, inténtelo de nuevo."
+
+#. 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 ""
+"Debe seleccionar al menos un ejercicio fiscal. Por favor, inténtelo de nuevo."
+
+#. module: account
+#: wizard_view:account.balance.account.balance.report,init:0
+msgid "Customize Report"
+msgstr "Informe personalizado"
+
+#. module: account
+#: field:report.aged.receivable,name:0
+msgid "Month Range"
+msgstr "Rango mensual"
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard
+msgid "Invoices Created Within Past 15 Days"
+msgstr "Facturas creadas en los últimos 15 días"
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_invoice_created
+msgid "Report of Invoices Created within Last 15 days"
+msgstr "Informe de facturas creadas en los últimos 15 días"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Total Amount"
+msgstr "Importe total"
+
+#. module: account
+#: view:report.account.receivable:0
+msgid "Accounts by type"
+msgstr "Cuentas por tipo"
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_aged_receivable
+msgid "Aged Receivable Till Today"
+msgstr "Efectos a cobrar vencidos hasta hoy"
+
+#. module: account
+#: model:ir.model,name:report_account.model_report_account_receivable
+msgid "Receivable accounts"
+msgstr "Cuentas a cobrar"
+
+#. module: account
+#: field:temp.range,name:0
+msgid "Range"
+msgstr "Intervalo"
+
+#. 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 ""
+"Módulo que añade nuevos informes basado en el módulo contable-financiero."
+
+#. module: account
+#: model:ir.module.module,shortdesc:report_account.module_meta_information
+msgid "Account Reporting - Reporting"
+msgstr "Informe contable - Informe"
+
+#. 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 "Saldo por tipo de cuenta"
+
+#. module: account
+#: field:report.account.receivable,name:0
+msgid "Week of Year"
+msgstr "Semana del año"
+
+#. module: account
+#: field:report.invoice.created,create_date:0
+msgid "Create Date"
+msgstr "Fecha de creación"
+
+#. module: account
+#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
+#: view:report.aged.receivable:0
+msgid "Aged Receivable"
+msgstr "A cobrar anteriores"
+
+#. module: account
+#: view:report.invoice.created:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
 #~ msgid "account.config.wizard"
 #~ msgstr "account.config.asistente"

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-06-15 07:00+0000\n"
+"PO-Revision-Date: 2010-07-08 08:56+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-06-22 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -35,7 +35,7 @@ msgstr "Fatture fornitori non pagate"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr "Codifica delle registrazioni"
+msgstr "Movimenti contabili"
 
 #. module: account
 #: model:ir.actions.todo,note:account.config_wizard_account_base_setup_form
@@ -3209,6 +3209,8 @@ msgid ""
 "The account moves of the invoice have been reconciled with account moves of "
 "the payment(s)."
 msgstr ""
+"I movimenti contabili della fattura sono stati riconciliati con movimenti "
+"contabili del/i pagamento/i."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3631,7 +3633,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr ""
+msgstr "Il conto del partner utilizzato per questa fattura."
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -3888,7 +3890,7 @@ msgstr ""
 #. module: account
 #: help:account.invoice,date_invoice:0
 msgid "Keep empty to use the current date"
-msgstr ""
+msgstr "Lasciare vuoto per utilizzare la data corrente"
 
 #. module: account
 #: rml:account.overdue:0
@@ -4581,7 +4583,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_move_line_form_encode_by_move
 #: model:ir.ui.menu,name:account.menu_encode_entries_by_move
 msgid "Entries Encoding by Move"
-msgstr "Codifica delle registrazioni per movimento"
+msgstr "Registrazioni per movimento"
 
 #. module: account
 #: wizard_view:account.analytic.account.chart,init:0
@@ -5278,7 +5280,7 @@ msgstr "Non pagati"
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr ""
+msgstr "Importo rimanente dovuto"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
@@ -5959,3 +5961,332 @@ msgstr ""
 #: wizard_button:account.subscription.generate,init,generate:0
 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.balance.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 ""

addons/account/i18n/ru.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-04-03 16:42+0000\n"
-"Last-Translator: Alexandr Mitev <Unknown>\n"
+"PO-Revision-Date: 2010-07-10 11:35+0000\n"
+"Last-Translator: Pomazan Bogdan <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:05+0000\n"
+"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -113,7 +113,7 @@ msgstr "Распечатать налоговый отчет"
 #. module: account
 #: field:account.account,parent_id:0
 msgid "Parent"
-msgstr "Предок"
+msgstr "Контрагент"
 
 #. module: account
 #: selection:account.move,type:0
@@ -131,7 +131,7 @@ msgstr "Остаток"
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr ""
+msgstr "Знак основного кода"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
@@ -162,7 +162,7 @@ msgstr "Централизация Дебета"
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm
 msgid "Confirm draft invoices"
-msgstr "Подтверить черновики счетов"
+msgstr "Подтвердить черновики счетов"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -171,6 +171,10 @@ msgid ""
 "positive, it gives the day of the next month. Set 0 for net days (otherwise "
 "it's based on the beginning of the month)."
 msgstr ""
+"Установите значение дня месяца -1 для последнего дня текущего месяца. В "
+"случае положительного значения, значение дня будет соответствовать дню "
+"следующего месяца. Установите значение 0 для чистых дней (иначе счет идет с "
+"начала месяца)."
 
 #. module: account
 #: view:account.move:0
@@ -510,7 +514,7 @@ msgstr "Периодическая обработка"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr "Состояния проводок аналитики"
+msgstr "Состояние проводок аналитического учета"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@@ -521,7 +525,7 @@ msgstr "Шаблоны кодов налога"
 #. module: account
 #: view:account.invoice:0
 msgid "Supplier invoice"
-msgstr "Счет поставщика"
+msgstr "Счет-фактура поставщика"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_reconcilepaid0
@@ -681,7 +685,7 @@ msgstr "Подитог:"
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 #: model:ir.ui.menu,name:account.next_id_41
 msgid "Analytic Entries"
-msgstr "Проводки аналитики"
+msgstr "Проводки аналитического учета"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -714,7 +718,7 @@ msgstr "Выберите период для проведения анализа
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr ""
+msgstr "Символ кода налога"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -1151,12 +1155,12 @@ msgstr "Период с"
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr ""
+msgstr "Мультиплановые счета"
 
 #. module: account
 #: model:account.journal,name:account.sales_journal
 msgid "Journal de vente"
-msgstr ""
+msgstr "Журнал продаж"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -1167,7 +1171,7 @@ msgstr "Сумма выраженная в дополнительной друг
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr ""
+msgstr "Шаблон финансовой области"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1208,7 +1212,7 @@ msgstr "Список шаблонов налогов"
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Invoice import"
-msgstr ""
+msgstr "Счет импорта"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
@@ -1224,6 +1228,11 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
+"Это позволит выбрать текущий валютный курс для расчета сумм в сделке. В "
+"большинстве стран правового метода является \"средний\", но лишь немногие "
+"программные системы способны управлять этим. Так что если вы импортируете из "
+"другого программного обеспечения системы вы можете использовать курс на "
+"дату. Входящие сделки всегда используют ставку на сегодняшний день."
 
 #. module: account
 #: field:account.account,company_currency_id:0
@@ -1233,12 +1242,12 @@ msgstr "Валюта компании"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Fiscal Position Template Account Mapping"
-msgstr ""
+msgstr "Шаблон структуры счетов финансовой области"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
 msgid "Parent Analytic Account"
-msgstr ""
+msgstr "Основной аналитический счет"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile,init_partial,addendum:0
@@ -1248,12 +1257,12 @@ msgstr "Сверить со списанием"
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr ""
+msgstr "Налоговые / базовая сумма"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr ""
+msgstr "Кол-во цифр для использования в коде счета"
 
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
@@ -1278,7 +1287,7 @@ msgstr "Фиксированная величина"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Аналитический Кредит"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -1296,12 +1305,12 @@ msgstr "Не сверенные транзакции"
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr ""
+msgstr "Структура налога"
 
 #. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
-msgstr ""
+msgstr "Продолжить"
 
 #. module: account
 #: field:account.payment.term.line,value:0
@@ -1356,7 +1365,7 @@ msgstr "Вид"
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr ""
+msgstr "Все"
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
@@ -1386,7 +1395,7 @@ msgstr ""
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Электронный файл"
 
 #. module: account
 #: view:res.partner:0
@@ -1435,23 +1444,23 @@ msgstr "Журнал"
 #: field:account.account,child_id:0
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Подчиненный счет"
 
 #. module: account
 #: field:account.account,check_history:0
 msgid "Display History"
-msgstr ""
+msgstr "Показать историю"
 
 #. module: account
 #: wizard_field:account.third_party_ledger.report,init,date1:0
 msgid "        Start date"
-msgstr ""
+msgstr "        Дата начала"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,display_account:0
 #: wizard_field:account.general.ledger.report,checktype,display_account:0
 msgid "Display accounts "
-msgstr ""
+msgstr "Показать счета "
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile_line
@@ -1517,7 +1526,7 @@ msgstr "Поставщик"
 #. module: account
 #: rml:account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "тел.:"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -1552,7 +1561,7 @@ msgstr "Движение счета"
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Основной план счетов на основе шаблона"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -1563,7 +1572,7 @@ msgstr ""
 #: field:account.tax.code,parent_id:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Основной код"
 
 #. module: account
 #: wizard_button:account.move.line.reconcile.select,init,open:0
@@ -1608,7 +1617,7 @@ msgstr "Ссылка на партнера"
 #: selection:account.partner.balance.report,init,result_selection:0
 #: selection:account.third_party_ledger.report,init,result_selection:0
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Счета дебиторской и кредиторской задолженности"
 
 #. module: account
 #: view:account.subscription:0
@@ -1683,7 +1692,7 @@ msgstr ""
 #: model:ir.actions.wizard,name:account.wizard_period_close
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "Закрыть период"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal
@@ -1703,7 +1712,7 @@ msgstr "Номер счета"
 #. module: account
 #: view:account.config.wizard:0
 msgid "Skip"
-msgstr ""
+msgstr "Пропустить"
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -1724,12 +1733,12 @@ msgstr "Открыть повторно"
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Are you sure you want to create entries?"
-msgstr ""
+msgstr "Вы действительно хотите создать проводки?"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Include in base amount"
-msgstr ""
+msgstr "Включить в базовую сумму"
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
@@ -1806,7 +1815,7 @@ msgstr "Продажа"
 #: wizard_button:account.account.balance.report,account_selection,checktype:0
 #: wizard_button:account.general.ledger.report,account_selection,checktype:0
 msgid "Next"
-msgstr ""
+msgstr "Далее"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -1814,11 +1823,13 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the the "
 "partner."
 msgstr ""
+"Финансовая область будет определять налоги и счета, используемые для "
+"контрагента."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
 msgid "Date or Code"
-msgstr ""
+msgstr "Дата или Код"
 
 #. module: account
 #: field:account.analytic.account,user_id:0
@@ -2010,7 +2021,7 @@ msgstr "Возврат средств клиенту"
 #. module: account
 #: rml:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Сумма налога"
 
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
@@ -2058,7 +2069,7 @@ msgstr ""
 #. module: account
 #: rml:account.invoice:0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Черновик счета"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
@@ -2261,7 +2272,7 @@ msgstr ""
 #. module: account
 #: view:account.config.wizard:0
 msgid "Create a Fiscal Year"
-msgstr ""
+msgstr "Создать финансовый год"
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -3220,7 +3231,7 @@ msgstr "Налоги"
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
 msgid "Close Fiscal Year with new entries"
-msgstr ""
+msgstr "Закрыть учетный год с новыми проводками"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -3669,7 +3680,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.todo,note:account.config_fiscalyear
 msgid "Define Fiscal Years and Select Charts of Account"
-msgstr ""
+msgstr "Определить отчетный год и выбрать план счетов"
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,addendum,period_id:0
@@ -3758,7 +3769,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Fiscal Position Template Tax Mapping"
-msgstr ""
+msgstr "Структура налоговых шаблонов для финансовой области"
 
 #. module: account
 #: rml:account.invoice:0
@@ -4098,7 +4109,7 @@ msgstr ""
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr ""
+msgstr "Отдельные последовательности журнала"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_currency:0
@@ -4399,7 +4410,7 @@ msgstr ""
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr ""
+msgstr "Последовательности отчетного года"
 
 #. module: account
 #: view:account.model.line:0
@@ -4505,7 +4516,7 @@ msgstr ""
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Valid Entries"
-msgstr ""
+msgstr "Согласованные проводки"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_account_use_model
@@ -4546,7 +4557,7 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr ""
+msgstr "Настройки бухгалтерского учета для контрагента-поставщика"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5192,7 +5203,7 @@ msgstr "Данный месяц"
 #. module: account
 #: field:account.account.type,sign:0
 msgid "Sign on Reports"
-msgstr ""
+msgstr "Знак в отчётах"
 
 #. module: account
 #: help:account.move.line,currency_id:0
@@ -5537,7 +5548,7 @@ msgstr ""
 #. module: account
 #: rml:account.general.journal:0
 msgid "Printing Date :"
-msgstr ""
+msgstr "Печать Даты:"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
@@ -5699,7 +5710,7 @@ msgstr ""
 #. module: account
 #: rml:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Остаток по аналитике"
 
 #. module: account
 #: wizard_field:account_use_models,init_form,model:0
@@ -5951,4 +5962,333 @@ msgstr ""
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 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.balance.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 ""

addons/account/installer.py

@@ -207,8 +207,8 @@ class account_installer(osv.osv_memory):
             new_account = obj_acc.create(cr, uid, vals)
             acc_template_ref[account_template.id] = new_account
             if account_template.name == 'Bank Current Account':
-                view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Cash Journal View')])[0]
-                view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Multi-Currency Cash Journal View')])[0]
+                view_id_cash = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal View')])[0] #why fixed name here?
+                view_id_cur = self.pool.get('account.journal.view').search(cr,uid,[('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #Why Fixed name here?
                 ref_acc_bank = obj_multi.bank_account_view_id
 
                 cash_result = mod_obj._get_id(cr, uid, 'account', 'conf_account_type_cash')
@@ -328,8 +328,8 @@ class account_installer(osv.osv_memory):
         obj_journal.create(cr,uid,vals_journal)
 
         # Bank Journals
-        view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Cash Journal View')])[0]
-        view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Multi-Currency Cash Journal View')])[0]
+        view_id_cash = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal View')])[0] #TOFIX: Why put fixed name ?
+        view_id_cur = self.pool.get('account.journal.view').search(cr, uid, [('name','=','Bank/Cash Journal (Multi-Currency) View')])[0] #TOFIX: why put fixed name?
         ref_acc_bank = obj_multi.bank_account_view_id
 
 

addons/account/invoice.py

@@ -45,24 +45,25 @@ class account_invoice(osv.osv):
             res[invoice.id]['amount_total'] = res[invoice.id]['amount_tax'] + res[invoice.id]['amount_untaxed']
         return res
 
-    def _get_journal(self, cr, uid, context):
+    def _get_journal(self, cr, uid, context=None):
         if context is None:
             context = {}
         type_inv = context.get('type', 'out_invoice')
-        user = self.pool.get('res.users').browse(cr, uid, uid)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         company_id = context.get('company_id', user.company_id.id)
-        type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale', 'in_refund': 'purchase'}
+        type2journal = {'out_invoice': 'sale', 'in_invoice': 'purchase', 'out_refund': 'sale_refund', 'in_refund': 'purchase_refund'}
         refund_journal = {'out_invoice': False, 'in_invoice': False, 'out_refund': True, 'in_refund': True}
         journal_obj = self.pool.get('account.journal')
         res = journal_obj.search(cr, uid, [('type', '=', type2journal.get(type_inv, 'sale')),
-                                            ('company_id', '=', company_id),('refund_journal', '=', refund_journal.get(type_inv, False))],
+                                            ('company_id', '=', company_id),
+                                            ('refund_journal', '=', refund_journal.get(type_inv, False))],
                                                 limit=1)
         if res:
             return res[0]
         else:
             return False
 
-    def _get_currency(self, cr, uid, context):
+    def _get_currency(self, cr, uid, context=None):
         user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0]
         if user.company_id:
             return user.company_id.currency_id.id
@@ -80,10 +81,9 @@ class account_invoice(osv.osv):
     def _get_type(self, cr, uid, context=None):
         if context is None:
             context = {}
-        type = context.get('type', 'out_invoice')
-        return type
+        return context.get('type', 'out_invoice')
 
-    def _reconciled(self, cr, uid, ids, name, args, context):
+    def _reconciled(self, cr, uid, ids, name, args, context=None):
         res = {}
         for id in ids:
             res[id] = self.test_paid(cr, uid, [id])
@@ -94,8 +94,11 @@ class account_invoice(osv.osv):
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
         res = {}
-        data_inv = self.browse(cr, uid, ids)
         cur_obj = self.pool.get('res.currency')
+        data_inv = self.browse(cr, uid, ids)
+        if context is None:
+            context = {}
+
         for inv in data_inv:
             debit = credit = 0.0
             context.update({'date':inv.date_invoice})
@@ -187,7 +190,7 @@ class account_invoice(osv.osv):
             result[invoice.id] = lines
         return result
 
-    def _get_invoice_from_line(self, cr, uid, ids, context={}):
+    def _get_invoice_from_line(self, cr, uid, ids, context=None):
         move = {}
         for line in self.pool.get('account.move.line').browse(cr, uid, ids):
             if line.reconcile_partial_id:
@@ -201,7 +204,7 @@ class account_invoice(osv.osv):
             invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context)
         return invoice_ids
 
-    def _get_invoice_from_reconcile(self, cr, uid, ids, context={}):
+    def _get_invoice_from_reconcile(self, cr, uid, ids, context=None):
         move = {}
         for r in self.pool.get('account.move.reconcile').browse(cr, uid, ids):
             for line in r.line_partial_ids:
@@ -220,7 +223,7 @@ class account_invoice(osv.osv):
     _log_create = True
     _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."),
+        'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
             ('out_invoice','Customer Invoice'),
             ('in_invoice','Supplier Invoice'),
@@ -231,7 +234,7 @@ class account_invoice(osv.osv):
         '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),
+            required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'comment': fields.text('Additional Information', translate=True),
 
         'state': fields.selection([
@@ -247,8 +250,8 @@ class account_invoice(osv.osv):
             \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 \'Cancelled\' state is used when user cancel invoice.'),
-        'date_invoice': fields.date('Date Invoiced', states={'open':[('readonly',True)], 'close':[('readonly',True)]}, help="Keep empty to use the current date"),
-        'date_due': fields.date('Due Date', states={'open':[('readonly',True)], 'close':[('readonly',True)]},
+        '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)]},
             help="If you use payment terms, the due date will be computed automatically at the generation "\
                 "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
@@ -288,7 +291,7 @@ class account_invoice(osv.osv):
             multi='all'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
         'check_total': fields.float('Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
         'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean',
             store={
@@ -297,7 +300,7 @@ class account_invoice(osv.osv):
                 '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'),
+            help='The bank account to pay to or to be paid from', 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={
@@ -309,19 +312,19 @@ class account_invoice(osv.osv):
             },
             help="Remaining amount due."),
         'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'),
-        'move_name': fields.char('Ledger Posting', size=64),
-        'user_id': fields.many2one('res.users', 'Salesman'),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position')
+        'move_name': fields.char('Ledger Posting', size=64, readonly=True, states={'draft':[('readonly',False)]}),
+        'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}),
+        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
     }
     _defaults = {
         'type': _get_type,
         #'date_invoice': lambda *a: time.strftime('%Y-%m-%d'),
-        'state': lambda *a: 'draft',
+        'state': 'draft',
         'journal_id': _get_journal,
         'currency_id': _get_currency,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.invoice', context=c),
-        'reference_type': lambda *a: 'none',
-        'check_total': lambda *a: 0.0,
+        'reference_type': 'none',
+        'check_total': 0.0,
         'user_id': lambda s, cr, u, c: u,
     }
 
@@ -338,16 +341,15 @@ class account_invoice(osv.osv):
                     view_id = self.pool.get('ir.ui.view').search(cr,uid,[('name','=','account.invoice.form')])[0]
         return super(account_invoice,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         try:
             res = super(account_invoice, self).create(cr, uid, vals, context)
             return res
-        except Exception,e:
+        except Exception, e:
             if '"journal_id" viol' in e.args[0]:
                 raise orm.except_orm(_('Configuration Error!'),
                      _('There is no Accounting Journal of type Sale/Purchase defined!'))
             else:
-                raise
                 raise orm.except_orm(_('UnknownError'), str(e))
 
     def confirm_paid(self, cr, uid, ids, context=None):
@@ -766,6 +768,10 @@ 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.invoice_line:
+                raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.'))
             if inv.move_id:
                 continue
 
@@ -788,6 +794,7 @@ class account_invoice(osv.osv):
             # one move line per tax line
             iml += ait_obj.move_line_get(cr, uid, inv.id)
 
+            entry_type=''
             if inv.type in ('in_invoice', 'in_refund'):
                 ref = inv.reference
                 entry_type = 'journal_pur_voucher'
@@ -918,7 +925,7 @@ class account_invoice(osv.osv):
             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=%s', {'fiscalyear_id': obj_inv.period_id.fiscalyear_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)
@@ -1043,6 +1050,10 @@ class account_invoice(osv.osv):
             tax_lines = self.pool.get('account.invoice.tax').read(cr, uid, invoice['tax_line'])
             tax_lines = filter(lambda l: l['manual'], tax_lines)
             tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines)
+            if invoice['type'] == 'in_invoice':
+                refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase_refund')])
+            else:
+                refund_journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','sale_refund')])
             if not date :
                 date = time.strftime('%Y-%m-%d')
             invoice.update({
@@ -1051,7 +1062,8 @@ class account_invoice(osv.osv):
                 'state': 'draft',
                 'number': False,
                 'invoice_line': invoice_lines,
-                'tax_line': tax_lines
+                'tax_line': tax_lines,
+                'journal_id': refund_journal_ids
             })
             if period_id :
                 invoice.update({
@@ -1105,7 +1117,6 @@ class account_invoice(osv.osv):
             ref = invoice.reference
         else:
             ref = self._convert_ref(cr, uid, invoice.number)
-
         # Pay attention to the sign for both debit/credit AND amount_currency
         l1 = {
             'debit': direction * pay_amount>0 and direction * pay_amount,
@@ -1216,8 +1227,8 @@ class account_invoice_line(osv.osv):
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
     _defaults = {
-        'quantity': lambda *a: 1,
-        'discount': lambda *a: 0.0,
+        'quantity': 1,
+        'discount': 0.0,
         'price_unit': _price_unit_default,
     }
 
@@ -1560,4 +1571,7 @@ class res_partner(osv.osv):
     _columns = {
         'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
     }
+
 res_partner()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/partner.py

@@ -191,7 +191,4 @@ class res_partner(osv.osv):
     }
 res_partner()
 
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/partner_view.xml

@@ -10,9 +10,9 @@
                 <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"/>
                     <newline/>
-                    <field name="note" colspan="4"/>
-                    <field name="tax_ids" colspan="4" widget="one2many_list">
+                    <field name="tax_ids" colspan="2" widget="one2many_list" nolabel="1">
                         <tree string="Tax Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
@@ -22,7 +22,7 @@
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
-                    <field name="account_ids" colspan="4" widget="one2many_list">
+                    <field name="account_ids" colspan="2" widget="one2many_list" nolabel="1">
                         <tree string="Account Mapping" editable="bottom">
                             <field name="account_src_id"/>
                             <field name="account_dest_id"/>
@@ -32,6 +32,8 @@
                             <field name="account_dest_id"/>
                         </form>
                     </field>
+                    <separator string="Notes" colspan="4"/>
+                    <field name="note" colspan="4" nolabel="1"/>
                 </form>
             </field>
         </record>

addons/account/product.py

@@ -33,7 +33,7 @@ class product_category(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            help="This account will be used to value incoming stock(i.e. credit of incoming goods) for the current product category"),
+            help="This account will be used for invoices to value sales for the current product category"),
         'property_account_expense_categ': fields.property(
             'account.account',
             type='many2one',
@@ -41,7 +41,7 @@ class product_category(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            help="This account will be used to value outgoing stock(i.e. debit of outgoing goods) for the current product category"),
+            help="This account will be used for invoices to value expenses for the current product category"),
     }
 product_category()
 
@@ -64,7 +64,7 @@ class product_template(osv.osv):
             string="Income Account",
             method=True,
             view_load=True,
-            help="This account will be used instead of the default one to value incoming stock for the current product"),
+            help="This account will be used for invoices instead of the default one to value sales for the current product"),
         'property_account_expense': fields.property(
             'account.account',
             type='many2one',
@@ -72,7 +72,7 @@ class product_template(osv.osv):
             string="Expense Account",
             method=True,
             view_load=True,
-            help="This account will be used instead of the default one to value outgoing stock for the current product"),
+            help="This account will be used for invoices instead of the default one to value expenses for the current product"),
     }
 product_template()
 

addons/account/project/project_view.xml

@@ -24,7 +24,7 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
             	<search string="Analytic Account">
-            		<group col="8" colspan="4">
+	           		<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"/>
@@ -32,7 +32,15 @@
 						<field name="code" select="1"/>
 						<field name="partner_id" select="1"/>
 						<field name="user_id" widget="selection"/>
-            		</group>
+	           		</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'}"/>
+                    </group>
             	</search>
             </field>
         </record>
@@ -53,6 +61,10 @@
                     <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"/>
                 </tree>
             </field>
         </record>
@@ -148,7 +160,7 @@
                     <field name="journal_id" select="2"/>
                     <field name="general_account_id" select="2"/>
                     <field name="move_id" select="2"/>
-                <separator string="Optionnal Information" colspan="4"/>
+                <separator string="Optional Information" colspan="4"/>
                     <field name="unit_amount" select="2"/>
                     <field name="ref" select="2"/>
                     <field name="currency_id" select="2"/>
@@ -195,6 +207,13 @@
                         <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>
             </field>
         </record>
@@ -278,6 +297,19 @@
             </field>
         </record>
 
+		<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...">
+                        <filter string="Type" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'type'}"/>
+                    </group>
+            	</search>
+            </field>
+        </record>
+
         <record id="view_account_analytic_journal_form" model="ir.ui.view">
             <field name="name">account.analytic.journal.form</field>
             <field name="model">account.analytic.journal</field>
@@ -296,7 +328,7 @@
             <field name="name">Analytic Journals</field>
             <field name="res_model">account.analytic.journal</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,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"/>
 
@@ -309,7 +341,6 @@
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('journal_id','=',active_id)]</field>
         </record>
         <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
         <!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
@@ -321,7 +352,7 @@
         </record> -->
 <!--        <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
          <!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
-            <field name="name">Checks Register</field>
+            <field name="name">Check Registers</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>

addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report_view.xml

@@ -7,18 +7,20 @@
 			<field name="model">account.analytic.cost.ledger.journal.report</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
-				<form string="Select period">
-					<separator string="Cost Legder for period" colspan="4"/>
-					<field name="date1"/>
-					<field name="date2"/>
-					<separator string="and Journals" colspan="4"/>
-					<field name="journal" colspan="4"/>
-					<separator colspan="4"/>
-					<group colspan="4" col="6">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="check_report" string="Print" type="object" icon="gtk-print"/>
-					</group>
-				</form>
+                <form string="Select period">
+	               <group width="450">
+	                   <separator string="Cost Legder for period" colspan="4"/>
+	                   <field name="date1"/>
+	                   <field name="date2"/>
+	                   <separator string="and Journals" colspan="4"/>
+	                   <field name="journal" colspan="4" nolabel="1"/>
+	                   <separator colspan="4"/>
+	                   <group colspan="4" col="6">
+	                       <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+	                       <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+	                   </group>
+	               </group>
+                </form>
 			</field>
 		</record>
 

addons/account/report/__init__.py

@@ -35,7 +35,7 @@ import account_balance_landscape
 import compare_account_balance
 import account_invoice_report
 import account_report
-import account_analytic_report
+#import account_analytic_report
 import account_account_report
 import account_entries_report
 import account_analytic_entries_report

addons/account/report/account_analytic_entries_report_view.xml

@@ -54,7 +54,7 @@
 	                </field>
 	            </group>
                 <newline/>
-                <group expand="0" string="Group By...">
+                <group expand="1" string="Group By...">
                     <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
                     <filter string="Currency" icon="terp-dolar" context="{'group_by':'currency_id'}"/>
                     <filter string="Company"  icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>

addons/account/report/account_balance.rml

@@ -217,11 +217,11 @@
         <td><para style="P10">Balance</para></td>
       </tr>
       <tr>
-		<td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
-        <td><para style="P14"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para></td>
-        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
-        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font></para></td>
-        <td><para style="P3"><font>[[ a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"}) ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'])  ]]</font></para></td>
+		<td><para style="P14">[[ repeatIn(lines(data['form']), 'a') ]]<font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><i>[[ a['code'] or removeParentNode('tr')  ]]</i></para></td>
+        <td><para style="P14"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font color="white">[[ '..'*(a['level']-1) ]]</font><font>[[ a['name'] ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['debit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[formatLang(a['debit']) ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font')]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['credit']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['credit']) ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['level']&gt;2 and setTag('para','para',{'fontName':"Helvetica"})) or removeParentNode('font') ]]</font><font>[[ a['type']=='view' and removeParentNode('font') ]][[ formatLang(a['balance']) ]]</font><font>[[ a['type']&lt;&gt;'view' and removeParentNode('font') ]] [[ formatLang(a['balance'])  ]]</font></para></td>
       </tr>
     </blockTable>
   </story>

addons/account/report/account_entries_report_view.xml

@@ -50,36 +50,42 @@
         <field name="arch" type="xml">
             <search string="Entries Analysis">
                 <group colspan="10" col="12">
-                    <filter string="Income" name="profit" icon="terp-document-new" domain="[('user_type.report_type','=','income')]"/>
-                    <filter string="Expense" name="loss" icon="terp-document-new" domain="[('user_type.report_type','=','expense')]"/>
-                    <separator orientation="vertical"/>
-                    <filter string="Asset" name="asset" icon="terp-document-new" domain="[('user_type.report_type','=','asset')]"/>
-                    <filter string="Liability" name="liability" icon="terp-document-new" domain="[('user_type.report_type','=','liability')]"/>
-                    <filter string="Receivable" name="asset" icon="terp-document-new" domain="[('type','=','receivable')]"/>
-                    <filter string="Payable" name="asset" icon="terp-document-new" domain="[('type','=','payable')]"/>
+                <filter icon="terp-go-year" string="This Year"
+                                domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+                                help="Tasks performed in this year"/>
+                <filter icon="terp-go-month" string="This Month"
+                        name="month"
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+                        help="Tasks performed in this month"/>
+                <filter icon="terp-go-week"
+                        string="7 Days"
+                        separator="1"
+                        domain="[('date','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+                        help="Tasks during last 7 days"/>
                     <separator orientation="vertical"/>
                     <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft entries"/>
                     <filter string="Posted" icon="terp-camera_test" domain="[('state','=','posted')]" help = "Posted entries"/>
                     <separator orientation="vertical"/>
-                    <field name="journal_id"/>
-                    <field name="period_id"/>
                     <field name="account_id"/>
-                    <field name="analytic_account_id"/>
                 </group>
                 <newline/>
                 <group expand="1" string="Group By...">
-                    <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" name="group_account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
-                    <filter string="Fiscal Year" icon="terp-go-month" context="{'group_by':'fiscalyear_id'}"/>
-                    <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
+                    <filter string="Journal" name="group_journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Analytic" name="analytic_account" icon="terp-folder-orange" context="{'group_by':'analytic_account_id'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                    <separator orientation="vertical"/>
-                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'user_type'}"/>
                     <filter string="Int.Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
+                    <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Analytic" name="analytic_account" icon="terp-folder-orange" context="{'group_by':'analytic_account_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Period" icon="terp-go-month" name="group_period" context="{'group_by':'period_id'}"/>
+                    <filter string="Fiscal Year" icon="terp-go-month" context="{'group_by':'fiscalyear_id'}"/>
+                    <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                     <separator orientation="vertical"/>
                     <filter string="Day" icon="terp-go-today" context="{'group_by':'date'}"/>
@@ -88,12 +94,20 @@
                  </group>
                  <newline/>
                  <group expand="0" string="Extended options..." groups="base.group_extended">
+                    <field name="journal_id"/>
+                    <field name="fiscalyear_id"/>
+                    <field name="period_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="analytic_account_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
+                    <newline/>
                     <field name="date"/>
                     <field name="date_created"/>
                     <field name="date_maturity"/>
-                    <separator orientation="vertical"/>
-                    <field name="product_id" />
-                    <field name="partner_id" />
                  </group>
             </search>
         </field>
@@ -103,7 +117,7 @@
         <field name="res_model">account.entries.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
-        <field name="context">{'search_default_profit': 1,'search_default_group_journal':1,'search_default_group_period': 1, 'group_by_no_leaf':1,'group_by':[]}</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>
     </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

@@ -77,84 +77,83 @@ class account_invoice_report(osv.osv):
         tools.drop_view_if_exists(cr, 'account_invoice_report')
         cr.execute("""
             create or replace view account_invoice_report as (
-                 select
-                     min(l.id) as id,
-                     s.date_invoice as date,
-                     to_char(s.date_invoice, 'YYYY') as year,
-                     to_char(s.date_invoice, 'MM') as month,
-                     to_char(s.date_invoice, 'YYYY-MM-DD') as day,
-                     l.product_id as product_id,
-                     sum(case when s.type in ('out_refund','in_invoice') then
-                             l.quantity * u.factor * -1
-                         else
-                             l.quantity * u.factor
-                         end) as product_qty,
-                     s.partner_id as partner_id,
-                     s.reconciled::integer,
-                     s.payment_term as payment_term,
-                     s.period_id as period_id,
-                     u.name as uom_name,
-                     s.currency_id as currency_id,
-                     s.journal_id as journal_id,
-                     s.fiscal_position as fiscal_position,
-                     s.user_id as user_id,
-                     s.company_id as company_id,
-                     sum(case when s.type in ('out_refund','in_invoice') then
-                             l.quantity*l.price_unit * -1
-                         else
-                             l.quantity*l.price_unit
-                         end) as price_total,
-                     sum(case when s.type in ('out_refund','in_invoice') then
-                             l.quantity*l.price_unit * -1
-                         else
-                             l.quantity*l.price_unit
-                         end) / sum(l.quantity * u.factor)::decimal(16,2) as price_average,
-                     count(*) as nbr,
-                     s.type as type,
-                     s.state,
-                     pt.categ_id,
-                     s.date_due as date_due,
-                     s.address_contact_id as address_contact_id,
-                     s.address_invoice_id as address_invoice_id,
-                     s.account_id as account_id,
-                     s.partner_bank as partner_bank,
-                     sum(case when s.type in ('out_refund','in_invoice') then
-                             s.residual * -1
-                         else
-                             s.residual
-                         end) as residual,
-                     case when s.state != 'paid' then null else
-                     extract(epoch from avg(am.date_created-l.create_date))/(24*60*60)::decimal(16,2)
-                     end as delay_to_pay
-                 from account_invoice_line l
-                 left join account_invoice s on (s.id=l.invoice_id)
-                 left join product_template pt on (pt.id=l.product_id)
-                 left join product_uom u on (u.id=l.uos_id),
-                 account_move_line am left join account_invoice i on (i.move_id=am.move_id)
-                 where am.account_id=i.account_id
-                 group by
-                     s.type,
-                     s.date_invoice,
-                     s.partner_id,
-                     l.product_id,
-                     u.name,
-                     l.uos_id,
-                     s.reconciled,
-                     s.user_id,
-                     s.state,
-                     s.residual,
-                     pt.categ_id,
-                     s.company_id,
-                     s.payment_term,
-                     s.period_id,
-                     s.fiscal_position,
-                     s.currency_id,
-                     s.journal_id,
-                     s.date_due,
-                     s.address_contact_id,
-                     s.address_invoice_id,
-                     s.account_id,
-                     s.partner_bank
+                 select min(ail.id) as id,
+                    ai.date_invoice as date,
+                    to_char(ai.date_invoice, 'YYYY') as year,
+                    to_char(ai.date_invoice, 'MM') as month,
+                    to_char(ai.date_invoice, 'YYYY-MM-DD') as day,
+                    ail.product_id,
+                    ai.partner_id as partner_id,
+                    ai.reconciled::integer,
+                    ai.payment_term as payment_term,
+                    ai.period_id as period_id,
+                    u.name as uom_name,
+                    ai.currency_id as currency_id,
+                    ai.journal_id as journal_id,
+                    ai.fiscal_position as fiscal_position,
+                    ai.user_id as user_id,
+                    ai.company_id as company_id,
+                    count(ail.*) as nbr,
+                    ai.type as type,
+                    ai.state,
+                    pt.categ_id,
+                    ai.date_due as date_due,
+                    ai.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,
+                    sum(case when ai.type in ('out_refund','in_invoice') then
+                         ail.quantity * u.factor * -1
+                        else
+                         ail.quantity * u.factor
+                        end) as product_qty,
+                    sum(case when ai.type in ('out_refund','in_invoice') then
+                         ail.quantity*ail.price_unit * -1
+                        else
+                         ail.quantity*ail.price_unit
+                        end) as price_total,
+                    sum(ail.quantity*ail.price_unit)/sum(ail.quantity*u.factor)*count(ail.product_id)::decimal(16,2) as price_average,
+                    sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2)
+                        from account_move_line as aml
+                        left join account_invoice as a ON (a.move_id=aml.move_id)
+                        left join account_invoice_line as l ON (a.id=l.invoice_id)
+                        where a.id=ai.id)) as delay_to_pay,
+                    (case when ai.type in ('out_refund','in_invoice') then
+                      ai.residual * -1
+                    else
+                      ai.residual
+                    end)/(select count(l.*) from account_invoice_line as l
+                            left join account_invoice as a ON (a.id=l.invoice_id)
+                            where a.id=ai.id) as residual
+                from account_invoice_line as ail
+                left join account_invoice as ai ON (ai.id=ail.invoice_id)
+                left join product_template pt on (pt.id=ail.product_id)
+                left join product_uom u on (u.id=ail.uos_id)
+                group by ail.product_id,
+                    ai.date_invoice,
+                    ai.id,
+                    to_char(ai.date_invoice, 'YYYY'),
+                    to_char(ai.date_invoice, 'MM'),
+                    to_char(ai.date_invoice, 'YYYY-MM-DD'),
+                    ai.partner_id,
+                    ai.reconciled,
+                    ai.payment_term,
+                    ai.period_id,
+                    u.name,
+                    ai.currency_id,
+                    ai.journal_id,
+                    ai.fiscal_position,
+                    ai.user_id,
+                    ai.company_id,
+                    ai.type,
+                    ai.state,
+                    pt.categ_id,
+                    ai.date_due,
+                    ai.address_contact_id,
+                    ai.address_invoice_id,
+                    ai.account_id,
+                    ai.partner_bank,
+                    ai.residual
             )
         """)
 account_invoice_report()

addons/account/report/account_invoice_report_view.xml

@@ -28,12 +28,12 @@
                 <field name="partner_bank" invisible="1"/>
                 <field name="account_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
-                <field name="product_qty"/>
+                <field name="product_qty" sum="Qty"/>
                 <field name="reconciled"  sum="# Reconciled"/>
-                <field name="price_average" avg="Average Price"/>
+                <field name="price_average" sum="Average Price"/>
                 <field name="price_total" sum="Total Price"/>
-                <field name="residual"  sum="Total Residual"/>
-                <field name="delay_to_pay"  avg="Avg. Delay To Pay"/>
+                <field name="residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
+                <field name="delay_to_pay"  sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>
             </tree>
         </field>
     </record>
@@ -74,20 +74,17 @@
                             icon="terp-check"
                             domain="[('state','in',('draft','open'))]"
                             help = "Draft and Open Invoices"/>
-                       <filter string="Pro-forma"
-                               icon="terp-check"
-                               domain="[('state','=','proforma'),('state','=','proforma2')]"
-                               help = "Pro-forma Invoices"/>
-                       <filter string="Current"
-                            domain="[('state', '=' ,'open')]"
-                            help = "open Invoices"/>
+                    <filter string="Pro-forma"
+                           icon="terp-check"
+                           domain="[('state','=','proforma'),('state','=','proforma2')]"
+                           help = "Pro-forma Invoices"/>
                     <filter string="Done"
                             icon="terp-dialog-close"
                             domain="[('state','=','paid')]"
                             help = "Done Invoices"/>
                   <separator orientation="vertical"/>
                   <field name="partner_id"/>
-                    <field name="user_id" widget="selection">
+                    <field name="user_id" >
                     <filter icon="terp-dolar"
                             string="My Invoices"
                             help="My Invoices"
@@ -95,10 +92,10 @@
                     </field>
                 </group>
                 <newline/>
-                <group expand="0" string="Group By...">
+                <group expand="1" string="Group By...">
                     <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id'}"/>
-                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
+                    <filter string="Partner" icon="terp-personal" context="{'group_by':'partner_id','residual_visible':True}"/>
+                    <filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True,'residual_invisible':True}"/>
                     <separator orientation="vertical"/>
                     <filter string="State" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                     <filter string="Type" icon="terp-stock_symbol-selection" context="{'group_by':'type'}"/>
@@ -106,11 +103,11 @@
                     <filter string="Journal" icon="terp-folder-orange" context="{'group_by':'journal_id'}"/>
                     <filter string="Account" icon="terp-folder-orange" context="{'group_by':'account_id'}"/>
                     <separator orientation="vertical"/>
-                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
+                    <filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id','residual_invisible':True}"/>
                     <filter string="Force Period" icon="terp-go-month" context="{'group_by':'period_id'}"/>
                     <separator orientation="vertical"/>
                     <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                    <newline/>
+                    <separator orientation="vertical"/>
                     <filter string="Day" name="day" icon="terp-go-today" context="{'group_by':'day'}"/>
                     <filter string="Month" name="month" icon="terp-go-month" context="{'group_by':'month'}"/>
                     <filter string="Year" name="year" icon="terp-go-year" context="{'group_by':'year'}"/>

addons/account/report/account_journal.py

@@ -46,7 +46,6 @@ class journal_print(report_sxw.rml_parse):
                     ids_journal_period = obj_jperiod.search(self.cr, self.uid, [('journal_id','=',journal), ('period_id','=',period)])
                     if ids_journal_period:
                         self.cr.execute('update account_journal_period set state=%s where journal_id=%s and period_id=%s and state=%s', ('printed',journal,period,'draft'))
-                        self.cr.commit()
                         self.cr.execute('select id from account_move_line where period_id=%s and journal_id=%s and state<>\'draft\' order by ('+ sort_selection +'),id', (period, journal))
                         ids = map(lambda x: x[0], self.cr.fetchall())
                         ids_final.append(ids)
@@ -56,7 +55,6 @@ class journal_print(report_sxw.rml_parse):
                 line_ids.append(a)
             return line_ids
         self.cr.execute('update account_journal_period set state=%s where journal_id=%s and period_id=%s and state=%s', ('printed',journal_id,period_id,'draft'))
-        self.cr.commit()
         self.cr.execute('select id from account_move_line where period_id=%s and journal_id=%s and state<>\'draft\' order by date,id', (period_id, journal_id))
         ids = map(lambda x: x[0], self.cr.fetchall())
         return obj_mline.browse(self.cr, self.uid, ids)

addons/account/report/general_ledger.rml

@@ -26,7 +26,7 @@
 
 
 			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
+				<lines>0.88cm 27.7cm 20.12cm 27.7cm</lines>
 				<setFont name="Helvetica" size="8"/>
 				</pageGraphics>
     </pageTemplate>
@@ -35,7 +35,7 @@
 
     <blockTableStyle id="tbl_header">
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-	 
+
       <blockValign value="TOP"/>
     </blockTableStyle>
 
@@ -43,7 +43,7 @@
 
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
       <blockValign value="TOP"/>
-      
+
     </blockTableStyle>
 
 
@@ -103,9 +103,9 @@
           <td><para style="P9">Balance</para></td>
         </tr>
      </blockTable>
-      <section>    
+      <section>
      <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-     <blockTable rowHeights="0.65cm" colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+     <blockTable colWidths="66.0,124.0,70.0,40.0,80.0,59.0,52.0,54.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
 	        <blockTable colWidths="280.0,100.0,52.5,52.5,52.5" style="Table5">
@@ -137,11 +137,11 @@
 			  <td><para style="P4">[[ formatLang(line['progress']) ]]</para></td>
 	   </tr>
 	  </blockTable>
-     </section>    
-    
-    
+     </section>
 
-     <blockTable colWidths="72.0,93.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+
+
+     <blockTable colWidths="72.0,93.0,65.0,40.0,89.0,49.0,49.0,49.0,40.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="date">Date</para></td>
           <td><para style="P3">Partner</para></td>
@@ -156,10 +156,10 @@
      </blockTable>
      <section>
      <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-     <blockTable rowHeights="0.65cm" colWidths="72.0,93.0,66.0,40.0,100.0,50.0,50.0,50.0,40.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+     <blockTable colWidths="72.0,93.0,65.0,40.0,89.0,49.0,49.0,49.0,40.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
        <tr>
           <td>
-	      	<blockTable colWidths="264.00,100.0,50.0,50.0,49.0,40.00" style="Table5">
+	      	<blockTable colWidths="260.00,93.0,49.0,49.0,48.0,40.00" style="Table5">
 			<tr>
 			  <td><para style="Standard">[[ o.code or '' ]] [[ o.name or '' ]]</para></td>
 			  <td><para style="Standard"></para></td>

addons/account/report/general_ledger_landscape.rml

@@ -83,7 +83,7 @@
   </stylesheet>
   <story>
    <para>[[ repeatIn(objects, 'a') ]]</para>
-  
+
    	<blockTable colWidths="66.0,35.0,150.0, 90.0,60.0,335.0,50.0,69.0,72.0,64.0,58.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
        <tr>
           <td><para style="P12"><font color="white"> </font></para><para style="date">Date</para></td>
@@ -99,11 +99,11 @@
           <td><para style="P12"><font color="white"> </font></para><para style="P4">Currency</para></td>
        </tr>
     </blockTable>
-    
-     <section> 
-    
+
+     <section>
+
       <para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-    
+
       <blockTable rowHeights="0.65cm" colWidths="66.0,35.0,150.0, 90.0,60.0,335.0,50.0,69.0,72.0,64.0,58.0" style="tbl_content">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
       	<tr>
         	<td>
@@ -143,9 +143,9 @@
 			<td><para style="P4_content">[[ formatLang(line['amount_currency'] or 0.00)]] [[ line['currency_code'] ]]</para></td>
 		</tr>
 	  </blockTable>
-	
+
 	</section>
-     
+
     <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
        <tr>
           <td><para style="P12"><font color="white"> </font></para><para style="date">Date</para></td>
@@ -160,11 +160,11 @@
           <td><para style="P12"><font color="white"> </font></para><para style="P4">Balance</para></td>
        </tr>
 	</blockTable>
-	
+
 	<section>
-	
+
 		<para>[[ repeatIn(get_children_accounts(a,data['form']), 'o') ]]</para>
-		
+
 		<blockTable rowHeights="0.65cm" colWidths="66.0,35.0,166.0,90.0,60.0,378.0,50.0,69.0,72.0,64.0" style="tbl_content">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
         	<tr>
          		<td>
@@ -201,7 +201,7 @@
 				<td><para style="P4_content">[[ formatLang(line['progress']) ]]</para></td>
 			</tr>
 		</blockTable>
-	
+
 	</section>
  </story>
 </document>

addons/account/report/invoice.rml

@@ -127,10 +127,10 @@
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Main_Table">
+    <blockTableStyle id="Table4">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
+      <!--lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,0" stop="0,-1"/>
       <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,0" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
@@ -149,65 +149,51 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,4" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#ffffff" start="0,4" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/-->
     </blockTableStyle>
-    <blockTableStyle id="Table_Tax_Header">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Tax_Content">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Table_Border_White">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Final_Border">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Coment_Payment_Term">
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_Payment_Terms">
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="15.0" leading="19" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="0.0"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -227,25 +213,32 @@
     <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_White_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0" textColor="#ffffff"/>
     <paraStyle name="terp_default_Note" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]] </para>
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
     <blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
       <tr>
-        <td><para style="P8"><font color="white"> </font></para></td>
         <td>
-          <para style="terp_default_8">[[ o.partner_id.name ]] [[ o.partner_id.title or '' ]]</para>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_default_8">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.title or '' ]] [[ o.address_invoice_id.name ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.street2 or '' ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.zip or '' ]] [[ o.address_invoice_id.city or '' ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.state_id and o.address_invoice_id.state_id.name or '' ]]</para>
           <para style="terp_default_8">[[ o.address_invoice_id.country_id and o.address_invoice_id.country_id.name or '' ]]</para>
-          <para style="P8"><font color="white"> </font></para>
+          <para style="terp_default_8">
+            <font color="white"> </font>
+          </para>
           <para style="terp_default_8">Tel. : [[ o.address_invoice_id.phone or removeParentNode('para') ]]</para>
           <para style="terp_default_8">Fax : [[ o.address_invoice_id.fax or removeParentNode('para') ]]</para>
           <para style="terp_default_8">VAT : [[ o.partner_id.vat or removeParentNode('para') ]]</para>
@@ -255,168 +248,278 @@
     <para style="terp_header">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
     <para style="terp_header">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma2') or removeParentNode('para')) and '' ]]</para>
     <para style="terp_header">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-    <para style="terp_header">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
+    <para style="terp_header">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
     <para style="terp_header">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
     <para style="terp_header">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
     <para style="terp_header">Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
-    <para style="P8"><font color="white"> </font></para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="177.0,177.0,177.0" style="Table_Invoice_General_Header">
       <tr>
-        <td><para style="terp_tblheader_General_Centre">Document</para></td>
-        <td><para style="terp_tblheader_General_Centre">Invoice Date</para></td>
-        <td><para style="terp_tblheader_General_Centre">Partner Ref.</para></td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Document</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Invoice Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Partner Ref.</para>
+        </td>
       </tr>
     </blockTable>
     <blockTable colWidths="177.0,177.0,177.0" style="Table_General_Detail_Content">
       <tr>
-        <td><para style="terp_default_Centre_9">[[ o.name ]]</para></td>
-        <td><para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para></td>
-        <td><para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para></td>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ formatLang(o.date_invoice,date=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_9">[[ o.address_invoice_id.partner_id.ref or '' ]]</para>
+        </td>
       </tr>
     </blockTable>
-    <para style="P8"><font color="white"></font></para>
-    <para style="P8"><font color="white"> </font></para>
-    <blockTable colWidths="211.0,62.0,63.0,63.0,40.0,84.0" style="Table_Header_Invoice_Line">
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="211.0,62.0,63.0,63.0,43.0,83.0" style="Table_Header_Invoice_Line">
       <tr>
-        <td><para style="terp_tblheader_Details">Description</para></td>
-        <td><para style="terp_tblheader_Details">Taxes</para></td>
-        <td><para style="terp_tblheader_Details">Quantity</para></td>
-        <td><para style="terp_tblheader_Details_Centre">Unit Price</para></td>
-        <td><para style="terp_tblheader_Details">Disc.(%)</para></td>
-        <td><para style="terp_tblheader_Details_Centre">Price</para></td>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Taxes</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Unit Price</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Disc.(%)</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Price</para>
+        </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.invoice_line,'l') ]]</para>
-      <blockTable colWidths="211.0,62.0,36.0,27.0,63.0,36.0,62.0,26.0" style="Table_Invoice_Line_Content">
+      <blockTable colWidths="211.0,62.0,41.0,22.0,63.0,42.0,59.0,23.0" style="Table_Invoice_Line_Content">
         <tr>
-          <td><para style="terp_default_9">[[ l.name ]]</para></td>
-          <td><para style="terp_default_9">[[ ', '.join([ lt.description or '' for lt in l.invoice_line_tax_id ]) ]]</para></td>
-          <td><para style="terp_default_Right_9">[[ formatLang(l.quantity)]]</para></td>
-          <td><para style="terp_default_Right_9">[[ (l.uos_id and l.uos_id.name) or '' ]]</para></td>
-          <td><para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para></td>
-          <td><para style="terp_default_Right_9">[[ formatLang(l.discount) ]] </para></td>
-          <td><para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para></td>
-          <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
+          <td>
+            <para style="terp_default_9">[[ l.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ ', '.join([ lt.name or '' for lt in l.invoice_line_tax_id ]) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(l.quantity)]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ (l.uos_id and l.uos_id.name) or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_unit) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(l.discount) ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+          </td>
         </tr>
         <tr>
-          <td><para style="terp_default_Note">[[ format(l.note) or removeParentNode('tr') ]]</para></td>
-          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
-          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
-          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
-          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
-          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
-          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
-          <td><para style="terp_default_Note"><font color="white"> </font></para></td>
+          <td>
+            <para style="terp_default_Note">[[ format(l.note or '') or removeParentNode('tr') ]]</para>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_Note">
+              <font color="white"> </font>
+            </para>
+          </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="371.0,153.0" style="Table_Format_2">
+    <blockTable colWidths="370.0,153.0" style="Table_Format_2">
       <tr>
         <td>
           <blockTable colWidths="176.0,258.0" style="Table_format_Table_Line_total">
             <tr>
-              <td><para style="terp_default_2"><font color="white"> </font></para></td>
-              <td><para style="terp_default_2"><font color="white"> </font></para></td>
+              <td>
+                <para style="terp_default_2">
+                  <font color="white"> </font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_2">
+                  <font color="white"> </font>
+                </para>
+              </td>
             </tr>
           </blockTable>
         </td>
         <td>
-          <blockTable colWidths="62.0,59.0,25.0" style="Table_eclu_Taxes_Total">
+          <blockTable colWidths="62.0,62.0,22.0" style="Table_eclu_Taxes_Total">
             <tr>
-              <td><para style="terp_default_Bold_9">Net Total:</para></td>
-              <td><para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para></td>
-              <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
+              <td>
+                <para style="terp_default_9">Net Total:</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+              </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="63.0,58.0,26.0" style="Table_Taxes_Total">
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+          <blockTable colWidths="63.0,61.0,23.0" style="Table_Taxes_Total">
             <tr>
-              <td><para style="terp_default_Bold_9">Taxes:</para></td>
-              <td><para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para></td>
-              <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
+              <td>
+                <para style="terp_default_9">Taxes:</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+              </td>
             </tr>
           </blockTable>
-          <blockTable colWidths="63.0,58.0,26.0" style="Table_Total_Include_Taxes">
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+          <blockTable colWidths="63.0,61.0,23.0" style="Table_Total_Include_Taxes">
             <tr>
-              <td><para style="terp_default_Bold_9">Total:</para></td>
-              <td><para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para></td>
-              <td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
+              <td>
+                <para style="terp_default_Bold_9">Total:</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9">[[ o.currency_id.code ]]</para>
+              </td>
             </tr>
           </blockTable>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="530.0" style="Table_Main_Table">
+    <blockTable colWidths="530.0" style="Table4">
       <tr>
         <td>
-          <blockTable colWidths="54.0,80.0,67.0" style="Table_Tax_Header">
+          <blockTable colWidths="149.0,55.0,52.0" style="Table6">
             <tr>
-              <td><para style="terp_tblheader_Details_Centre">Tax</para></td>
-              <td><para style="terp_tblheader_Details_Right">Base</para></td>
-              <td><para style="terp_tblheader_Details_Right">Amount</para></td>
+              <td>
+                <para style="terp_tblheader_Details">Tax</para>
+              </td>
+              <td>
+                <para style="terp_tblheader_Details_Right">Base</para>
+              </td>
+              <td>
+                <para style="terp_tblheader_Details_Right">Amount</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
+          <blockTable colWidths="149.0,55.0,52.0" style="Table5">
+            <tr>
+              <td>
+                <para style="terp_default_8">[[ t.name ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount) ]]</para>
+              </td>
             </tr>
           </blockTable>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
-          <blockTable colWidths="53.0,80.0,65.0" style="Table_Tax_Content">
-            <tr>
-              <td><para style="terp_default_Centre_8">[[ t.name ]] </para></td>
-              <td><para style="terp_default_Right_8">[[ formatLang(t.base) ]]</para></td>
-              <td><para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]][[ formatLang(t.amount) ]]</para></td>
-            </tr>
-          </blockTable>
+          <para style="terp_default_2">
+            <font color="white"> </font>
+          </para>
         </td>
       </tr>
+    </blockTable>
+    <blockTable colWidths="530.0" style="Table3">
       <tr>
         <td>
-          <blockTable colWidths="53.0,60.0,65.0" style="Table_Table_Border_White">
-            <tr>
-              <td><para style="terp_default_2"><font color="white"> </font></para></td>
-              <td><para style="terp_default_2"><font color="white"> </font></para></td>
-              <td><para style="terp_default_2"><font color="white"> </font></para></td>
-            </tr>
-          </blockTable>
+          <para style="terp_default_9">[[ format(o.comment or '') or removeParentNode('blockTable') ]]</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="180.0,350.0" style="Table_Final_Border">
+    <blockTable colWidths="530.0" style="Table2">
       <tr>
-        <td><para style="terp_default_2"><font color="white"> </font></para></td>
-        <td><para style="terp_default_2"><font color="white"> </font></para></td>
+        <td>
+          <para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or '') or removeParentNode('blockTable') ]]</para>
+        </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="530.0" style="Table_Coment_Payment_Term">
-      <tr>
-        <td><para style="terp_default_9">[[ format(o.comment or removeParentNode('blockTable')) ]]</para></td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="530.0" style="Table_Payment_Terms">
-      <tr>
-        <td><para style="terp_default_9">[[ format((o.payment_term and o.payment_term.note) or removeParentNode('blockTable')) ]]</para></td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="128.0,402.0" style="Standard_Outline">
+    <blockTable colWidths="128.0,402.0" style="Table1">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Fiscal Position Remark :</para>
         </td>
         <td>
-          <para style="terp_default_9">[[ format(o.fiscal_position and o.fiscal_position.note or removeParentNode('blockTable')) ]]</para>
+          <para style="terp_default_9">[[ format((o.fiscal_position and o.fiscal_position.note) or '') or removeParentNode('blockTable') ]]</para>
         </td>
-       </tr>
-     </blockTable>
-     <para style="terp_default_2">
-       <font color="white"> </font>
-     </para>
-    
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>

addons/account/report/partner_balance.rml

@@ -107,182 +107,6 @@
     <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="Index" fontName="Helvetica"/>
 
-     <blockTableStyle id="TrLevel8">
-      <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel7">
-      <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel6">
-      <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-     </blockTableStyle>
-    <blockTableStyle id="TrLevel5">
-      <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel4">
-     <blockLeftPadding length="0" start="0,0" stop="-1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel3">
-     <lineStyle kind="LINEBELOW" colorName="#777777" start="1,0" stop="1,0"/>
-      <blockLeftPadding length="0" start="0,3" stop="1,3"/>
-    </blockTableStyle>
-    <blockTableStyle id="TrLevel2">
-      <lineStyle kind="LINEBELOW" colorName="#777777" start="1,0" stop="-1,0"/>
-      <blockLeftPadding length="0" start="0,0" stop="1,0"/>
-    </blockTableStyle>
- 	<blockTableStyle id="TrLevel1">
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-      <blockLeftPadding length="0" start="0,0" stop="1,0"/>
-    </blockTableStyle>
-
-    <blockTableStyle id="TrLevel0">
-      <lineStyle kind="LINEBELOW" colorName="#777777" start="0,2" stop="1,2"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="2,2" stop="-1,2"/>
-    </blockTableStyle>
-    <blockTableStyle id="LineLevel1">
-		<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,2" stop="-1,-1"/>
-	</blockTableStyle>
-
-	<blockTableStyle id="Line1">
-		<lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-	</blockTableStyle>
-
-	<blockTableStyle id="Line2">
-       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,1" stop="-1,1"/>
-	</blockTableStyle>
-
-    <paraStyle
-		name="Level8"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-     <paraStyle
-		name="Level7"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-     <paraStyle
-		name="Level6"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-    <paraStyle
-		name="Level5"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-    <paraStyle
-		name="Level4"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-    <paraStyle
-		name="Level3"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" />
-    <paraStyle name="Level2"
-		fontSize="8.0"
-		fontName="Helvetica-Bold"
-		/>
-	<paraStyle name="Level1"
-		fontSize="8.0"
-		fontName="Helvetica-Bold"
-		/>
-
-	<paraStyle
-		name="Amt_Level8"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle
-		name="Amt_Level7"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle
-		name="Amt_Level6"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Amt_Level5"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Amt_Level4"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Amt_Level3"
-		fontName="Helvetica-Bold"
-		fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Amt_Level2"
-		fontSize="8.0"
-		fontName="Helvetica-Bold" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
-		/>
-	<paraStyle name="Amt_Level1"
-		fontSize="8.0"
-		fontName="Helvetica-Bold" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
-		/>
-
-	<paraStyle
-		name="Det_Level8"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-     <paraStyle
-		name="Det_Level7"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-     <paraStyle
-		name="Det_Level6"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-    <paraStyle
-		name="Det_Level5"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-    <paraStyle
-		name="Det_Level4"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-    <paraStyle
-		name="Det_Level3"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5"/>
-    <paraStyle name="Det_Level2"
-		fontSize="8.0" leading="5"
-		fontName="Times-Italic"
-		/>
-	<paraStyle name="Det_Level1"
-		fontSize="8.0" leading="5"
-		fontName="Times-Italic"
-		/>
-
-	<paraStyle
-		name="Det_Amt_Level8"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle
-		name="Det_Amt_Level7"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-     <paraStyle
-		name="Det_Amt_Level6"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Det_Amt_Level5"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Det_Amt_Level4"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle
-		name="Det_Amt_Level3"
-		fontName="Times-Italic"
-		fontSize="8.0" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Det_Amt_Level2"
-		fontSize="8.0"
-		fontName="Times-Italic" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
-		/>
-	<paraStyle name="Det_Amt_Level1"
-		fontSize="8.0"
-		fontName="Times-Italic" leading="5" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"
-		/>
-
   </stylesheet>
   <story>
     <para style="P12a"></para>
@@ -305,19 +129,19 @@
       </tr>
       <tr>
         <td><para style="P7">Balance</para></td>
-        <td><para style="P8"></para></td> 
+        <td><para style="P8"></para></td>
         <td><para style="P8">[[ formatLang(solde_debit(data)) ]]</para></td>
         <td><para style="P8">[[ formatLang(solde_credit(data)) ]]</para></td>
         <td><para style="P8"></para></td>
         <td><para style="P8"></para></td>
       </tr>
       <tr>
-        <td><para style="P3">[[ repeatIn(lines(data), 'a') ]]<font>[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
-        <td><para style="P3">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ a['name'] ]]</para></td>
-        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['debit']) ]]</para></td>
-        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['credit']) ]]</para></td>
-        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['balance']) ]]</para></td>
-        <td><para style="P4">[[ a['type']==3 and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) ]][[ formatLang(a['enlitige'] or 0.00) ]]</para></td>
+        <td><para style="P3">[[ repeatIn(lines(data), 'a') ]]<font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['ref'] ]] [[ a['type']==3 and a['code'] ]]</font></para></td>
+        <td><para style="P3"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['debit']) ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['credit']) ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['balance']) ]]</para></td>
+        <td><para style="P4"><font>[[ (a['type']==3 and setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font>[[ formatLang(a['enlitige'] or 0.00) ]]</para></td>
       </tr>
     </blockTable>
   </story>

addons/account/report/rml_parse.py

@@ -41,7 +41,6 @@ class rml_parse(report_sxw.rml_parse):
         })
 
     def comma_me(self,amount):
-        #print "#" + str(amount) + "#"
         if not amount:
             amount = 0.0
         if  type(amount) is float :
@@ -98,7 +97,6 @@ class rml_parse(report_sxw.rml_parse):
             try:
                 Stringer = str.encode("utf-16")
             except UnicodeDecodeError:
-                print "UTF_16 Error"
                 Stringer = str
             else:
                 return Stringer
@@ -120,14 +118,12 @@ class rml_parse(report_sxw.rml_parse):
         UnicodeAst = []
         _previouslyfound = False
         i = 0
-        #print str(ast)
         while i < len(ast):
             elem = ast[i]
             try:
                 Stringer = elem.encode("utf-8")
             except UnicodeDecodeError:
                 to_reencode = elem + ast[i+1]
-                print str(to_reencode)
                 Good_char = to_reencode.decode('utf-8')
                 UnicodeAst.append(Good_char)
                 i += i +2
@@ -139,14 +135,11 @@ class rml_parse(report_sxw.rml_parse):
         return "".join(UnicodeAst)
 
     def ReencodeAscii(self,str):
-        print sys.stdin.encoding
         try:
             Stringer = str.decode("ascii")
         except UnicodeEncodeError:
-            print "REENCODING ERROR"
             return str.encode("ascii")
         except UnicodeDecodeError:
-            print "DECODING ERROR"
             return str.encode("ascii")
 
         else:

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

@@ -88,3 +88,6 @@
 "access_report_account_type_sales","report.account_type.sales","model_report_account_type_sales","account.group_account_manager",1,0,0,0
 "access_report_account_sales","report.account.sales","model_report_account_sales","account.group_account_manager",1,0,0,0
 "access_account_invoice_report","account.invoice.report","model_account_invoice_report","account.group_account_manager",1,0,0,0
+"access_account_account_report_manager","account.account.report","model_account_account_report","account.group_account_manager",1,0,0,0
+"access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,0,0,0
+"access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0

addons/account/wizard/account_automatic_reconcile.py

@@ -241,7 +241,6 @@ class account_automatic_reconcile(osv.osv_memory):
             'type': 'ir.actions.act_window',
             'target': 'new',
             'context': context,
-            'nodestroy':True,
         }
 
 account_automatic_reconcile()

addons/account/wizard/account_balance_report_view.xml

@@ -8,6 +8,7 @@
              <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/>
@@ -30,10 +31,12 @@
 				    </group>
 				    <newline/>
      				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+                       	<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>

addons/account/wizard/account_central_journal_view.xml

@@ -8,14 +8,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Print Central Journal">
-			    <group col="4" colspan="6">
-				    <field name="journal_id"/>
-				    <field name="period_id"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
+				<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-print"/>
+						<button name="check_data" string="Print" colspan="1" type="object" icon="gtk-ok"/>
+					</group>
 				</group>
 			</form>
             </field>

addons/account/wizard/account_change_currency.py

@@ -35,7 +35,7 @@ class account_change_currency(osv.osv_memory):
             context = {}
         state = obj_inv.browse(cr, uid, context['active_id']).state
         if obj_inv.browse(cr, uid, context['active_id']).state != 'draft':
-            raise osv.except_osv(_('Error'), _('You can not change currency for Open Invoice !'))
+            raise osv.except_osv(_('Error'), _('You can only change currency for Draft Invoice !'))
         pass
 
     def change_currency(self, cr, uid, ids, context=None):

addons/account/wizard/account_compare_account_balance_report_view.xml

@@ -31,7 +31,8 @@
 
 				    <newline/>
      				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+                       	<separator colspan="4"/>
+                       	<newline/>
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                			<button name="check" string="Print" type="object" icon="gtk-print" default_focus="1"/>
  					</group>

addons/account/wizard/account_fiscalyear_close_state.xml

@@ -7,16 +7,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Close states of Fiscal year and periods">
-                	<group colspan="4" >
-                		 <field name="fy_id"  domain = "[('state','=','draft')]"/>
-              			 <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>
-                		 <field name="sure"/>
-                    </group>
-                       	<separator string="" colspan="4" />
-                    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-close" string="Close states" name="data_save" type="object"/>
+                	<group width="380" height="180">
+	                	<group colspan="4">
+	                		 <field name="fy_id"  domain = "[('state','=','draft')]"/>
+	              			 <separator string="Are you sure you want to close the fiscal year ?" colspan="4"/>
+	                		 <field name="sure"/>
+	                    </group>
+	                       	<separator string="" colspan="4" />
+	                    <group colspan="4" col="6">
+	                       	<label string ="" colspan="2"/>
+	                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+	                    	<button icon="gtk-close" string="Close states" name="data_save" type="object"/>
+	                   </group>
                    </group>
                </form>
             </field>

addons/account/wizard/account_general_journal_view.xml

@@ -8,14 +8,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Print General Journal">
-			    <group col="4" colspan="6">
-				    <field name="journal_id"/>
-				    <field name="period_id"/>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
+				<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>

addons/account/wizard/account_general_ledger_report_view.xml

@@ -8,6 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Date-Period">
+				<group width="650" height="230">
 			    <field name="company_id" colspan="4" groups="base.group_multi_company"/>
 			    <newline/>
 			    <field name="fiscalyear"/>
@@ -39,9 +40,11 @@
     				<newline/>
     				<group colspan="4" col="6">
 	     				<separator colspan="4"/>
+	     				<newline/>
 	     				<button special="cancel" string="Cancel" icon="gtk-cancel"/>
 	               		<button name="check_report" string="Print" type="object" icon="gtk-print"/>
                		</group>
+               		</group>
 			</form>
             </field>
         </record>

addons/account/wizard/account_invoice_refund.py

@@ -61,7 +61,8 @@ class account_invoice_refund(osv.osv_memory):
             date = False
             period = False
             description = False
-            for inv in inv_obj.browse(cr, uid, context['active_ids'], context=context):
+            company = self.pool.get('res.users').browse(cr, uid, uid).company_id
+            for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
                 if inv.state in ['draft', 'proforma2', 'cancel']:
                     raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode))
                 if form['period'] :
@@ -77,11 +78,8 @@ class account_invoice_refund(osv.osv_memory):
                                             and name = 'company_id'")
                             result_query = cr.fetchone()
                             if result_query:
-                                cr.execute("""SELECT id
-                                          from account_period where date(%s)
-                                          between date_start AND  date_stop \
-                                          and company_id = %s limit 1 """,
-                                          (date, self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id,))
+                                cr.execute("""select p.id from account_fiscalyear y, account_period p where y.id=p.fiscalyear_id \
+                                    and date(%s) between p.date_start AND p.date_stop and y.company_id = %s limit 1""", (date, company.id,))
                             else:
                                 cr.execute("""SELECT id
                                         from account_period where date(%s)
@@ -154,7 +152,7 @@ class account_invoice_refund(osv.osv_memory):
                             'tax_line': tax_lines,
                             'period_id': period,
                             'name': description
-                            })
+                        })
 
                         for field in ('address_contact_id', 'address_invoice_id', 'partner_id',
                                 'account_id', 'currency_id', 'payment_term', 'journal_id'):
@@ -192,4 +190,4 @@ class account_invoice_refund(osv.osv_memory):
 
 account_invoice_refund()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_journal_select_view.xml

@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Journal Select">
-                        <label string="Are you sure you want to open Journal Entries!" colspan="4"/>
+                        <label string="Are you sure you want to open Journal Entries?" colspan="4"/>
                            <separator string="" colspan="4" />
                     <group colspan="4" col="6">
                     	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>

addons/account/wizard/account_partner_balance_report_view.xml

@@ -8,6 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
               	<form string="Select Date-Period">
+              		<group width="620" height="210">
      				<field name="company_id" groups="base.group_multi_company"/>
      				<field name="result_selection" required = "True"/>
     	 			<newline/>
@@ -30,10 +31,12 @@
      				</group>
      				<newline/>
      				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+                       	<separator colspan="4"/>
+                       	<newline/>
      					<button special="cancel" string="Cancel" icon="terp-gtk-stop"/>
                			<button name="check_state" string="Print" type="object" icon="gtk-print"/>
  					</group>
+ 					</group>
  				</form>
              </field>
  		</record>

addons/account/wizard/account_pay_invoice_view.xml

@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    	<record id="view_account_invoice_pay" model="ir.ui.view">
+        <record id="view_account_invoice_pay" model="ir.ui.view">
             <field name="name">account.invoice.pay.form</field>
             <field name="model">account.invoice.pay</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Pay invoice">
-                	<group colspan="4" >
-						<field name="amount"/>
-					    <newline/>
-					    <field name="name"/>
-					    <field name="date"/>
-					    <field name="journal_id"/>
-					    <field name="period_id"/>
-                	</group>
+                    <group colspan="4" >
+                        <field name="amount"/>
+                        <newline/>
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="journal_id" widget="selection"/>
+                        <field name="period_id" widget="selection"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Partial Payment" name="pay_and_reconcile" type="object"/>
-                    	<button icon="gtk-execute" string="Full Payment" name="wo_check" type="object"/>
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Partial Payment" name="pay_and_reconcile" type="object"/>
+                        <button icon="gtk-execute" string="Full Payment" name="wo_check" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
-		<record id="action_account_invoice_pay" model="ir.actions.act_window">
+        <record id="action_account_invoice_pay" model="ir.actions.act_window">
             <field name="name">Pay Invoice</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.invoice.pay</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="view_id" ref="view_account_invoice_pay"/>
-	        <field name="context">{'record_id' : active_id}</field>
+            <field name="context">{'record_id' : active_id}</field>
             <field name="target">new</field>
-    	</record>
+        </record>
 
 
-		<record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
+        <record id="view_account_invoice_pay_writeoff" model="ir.ui.view">
             <field name="name">account.invoice.pay.writeoff.form</field>
             <field name="model">account.invoice.pay.writeoff</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Information addendum">
-                	<group colspan="4" >
-					    <separator string="Write-Off Move" colspan="4"/>
-					    <field name="writeoff_journal_id"/>
-    					<field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-    					<field name="comment"/>
-    					<separator string="Analytic" colspan="4"/>
-    					<field name="analytic_id"/>
-                	</group>
+                    <group colspan="4" >
+                        <separator string="Write-Off Move" colspan="4"/>
+                        <field name="writeoff_journal_id"/>
+                        <field name="writeoff_acc_id" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="comment"/>
+                        <separator string="Analytic" colspan="4"/>
+                        <field name="analytic_id"/>
+                    </group>
                     <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-execute" string="Pay and reconcile" name="pay_and_reconcile_writeoff" type="object"/>
                    </group>
                </form>
             </field>
         </record>
 
 
-	</data>
+    </data>
 </openerp>

addons/account/wizard/account_print_journal_view.xml

@@ -1,6 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+<!---->
+<!--		<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>-->
+<!--            </field>-->
+<!--        </record>-->
+
 
 		<record id="view_account_print_journal" model="ir.ui.view">
             <field name="name">Account Print Journal</field>
@@ -8,21 +30,26 @@
             <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 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>
-				<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="action_account_print_journal" model="ir.actions.act_window">
             <field name="name">Account Print Journal</field>
             <field name="type">ir.actions.act_window</field>

addons/account/wizard/account_reconcile.py

@@ -23,19 +23,19 @@ import time
 from osv import fields, osv
 from tools.translate import _
 
-class account_move_line_reconcile_prompt(osv.osv_memory):
-    """
-    Asks user he wants to reconcile entries or not.
-    """
-    _name = 'account.move.line.reconcile.prompt'
-    _description = 'Account move line reconcile'
-    _columns = {
-        }
-
-    def ask_reconcilation(self, cr, uid, ids, context):
-        return self.pool.get('account.move.line.reconcile').partial_check(cr, uid, ids, context)
-
-account_move_line_reconcile_prompt()
+#class account_move_line_reconcile_prompt(osv.osv_memory):
+#    """
+#    Asks user he wants to reconcile entries or not.
+#    """
+#    _name = 'account.move.line.reconcile.prompt'
+#    _description = 'Account move line reconcile'
+#    _columns = {
+#        }
+#
+#    def ask_reconcilation(self, cr, uid, ids, context):
+#        return self.pool.get('account.move.line.reconcile').partial_check(cr, uid, ids, context)
+#
+#account_move_line_reconcile_prompt()
 
 class account_move_line_reconcile(osv.osv_memory):
     """

addons/account/wizard/account_reconcile_view.xml

@@ -2,86 +2,130 @@
 <openerp>
     <data>
 
-		<record id="view_account_move_line_reconcile_prompt" model="ir.ui.view">
-            <field name="name">account.move.line.reconcile.prompt.form</field>
-            <field name="model">account.move.line.reconcile.prompt</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Reconciliation">
-                	<separator string="Are you sure you want to reconcile entries?" colspan="4"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+<!--		<record id="view_account_move_line_reconcile_prompt" model="ir.ui.view">-->
+<!--            <field name="name">account.move.line.reconcile.prompt.form</field>-->
+<!--            <field name="model">account.move.line.reconcile.prompt</field>-->
+<!--            <field name="type">form</field>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <form string="Reconciliation">-->
+<!--                	<separator string="Are you sure you want to reconcile entries?" colspan="4"/>-->
+<!--				    <group colspan="4" col="6">-->
+<!--                       	<label string ="" colspan="2"/>-->
+<!---->
+<!--                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
+<!--                    	<button icon="gtk-ok" string="Ok" name="ask_reconcilation" type="object" default_focus="1"/>-->
+<!--                   </group>-->
+<!--               </form>-->
+<!--            </field>-->
+<!--        </record>-->
 
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Ok" name="ask_reconcilation" type="object" default_focus="1"/>
-                   </group>
-               </form>
-            </field>
-        </record>
+<!--		<record id="action_view_account_move_line_reconcile_prompt" model="ir.actions.act_window">-->
+<!--        	<field name="name">Reconcile Entries</field>-->
+<!--            <field name="res_model">account.move.line.reconcile.prompt</field>-->
+<!--            <field name="view_type">form</field>-->
+<!--            <field name="view_mode">tree,form</field>-->
+<!--           	<field name="view_id" ref="view_account_move_line_reconcile_prompt"/>-->
+<!--           	<field name="target">new</field>-->
+<!--        </record>-->
 
-		<record id="action_view_account_move_line_reconcile_prompt" model="ir.actions.act_window">
-        	<field name="name">Reconcile Entries</field>
-            <field name="res_model">account.move.line.reconcile.prompt</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           	<field name="view_id" ref="view_account_move_line_reconcile_prompt"/>
-           	<field name="target">new</field>
-        </record>
-
-        <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">
-            <field name="model_id" ref="account.model_account_move_line" />
-            <field name="object" eval="1" />
-            <field name="name">Reconcile Entries</field>
-            <field name="key2">client_action_multi</field>
-            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile_prompt'))" />
-            <field name="key">action</field>
-            <field name="model">account.move.line</field>
-		</record>
-
-    	<record id="view_account_move_line_reconcile_full" model="ir.ui.view">
+<!--        <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">-->
+<!--            <field name="model_id" ref="account.model_account_move_line" />-->
+<!--            <field name="object" eval="1" />-->
+<!--            <field name="name">Reconcile Entries</field>-->
+<!--            <field name="key2">client_action_multi</field>-->
+<!--            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile_prompt'))" />-->
+<!--            <field name="key">action</field>-->
+<!--            <field name="model">account.move.line</field>-->
+<!--		</record>-->
+		
+		<record id="view_account_move_line_reconcile_full" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.full.form</field>
             <field name="model">account.move.line.reconcile</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Reconciliation">
-                	<separator string="Reconciliation transactions" colspan="4"/>
-				    <field name="trans_nbr"/>
-				    <newline/>
-				    <field name="credit"/>
-				    <field name="debit"/>
-				    <separator string="Write-Off" colspan="4"/>
-				    <field name="writeoff"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>
-                   </group>
+                	<group height="210" width="550">
+	                	<separator string="Reconciliation transactions" colspan="4"/>
+					    <field name="trans_nbr"/>
+					    <newline/>
+					    <field name="credit"/>
+					    <field name="debit"/>
+					    <separator string="Write-Off" colspan="4"/>
+					    <field name="writeoff"/>
+					    <group colspan="4" col="6">
+	                       	<label string ="" colspan="2"/>
+	                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+	                    	<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1" attrs="{'invisible':[('writeoff','!=',0)]}"/>
+	                    	<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+	                    	<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object" attrs="{'invisible':[('writeoff','==',0)]}"/>
+	                   </group>
+	                </group>
                </form>
             </field>
         </record>
-
-		<record id="view_account_move_line_reconcile_partial" model="ir.ui.view">
-            <field name="name">account.move.line.reconcile.partial.form</field>
-            <field name="model">account.move.line.reconcile</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Reconciliation">
-                	<separator string="Reconciliation transactions" colspan="4"/>
-				    <field name="trans_nbr"/>
-				    <newline/>
-				    <field name="credit"/>
-				    <field name="debit"/>
-				    <separator string="Write-Off" colspan="4"/>
-				    <field name="writeoff"/>
-				    <group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" default_focus="1"/>
-                    	<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object"/>
-                   </group>
-               </form>
-            </field>
+		
+		<record id="action_view_account_move_line_reconcile" model="ir.actions.act_window">
+        	<field name="name">Reconcile Entries</field>
+            <field name="res_model">account.move.line.reconcile</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+           	<field name="view_id" ref="view_account_move_line_reconcile_full"/>
+           	<field name="target">new</field>
         </record>
+        
+        <record model="ir.values" id="action_account_move_line_reconcile_prompt_values">
+            <field name="model_id" ref="account.model_account_move_line" />
+            <field name="object" eval="1" />
+            <field name="name">Reconcile Entries</field>
+            <field name="key2">client_action_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' +str(ref('action_view_account_move_line_reconcile'))" />
+            <field name="key">action</field>
+            <field name="model">account.move.line</field>
+		</record>
+<!--    	<record id="view_account_move_line_reconcile_full" model="ir.ui.view">-->
+<!--            <field name="name">account.move.line.reconcile.full.form</field>-->
+<!--            <field name="model">account.move.line.reconcile</field>-->
+<!--            <field name="type">form</field>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <form string="Reconciliation">-->
+<!--                	<separator string="Reconciliation transactions" colspan="4"/>-->
+<!--				    <field name="trans_nbr"/>-->
+<!--				    <newline/>-->
+<!--				    <field name="credit"/>-->
+<!--				    <field name="debit"/>-->
+<!--				    <separator string="Write-Off" colspan="4"/>-->
+<!--				    <field name="writeoff"/>-->
+<!--				    <group colspan="4" col="6">-->
+<!--                       	<label string ="" colspan="2"/>-->
+<!--                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
+<!--                    	<button icon="terp-stock_effects-object-colorize" string="Reconcile" name="trans_rec_reconcile_full" type="object" default_focus="1"/>-->
+<!--                   </group>-->
+<!--               </form>-->
+<!--            </field>-->
+<!--        </record>-->
+<!---->
+<!--		<record id="view_account_move_line_reconcile_partial" model="ir.ui.view">-->
+<!--            <field name="name">account.move.line.reconcile.partial.form</field>-->
+<!--            <field name="model">account.move.line.reconcile</field>-->
+<!--            <field name="type">form</field>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <form string="Reconciliation">-->
+<!--                	<separator string="Reconciliation transactions" colspan="4"/>-->
+<!--				    <field name="trans_nbr"/>-->
+<!--				    <newline/>-->
+<!--				    <field name="credit"/>-->
+<!--				    <field name="debit"/>-->
+<!--				    <separator string="Write-Off" colspan="4"/>-->
+<!--				    <field name="writeoff"/>-->
+<!--				    <group colspan="4" col="6">-->
+<!--                       	<label string ="" colspan="2"/>-->
+<!--                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>-->
+<!--                    	<button icon="gtk-ok" string="Reconcile With Write-Off" name="trans_rec_addendum_writeoff" type="object" default_focus="1"/>-->
+<!--                    	<button icon="gtk-ok" string="Partial Reconcile" name="trans_rec_reconcile_partial_reconcile" type="object"/>-->
+<!--                   </group>-->
+<!--               </form>-->
+<!--            </field>-->
+<!--        </record>-->
 
 		<record id="account_move_line_reconcile_writeoff" model="ir.ui.view">
             <field name="name">account.move.line.reconcile.writeoff.form</field>

addons/account/wizard/account_statement_from_invoice.py

@@ -58,14 +58,19 @@ class account_statement_from_invoice_lines(osv.osv_memory):
             # else:
             ctx['date'] = line_date
             amount = 0.0
+            
+            if line.debit > 0:
+                amount = line.debit
+            elif line.credit > 0:
+                amount = -line.credit
+                
             if line.amount_currency:
-                amount = currency_obj.compute(cr, uid, line.currency_id.id,
+                amount = currency_obj.compute(cursor, user, line.currency_id.id,
                     statement.currency.id, line.amount_currency, context=ctx)
-            else:
-                if line.debit > 0:
-                    amount=line.debit
-                elif line.credit > 0:
-                    amount=-line.credit
+            elif (line.invoice and line.invoice.currency_id.id <> statement.currency.id):
+                amount = currency_obj.compute(cursor, user, line.invoice.currency_id.id,
+                    statement.currency.id, amount, context=ctx)
+            
             reconcile_id = statement_reconcile_obj.create(cr, uid, {
                 'line_ids': [(6, 0, [line.id])]
                 }, context=context)

addons/account/wizard/account_third_party_ledger.xml

@@ -8,6 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Select Date-Period">
+					<group width="650" height="230">
 				    <field name="company_id" groups="base.group_multi_company"/>
 				    <field name="result_selection"/>
 				    <newline/>
@@ -33,10 +34,12 @@
 				        </group>
 				    </group>
      				<group colspan="4" col="6">
-                       	<label string ="" colspan="2"/>
+                       	<separator colspan="2"/>
+                       	<newline/>
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                			<button name="check_state" string="Print" type="object" icon="gtk-print"/>
  					</group>
+ 					</group>
  				</form>
              </field>
  		</record>

addons/account/wizard/account_vat_view.xml

@@ -8,14 +8,19 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 			<form string="Select Period">
+				<group width="650" height="230">
 				    <field name="company_id" groups="base.group_multi_company"/>
 					<newline/>
 				    <field name="based_on"/>
 				    <newline/>
-				    <field name="periods"/>
-			    <group col="2" colspan="4">
+				    <separator string="Periods" colspan="4"/>
+				    <field name="periods" nolabel="1"/>
+			    	<group>
+			    		<separator colspan="4"/>
+			    		<newline/>
 	            		<button icon='gtk-cancel' special="cancel"  string="Cancel" />
 						<button name="create_vat" string="Print VAT Decl." colspan="1" type="object" icon="gtk-ok"/>
+					</group>
 				</group>
 			</form>
             </field>

addons/account_analytic_analysis/__openerp__.py

@@ -21,32 +21,30 @@
 
 
 {
-    'name': 'report_account_analytic',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
+    'name'      : 'report_account_analytic',
+    'version'   : '1.1',
+    'category'  : 'Generic Modules/Accounting',
     'description': """
-    This module is for modifying account analytic view to show
-    important data to project manager of services companies.
-    Adds menu to show relevant information to each manager..
+This module is for modifying account analytic view to show
+important data to project manager of services companies.
+Adds menu to show relevant information to each manager..
 
-    You can also view the report of account analytic summary
-    user-wise as well as month wise.
+You can also view the report of account analytic summary
+user-wise as well as month wise.
 """,
-    "version" : "1.1",
-    "author" : "Camptocamp",
-    "category" : "Generic Modules/Accounting",
-    "module": "",
-    "website": "http://www.camptocamp.com/",
-    "depends" : ["account","hr_timesheet","hr_timesheet_invoice","project"],
-    "init_xml" : [],
-    "update_xml" : [
-        "security/ir.model.access.csv",
-        "account_analytic_analysis_view.xml",
-        "account_analytic_analysis_menu.xml",
-    ],
-    'demo_xml': [],
+    "author"    : "Camptocamp",
+    "website"   : "http://www.camptocamp.com/",
+    "depends"   : ["hr_timesheet_invoice"],
+    "init_xml"  : [],
+    "update_xml": [
+                    "security/ir.model.access.csv",
+                    "account_analytic_analysis_view.xml",
+                    "account_analytic_analysis_menu.xml",
+                    ],
+    'demo_xml'  : [],
     'installable': True,
-    'active': False,
+    'active'    : False,
     'certificate': '0042927202589',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_analysis/account_analytic_analysis.py

@@ -19,18 +19,16 @@
 #
 ##############################################################################
 
-import operator
 from osv import osv, fields
 from osv.orm import intersect
 import tools.sql
 from tools.translate import _
 
-
 class account_analytic_account(osv.osv):
     _name = "account.analytic.account"
     _inherit = "account.analytic.account"
 
-    def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context={}):
+    def _ca_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -46,7 +44,7 @@ class account_analytic_account(osv.osv):
                 
         return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
 
-    def _ca_to_invoice_calc(self, cr, uid, ids, name, arg, context={}):
+    def _ca_to_invoice_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         res2 = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
@@ -92,7 +90,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
         return res
 
-    def _hours_qtt_non_invoiced_calc (self, cr, uid, ids, name, arg, context={}):
+    def _hours_qtt_non_invoiced_calc (self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -117,7 +115,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _hours_quantity_calc(self, cr, uid, ids, name, arg, context={}):
+    def _hours_quantity_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -141,7 +139,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _total_cost_calc(self, cr, uid, ids, name, arg, context={}):
+    def _total_cost_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -158,7 +156,7 @@ class account_analytic_account(osv.osv):
         return self._compute_currency_for_level_tree(cr, uid, ids, parent_ids, res, context)
  
     # TODO Take care of pricelist and purchase !
-    def _ca_theorical_calc(self, cr, uid, ids, name, arg, context={}):
+    def _ca_theorical_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         res2 = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
@@ -202,7 +200,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2) + round(res2.get(id, 0.0),2)
         return res
 
-    def _last_worked_date_calc (self, cr, uid, ids, name, arg, context={}):
+    def _last_worked_date_calc (self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -223,7 +221,7 @@ class account_analytic_account(osv.osv):
             res[id] = res.get(id, '')
         return res
 
-    def _last_invoice_date_calc (self, cr, uid, ids, name, arg, context={}):
+    def _last_invoice_date_calc (self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -247,7 +245,7 @@ class account_analytic_account(osv.osv):
             res[id] = res.get(id, '')
         return res
 
-    def _last_worked_invoiced_date_calc (self, cr, uid, ids, name, arg, context={}):
+    def _last_worked_invoiced_date_calc (self, cr, uid, ids, name, arg, context=None):
         res = {}
         parent_ids = tuple(self.search(cr, uid, [('parent_id', 'child_of', ids)]))
         if parent_ids:
@@ -268,7 +266,7 @@ class account_analytic_account(osv.osv):
             res[id] = res.get(id, '')
         return res
 
-    def _remaining_hours_calc(self, cr, uid, ids, name, arg, context={}):
+    def _remaining_hours_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             if account.quantity_max != 0:
@@ -279,7 +277,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context={}):
+    def _hours_qtt_invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             res[account.id] = account.hours_quantity - account.hours_qtt_non_invoiced
@@ -289,7 +287,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _revenue_per_hour_calc(self, cr, uid, ids, name, arg, context={}):
+    def _revenue_per_hour_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             if account.hours_qtt_invoiced == 0:
@@ -300,7 +298,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _real_margin_rate_calc(self, cr, uid, ids, name, arg, context={}):
+    def _real_margin_rate_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             if account.ca_invoiced == 0:
@@ -313,7 +311,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _remaining_ca_calc(self, cr, uid, ids, name, arg, context={}):
+    def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             if account.amount_max != 0:
@@ -324,7 +322,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _real_margin_calc(self, cr, uid, ids, name, arg, context={}):
+    def _real_margin_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             res[account.id] = account.ca_invoiced + account.total_cost
@@ -332,7 +330,7 @@ class account_analytic_account(osv.osv):
             res[id] = round(res.get(id, 0.0),2)
         return res
 
-    def _theorical_margin_calc(self, cr, uid, ids, name, arg, context={}):
+    def _theorical_margin_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
         for account in self.browse(cr, uid, ids):
             res[account.id] = account.ca_theorical + account.total_cost
@@ -386,6 +384,7 @@ class account_analytic_account(osv.osv):
         'month_ids': fields.function(_month, method=True, type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
         'user_ids': fields.function(_user, method=True, type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
     }
+    
 account_analytic_account()
 
 class account_analytic_account_summary_user(osv.osv):
@@ -426,6 +425,7 @@ class account_analytic_account_summary_user(osv.osv):
             string='Total Time'),
         'user' : fields.many2one('res.users', 'User'),
     }
+    
     def init(self, cr):
         tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user')
         cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \
@@ -508,11 +508,11 @@ class account_analytic_account_summary_user(osv.osv):
                 res.extend(cr.dictfetchall())
         else:
             res = map(lambda x: {'id': x}, ids)
-
+        res_trans_obj = self.pool.get('ir.translation')
         for f in fields_pre:
             if self._columns[f].translate:
                 ids = map(lambda x: x['id'], res)
-                res_trans = self.pool.get('ir.translation')._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids)
+                res_trans = res_trans_obj._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids)
                 for r in res:
                     r[f] = res_trans.get(r['id'], False) or r[f]
 
@@ -684,11 +684,12 @@ class account_analytic_account_summary_month(osv.osv):
                 res.extend(cr.dictfetchall())
         else:
             res = map(lambda x: {'id': x}, ids)
-
+            
+        res_trans_obj = self.pool.get('ir.translation')
         for f in fields_pre:
             if self._columns[f].translate:
                 ids = map(lambda x: x['id'], res)
-                res_trans = self.pool.get('ir.translation')._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids)
+                res_trans = res_trans_obj._get_ids(cr, user, self._name+','+f, 'model', context.get('lang', False) or 'en_US', ids)
                 for r in res:
                     r[f] = res_trans.get(r['id'], False) or r[f]
 
@@ -731,6 +732,5 @@ class account_analytic_account_summary_month(osv.osv):
 
 account_analytic_account_summary_month()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/account_analytic_analysis/account_analytic_analysis_menu.xml

@@ -1,7 +1,6 @@
 <openerp>
     <data>
         <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-<!--        <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>-->
         <menuitem id="menu_invoicing" name="Billing" parent="base.menu_main_pm" sequence="4"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
@@ -14,17 +13,6 @@
         </record>
         <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="menu_invoicing"/>
 
-        <record id="action_account_analytic_all" model="ir.actions.act_window">
-            <field name="name">All Analytic Accounts</field>
-            <field name="res_model">account.analytic.account</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-            <field name="view_id" ref="account.view_account_analytic_account_list"/>
-            <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
-            <field name="domain">[]</field>
-        </record>
-<!--        <menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>-->
-
         <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window">
             <field name="name">Overpassed Accounts</field>
             <field name="res_model">account.analytic.account</field>

addons/account_analytic_analysis/account_analytic_analysis_view.xml

@@ -24,7 +24,6 @@
                         <field name="ca_invoiced"/>
                         <field name="ca_theorical"/>
                         <newline/>
-                        <!-- <field name="old"/> -->
                         <field name="hours_quantity"/>
                         <field name="hours_qtt_invoiced"/>
                         <field name="remaining_hours"/>
@@ -38,13 +37,12 @@
                         <separator colspan="4" string="Key dates"/>
 
                         <field name="last_invoice_date"/>
-
                         <field name="last_worked_invoiced_date"/>
                         <field name="last_worked_date"/>
                         <separator colspan="4" string="To be invoiced"/>
+                        
                         <field name="hours_qtt_non_invoiced"/>
                         <field name="ca_to_invoice"/>
-
                     </page>
                     <page string="Stats by month">
                         <field colspan="4" name="month_ids" nolabel="1">
@@ -81,20 +79,18 @@
                 </field>
             </field>
         </record>
+        
         <record id="view_account_analytic_account_tree_c2c_3" model="ir.ui.view"> 
             <field name="name">account.analytic.account.tree</field> 
             <field name="model">account.analytic.account</field> 
             <field name="inherit_id" ref="account.view_account_analytic_account_list"/>
-
             <field name="type">tree</field> 
             <field name="arch" type="xml"> 
                 <field name="date" position="before"> 
                     <field name="last_invoice_date"/>
                     <field name="ca_to_invoice"/>
                 </field>
-
             </field>
-
         </record>
 
         <record id="view_account_analytic_simplified" model="ir.ui.view">
@@ -110,7 +106,6 @@
                     <field name="remaining_hours"/>
                     <field name="ca_to_invoice"/>
                     <field name="last_invoice_date"/>
-
                 </tree>
             </field>
         </record>

addons/account_analytic_analysis/i18n/nb.po

@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 06:50+0000\n"
-"Last-Translator: Tor Syversen <sol-moe@online.no>\n"
+"PO-Revision-Date: 2010-07-03 18:41+0000\n"
+"Last-Translator: Mathias Bøhn Grytemark <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n"
+"X-Launchpad-Export-Date: 2010-07-07 03:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -32,7 +32,7 @@ msgstr "Timer, summert pr. bruker"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
 msgid "Last Invoice Date"
-msgstr ""
+msgstr "Forrige fakturadato"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -58,7 +58,7 @@ msgstr "Mine nåværende konti"
 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Ugyldig XML for visningsarkitektur!"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
@@ -84,7 +84,7 @@ msgstr ""
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
-msgstr ""
+msgstr "Objektets navn må starte med x_ og ikke inneholde spesialkarakterer!"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
@@ -123,7 +123,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -145,7 +145,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Gjenværende timer"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -159,7 +159,7 @@ msgstr ""
 #: field:account.analytic.account,user_ids:0
 #: field:account_analytic_analysis.summary.user,user:0
 msgid "User"
-msgstr ""
+msgstr "Bruker"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
@@ -182,7 +182,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
 msgid "My Accounts"
-msgstr ""
+msgstr "Mine kontoer"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -195,7 +195,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
-msgstr ""
+msgstr "Ufakturerte timer"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0

addons/account_analytic_analysis/i18n/ru.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-18 15:21+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-07-10 11:40+0000\n"
+"Last-Translator: Pomazan Bogdan <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-11 03:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -22,6 +22,8 @@ msgid ""
 "Number of hours that can be invoiced plus those that already have been "
 "invoiced."
 msgstr ""
+"Количество часов, которое может быть выставлено в счете, а также те, которые "
+"уже были выставлены к оплате."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -31,17 +33,20 @@ 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
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
+"Вычислено, с использованием формулы: Максимальная цена по Счету - Итоговая "
+"сумма по выставленным счета."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 msgstr ""
+"Вычисленное используя формулу: Максимальное Количество - Всего Часов."
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all
@@ -52,7 +57,7 @@ msgstr "Все счета аналитики"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
 msgid "My Current Accounts"
-msgstr ""
+msgstr "Мои текущие счета"
 
 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
@@ -62,12 +67,12 @@ msgstr "Неправильный XML для просмотра архитект
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr ""
+msgstr "Дата последнего счета, созданного для этого аналитического счета."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theorical Revenue"
-msgstr ""
+msgstr "Теоретический доход"
 
 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
@@ -77,7 +82,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr ""
+msgstr "Вычисленное используя формулу: Доход теоретический - Общая Стоимость"
 
 #. module: account_analytic_analysis
 #: constraint:ir.model:0
@@ -96,23 +101,23 @@ msgstr "Новый счет аналитики"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theorical Margin"
-msgstr ""
+msgstr "Теоретическая маржа"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
+msgstr "Реальный размер маржи (%)"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
 msgid "Current Analytic Accounts"
-msgstr ""
+msgstr "Текущие счета аналитики"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr ""
+msgstr "Дата последней работы сделанной на этом счете."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -120,21 +125,23 @@ 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
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Выставление счетов"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr ""
+msgstr "Дата Последней Стоимости / Работы"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
 msgid "Total Costs"
-msgstr ""
+msgstr "Общая Стоимость"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
@@ -142,11 +149,13 @@ 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
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Hours"
-msgstr ""
+msgstr "Оставшиеся часы"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -166,7 +175,7 @@ msgstr "Пользователь"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending
 msgid "My Pending Accounts"
-msgstr ""
+msgstr "Мои Незаконченные Отчеты"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my
@@ -177,13 +186,13 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr ""
+msgstr "Вычисленно используя формулу: Общая сумма по счету - Общая Стоимость"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed
 msgid "My Accounts"
-msgstr ""
+msgstr "Мои аккаунты"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,description:account_analytic_analysis.module_meta_information
@@ -196,12 +205,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Hours"
-msgstr ""
+msgstr "Не выставлено Часов"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Hours Tot"
-msgstr ""
+msgstr "Часов всего"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_account
@@ -216,43 +225,43 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "Сумма к оплате"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.next_id_71
 msgid "Financial Project Management"
-msgstr ""
+msgstr "Финансовое Управление Проектом"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr ""
+msgstr "Дата последнего счета расходов"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr ""
+msgstr "Сумма не выставлена"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
 msgid "Pending Analytic Accounts"
-msgstr "Счета аналитики в ожидании"
+msgstr "Незаконченные Аналитические Отчеты"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Hours"
-msgstr ""
+msgstr "Выставленные часы"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
 msgid "Real Margin"
-msgstr ""
+msgstr "Реальная маржа"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr ""
+msgstr "Итого сумма к оплате заказчику для этого счета."
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
@@ -263,6 +272,7 @@ msgstr "Итоги в часах по месяцам"
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgstr ""
+"Вычислить, используя формулу: (Реальная Маржа / общий объем расходов) * 100."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -270,6 +280,8 @@ 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
 #: view:account.analytic.account:0
@@ -279,7 +291,7 @@ msgstr "Счета аналитики"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "Оставшийся доход"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -287,6 +299,8 @@ 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
 #: help:account.analytic.account,revenue_per_hour:0
@@ -296,7 +310,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Hours (real)"
-msgstr ""
+msgstr "Доход за Часы (реальные)"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,unit_amount:0
@@ -326,7 +340,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "All Uninvoiced Entries"
-msgstr ""
+msgstr "Все не выставленные записи"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -334,3 +348,5 @@ 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-04-10 04:39+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-07-13 03:49+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-13 03:49+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,12 +31,12 @@ 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
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr "计算公式为:最高发票价格 -  发票金额"
+msgstr "计算公式为:最高发票价格 -  已开票金额"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
@@ -44,25 +44,26 @@ 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 "所有辅助核算项目"
+msgstr "所有辅助核算项"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open
 msgid "My Current Accounts"
-msgstr "我的当前科目"
+msgstr "我的当前项"
 
 #. module: account_analytic_analysis
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "描述视图结构的XML文件无效"
+msgstr "无效XML视图结构!"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "Date of the last invoice created for this analytic account."
-msgstr "这辅助核算项目的最近开票日期"
+msgstr "这辅助核算项的最近开票日期"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -83,13 +84,13 @@ msgstr "计算公式：理论收入 - 总费用"
 #: 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_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_new
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_new
 msgid "New Analytic Account"
-msgstr "新的分析科目"
+msgstr "新辅助核算项"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -105,29 +106,29 @@ msgstr "实际利润(%)"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open
 msgid "Current Analytic Accounts"
-msgstr "当前分析科目"
+msgstr "当前辅助核算项"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr "这科目的最近的工作完成日期"
+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."
-msgstr "如果是成本发票,最近工作或成本的时间已开出的发票"
+msgstr "如果发票来自费用, 这是最近工作日期或已开票的费用"
 
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing
 msgid "Invoicing"
-msgstr "计价折扣"
+msgstr "开发票"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr "最近的成本/工作 日期"
+msgstr "费用或工作的最近日期"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -139,7 +140,7 @@ msgstr "总成本"
 msgid ""
 "Number of hours you spent on the analytic account (from timesheet). It "
 "computes on all journal of type 'general'."
-msgstr "你的小时数在辅助核算项目(根据时间表).它计算所有普通分类帐."
+msgstr "在辅助核算项你花费的小时数(根据时间表). 它在所有类型为普通的记录集合里计算."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
@@ -190,8 +191,8 @@ msgid ""
 "important data for project manager of services companies.\n"
 "Add menu to show relevant information for each manager."
 msgstr ""
-"修改核算到显示服务公司的项目管理主要时间\n"
-"添加菜单显示每个管理的有关信息"
+"修改辅助核算项到显示视图, 服务公司项目经理的重要数据\n"
+"添加菜单显示每个管理者的相关信息"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
@@ -206,12 +207,12 @@ msgstr "总小时"
 #. module: account_analytic_analysis
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_account
 msgid "Analytic Accounts"
-msgstr "核算项目"
+msgstr "辅助核算项"
 
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
-msgstr "核算项目报表"
+msgstr "辅助核算项报表"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -226,7 +227,7 @@ msgstr "财务项目管理"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr "最近的发票成本日期"
+msgstr "最近的已发票日期"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@@ -237,7 +238,7 @@ msgstr "未开票金额"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending
 msgid "Pending Analytic Accounts"
-msgstr "未决的辅助核算项目"
+msgstr "未决的辅助核算项"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0

addons/account_analytic_default/__init__.py

@@ -20,4 +20,5 @@
 ##############################################################################
 
 import account_analytic_default
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_default/__openerp__.py

@@ -19,11 +19,10 @@
 #
 ##############################################################################
 
-
 {
-    'name': 'Account Analytic Default',
-    'version': '1.0',
-    'category': 'Generic Modules/Accounting',
+    'name'      : 'Account Analytic Default',
+    'version'   : '1.0',
+    'category'  : 'Generic Modules/Accounting',
     'description': """
 Allows to automatically select analytic accounts based on criterions:
 * Product
@@ -32,14 +31,15 @@ Allows to automatically select analytic accounts based on criterions:
 * Company
 * Date
     """,
-    'author': 'Tiny',
-    'website': 'http://www.openerp.com',
-    'depends': ['account', 'sale'],
-    'init_xml': [],
+    'author'    : 'Tiny',
+    'website'   : 'http://www.openerp.com',
+    'depends'   : ['sale'],
+    'init_xml'  : [],
     'update_xml': ['security/ir.model.access.csv', 'account_analytic_default_view.xml'],
-    'demo_xml': [],
+    'demo_xml'  : [],
     'installable': True,
     'active': False,
     'certificate': '0074229833581',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_default/account_analytic_default.py

@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-from osv import orm
 import time
 
+from osv import fields,osv
+
 class account_analytic_default(osv.osv):
     _name = 'account.analytic.default'
     _description = 'Analytic Distribution'
@@ -38,7 +38,8 @@ class account_analytic_default(osv.osv):
         'date_start': fields.date('Start Date'),
         'date_stop': fields.date('End Date'),
     }
-    def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context={}):
+    
+    def account_get(self, cr, uid, product_id=None, partner_id=None, user_id=None, date=None, context=None):
         domain = []
         if product_id:
             domain += ['|',('product_id','=',product_id)]
@@ -65,20 +66,22 @@ class account_analytic_default(osv.osv):
                 res = rec
                 best_index = index
         return res
+    
 account_analytic_default()
 
 class account_invoice_line(osv.osv):
     _inherit = 'account.invoice.line'
     _description = 'Invoice Line'
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}):
-        res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition, price_unit, address_invoice_id, currency_id=currency_id, context=context)
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fiscal_position=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
+        res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fiscal_position, price_unit, address_invoice_id, currency_id=currency_id, context=context)
         rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
         if rec:
             res_prod['value'].update({'account_analytic_id':rec.analytic_id.id})
         else:
             res_prod['value'].update({'account_analytic_id':False})
         return res_prod
+    
 account_invoice_line()
 
 
@@ -101,22 +104,20 @@ class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
 
     # Method overridden to set the analytic account by default on criterion match
-    def invoice_line_create(self, cr, uid, ids, context={}):
+    def invoice_line_create(self, cr, uid, ids, context=None):
         create_ids = super(sale_order_line,self).invoice_line_create(cr, uid, ids, context)
         if not ids:
             return create_ids
-        sale_line_obj = self.browse(cr, uid, ids[0], context)
-        pool_inv_line = self.pool.get('account.invoice.line')
-
-        for line in pool_inv_line.browse(cr, uid, create_ids, context):
-            rec = self.pool.get('account.analytic.default').account_get(cr, uid, line.product_id.id, sale_line_obj.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
+        sale_line = self.browse(cr, uid, ids[0], context)
+        inv_line_obj = self.pool.get('account.invoice.line')
+        anal_def_obj = self.pool.get('account.analytic.default')
+        for line in inv_line_obj.browse(cr, uid, create_ids, context):
+            rec = anal_def_obj.account_get(cr, uid, line.product_id.id, sale_line.order_id.partner_id.id, uid, time.strftime('%Y-%m-%d'), context)
 
             if rec:
-                pool_inv_line.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context)
+                inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id':rec.analytic_id.id}, context=context)
         return create_ids
 
 sale_order_line()
 
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_analytic_default/account_analytic_default_view.xml

@@ -6,7 +6,7 @@
             <field name="model">account.analytic.default</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Analytic Defaults" editable="bottom">
+                <tree string="Analytic Defaults">
                     <field name="sequence"/>
                     <field name="analytic_id" required="1"/>
                     <field name="product_id"/>
@@ -18,17 +18,18 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_account_analytic_default_form" model="ir.ui.view">
             <field name="name">account.analytic.default.form</field>
             <field name="model">account.analytic.default</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Analytic Defaults">
-                    <field name="analytic_id" select="1" required="1"/>
+                    <field name="analytic_id" required="1"/>
                     <field name="sequence"/>
                     <separator string="Conditions" colspan="4"/>
-                    <field name="product_id" select="1"/>
-                    <field name="partner_id" select="1"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     <field name="date_start"/>
@@ -36,19 +37,37 @@
                 </form>
             </field>
         </record>
+
+        <record id="view_account_analytic_default_form_search" model="ir.ui.view">
+            <field name="name">account.analytic.default.search</field>
+            <field name="model">account.analytic.default</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Accounts">
+                    <field name="analytic_id"/>
+                    <field name="product_id"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <field name="company_id"/>
+                </search>
+            </field>
+        </record>
+        
         <record id="action_analytic_default_form" model="ir.actions.act_window">
             <field name="name">Analytic Defaults</field>
             <field name="res_model">account.analytic.default</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_account_analytic_default_form_search"/>
         </record>
-<!--        <menuitem-->
-<!--            action="action_analytic_default_form"-->
-<!--            id="menu_analytic_defaul_form"-->
-<!--            parent="account.menu_analytic_accounting"/>-->
 
         <act_window
-            domain="[('account_id', '=', active_id)]" id="act_account_acount_move_line_open" name="Entries" res_model="account.move.line" src_model="account.account"/>
+            name="Entries"
+            id="act_account_acount_move_line_open"
+            res_model="account.move.line"
+            src_model="account.account"
+            domain="[('account_id', '=', active_id)]"/>
+
         <act_window
             name="Analytic Rules"
             id="analytic_rule_action_partner"
@@ -56,12 +75,14 @@
             src_model="res.partner"
             domain="[('partner_id','=',active_id)]"
             groups="base.group_extended"/>
+
         <act_window
             name="Analytic Rules"
             id="analytic_rule_action_user"
             res_model="account.analytic.default"
             src_model="res.users"
             domain="[('user_id','=',active_id)]"/>
+
         <act_window
             name="Analytic Rules"
             res_model="account.analytic.default"

addons/account_analytic_default/i18n/ru.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-02-25 08:30+0000\n"
-"Last-Translator: Nikolay Chesnokov <chesnokov_n@msn.com>\n"
+"PO-Revision-Date: 2010-07-08 17:05+0000\n"
+"Last-Translator: Pomazan Bogdan <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:12+0000\n"
+"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -38,8 +38,8 @@ msgstr "Некорректный формат XML для структуры ви
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Название объекта должно начинаться с x_  и не должно содержать специальных "
-"символов !"
+"Имя Объекта должно начинаться с x_ и не должно содержать специальных "
+"символов!"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -64,7 +64,7 @@ msgstr "Последовательность"
 #. module: account_analytic_default
 #: field:account.analytic.default,product_id:0
 msgid "Product"
-msgstr "Продукция"
+msgstr "Продукт"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,analytic_id:0