[MERGE] merged the dev3 branch

bzr revid: qdp-launchpad@tinyerp.com-20110114001101-wk77opsrvslh7pak

addons/account/account.py

@@ -419,8 +419,18 @@ class account_account(osv.osv):
             ids = child_ids
         return True
 
+    def _check_type(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        accounts = self.browse(cr, uid, ids, context=context)
+        for account in accounts:
+            if account.child_id and account.type != 'view':
+                return False
+        return True
+
     _constraints = [
-        (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
+        (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id']),
+        (_check_type, 'Configuration Error! \nYou cannot define children to an account with internal type different of "View"! ', ['type']),
     ]
     _sql_constraints = [
         ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
@@ -965,7 +975,7 @@ class account_journal_period(osv.osv):
         'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
                                   help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
         'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
-        'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company')
+        'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
 
     def _check(self, cr, uid, ids, context=None):
@@ -1118,14 +1128,14 @@ class account_move(osv.osv):
         'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount),
         'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}),
         'narration':fields.text('Narration'),
-        'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
+        'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
     }
     _defaults = {
         'name': '/',
         'state': 'draft',
         'period_id': _get_period,
         'date': lambda *a: time.strftime('%Y-%m-%d'),
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
+        'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
 
     def _check_centralisation(self, cursor, user, ids, context=None):
@@ -1612,7 +1622,6 @@ class account_tax_code(osv.osv):
         ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context)
 
-
     def name_get(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -1647,6 +1656,7 @@ class account_tax_code(osv.osv):
         (_check_recursion, 'Error ! You can not create recursive accounts.', ['parent_id'])
     ]
     _order = 'code'
+
 account_tax_code()
 
 class account_tax(osv.osv):
@@ -2295,11 +2305,21 @@ class account_account_template(osv.osv):
         'nocreate': False,
     }
 
+    def _check_type(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        accounts = self.browse(cr, uid, ids, context=context)
+        for account in accounts:
+            if account.parent_id and account.parent_id.type != 'view':
+                return False
+        return True
+
     _check_recursion = check_cycle
     _constraints = [
-        (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id'])
+        (_check_recursion, 'Error ! You can not create recursive account templates.', ['parent_id']),
-    ]
+        (_check_type, 'Configuration Error! \nYou cannot define children to an account with internal type different of "View"! ', ['type']),
 
+    ]
 
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
@@ -3007,4 +3027,4 @@ class account_bank_accounts_wizard(osv.osv_memory):
 
 account_bank_accounts_wizard()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account_analytic_line.py

@@ -51,7 +51,6 @@ class account_analytic_line(osv.osv):
             context = {}
         if context.get('from_date',False):
             args.append(['date', '>=', context['from_date']])
-
         if context.get('to_date',False):
             args.append(['date','<=', context['to_date']])
         return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
@@ -125,7 +124,6 @@ class account_analytic_line(osv.osv):
         result = round(amount, prec)
         if not flag:
             result *= -1
-
         return {'value': {
             'amount': result,
             'general_account_id': a,

addons/account/account_bank_statement.py

@@ -405,6 +405,27 @@ account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
 
+    def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
+        obj_partner = self.pool.get('res.partner')
+        if context is None:
+            context = {}
+        if not partner_id:
+            return {}
+        part = obj_partner.browse(cr, uid, partner_id, context=context)
+        if not part.supplier and not part.customer:
+            type = 'general'
+        elif part.supplier and part.customer:
+            type = 'general'
+        else:
+            if part.supplier == True:
+                type = 'supplier'
+            if part.customer == True:
+                type = 'customer'
+        res_type = self.onchange_type(cr, uid, ids, partner_id=partner_id, type=type, context=context)
+        if res_type['value'] and res_type['value'].get('account_id', False):
+            return {'value': {'type': type, 'account_id': res_type['value']['account_id']}}
+        return {'value': {'type': type}}
+
     def onchange_type(self, cr, uid, line_id, partner_id, type, context=None):
         res = {'value': {}}
         obj_partner = self.pool.get('res.partner')

addons/account/account_installer.xml

@@ -28,7 +28,7 @@
                         <field name="charts"/>
                             <group colspan="4" groups="base.group_extended">
                                 <separator col="4" colspan="4" string="Configure Fiscal Year"/>
-                                <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> 
+                                <field name="company_id" colspan="4" widget="selection"/><!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                                 <field name="date_stop"/>
                                 <field name="period" colspan="4"/>

addons/account/account_invoice_view.xml

@@ -434,7 +434,6 @@
             <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="view_account_invoice_filter"/>
             <field name="help">With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers.</field>
-            <field name="groups_id" eval="[(6,0,[ref('account.group_account_manager'),ref('account.group_account_user')])]"/>
         </record>
 
 

addons/account/account_move_line.py

@@ -101,14 +101,13 @@ class account_move_line(osv.osv):
             query += ' AND '+obj+'.account_id IN (%s)' % ','.join(map(str, child_ids))
 
         query += company_clause
-
         return query
 
     def _amount_residual(self, cr, uid, ids, field_names, args, context=None):
         """
-           This function returns the residual amount on a receivable or payable account.move.line. 
+           This function returns the residual amount on a receivable or payable account.move.line.
-           By default, it returns an amount in the currency of this journal entry (maybe different 
+           By default, it returns an amount in the currency of this journal entry (maybe different
-           of the company currency), but if you pass 'residual_in_company_currency' = True in the 
+           of the company currency), but if you pass 'residual_in_company_currency' = True in the
            context then the returned amount will be in company currency.
         """
         res = {}
@@ -120,13 +119,13 @@ class account_move_line(osv.osv):
                 'amount_residual': 0.0,
                 'amount_residual_currency': 0.0,
             }
- 
+
             if move_line.reconcile_id:
                 continue
             if not move_line.account_id.type in ('payable', 'receivable'):
                 #this function does not suport to be used on move lines not related to payable or receivable accounts
                 continue
-            
+
             if move_line.currency_id:
                 move_line_total = move_line.amount_currency
                 sign = move_line.amount_currency < 0 and -1 or 1
@@ -911,7 +910,7 @@ class account_move_line(osv.osv):
         cr.execute('SELECT code FROM account_period WHERE id = %s', (context['period_id'], ))
         p = cr.fetchone()[0] or ''
         if j or p:
-            return j+(p and (':'+p) or '')
+            return j + (p and (':' + p) or '')
         return False
 
     def onchange_date(self, cr, user, ids, date, context=None):
@@ -954,6 +953,14 @@ class account_move_line(osv.osv):
             #Restrict the list of journal view in search view
             if view_type == 'search' and result['fields'].get('journal_id', False):
                 result['fields']['journal_id']['selection'] = journal_pool.name_search(cr, uid, '', [], context=context)
+                ctx = context.copy()
+                #we add the refunds journal in the selection field of journal
+                if context.get('journal_type', False) == 'sale':
+                    ctx.update({'journal_type': 'sale_refund'})
+                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
+                elif context.get('journal_type', False) == 'purchase':
+                    ctx.update({'journal_type': 'purchase_refund'})
+                    result['fields']['journal_id']['selection'] += journal_pool.name_search(cr, uid, '', [], context=ctx)
             return result
         if context.get('view_mode', False):
             return result

addons/account/account_report.xml

@@ -2,6 +2,7 @@
 <openerp>
     <data>
         <report auto="False" id="account_general_ledger" menu="False" model="account.account" name="account.general.ledger" rml="account/report/account_general_ledger.rml" string="General Ledger"/>
+        <report auto="False" id="account_general_ledger_landscape" menu="False" model="account.account" name="account.general.ledger_landscape" rml="account/report/account_general_ledger_landscape.rml" string="General Ledger"/>
         <report auto="False" id="account_3rdparty_ledger" menu="False" model="res.partner" name="account.third_party_ledger" rml="account/report/account_partner_ledger.rml" string="Partner Ledger"/>
         <report auto="False" id="account_3rdparty_ledger_other" menu="False" model="res.partner" name="account.third_party_ledger_other" rml="account/report/account_partner_ledger_other.rml" string="Partner Ledger"/>
         <report auto="False" id="account_account_balance" menu="False" model="account.account" name="account.account.balance" rml="account/report/account_balance.rml" string="Trial Balance"/>

addons/account/account_view.xml

@@ -170,6 +170,8 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General Information">
+                            <field name="active" groups="base.group_extended" />
+                            <newline/>
                             <group col="2" colspan="2">
                                 <separator string="Currency" colspan="2"/>
                                 <field name="currency_id"/>
@@ -565,7 +567,7 @@
                                     <field name="date" groups="base.group_extended"/>
                                     <field name="name"/>
                                     <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
@@ -574,12 +576,12 @@
                                 <form string="Statement lines">
                                     <field name="date"/>
                                     <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
-                                    <field name="ref"/>
                                     <field name="sequence" readonly="0"/>
                                     <separator colspan="4" string="Notes"/>
                                     <field colspan="4" name="note" nolabel="1"/>
@@ -744,7 +746,6 @@
                     <group col="2" colspan="2">
                         <separator string="Reporting Configuration" colspan="4"/>
                         <field name="report_type" select="2"/>
-                        <field name="sign"/>
                     </group>
                     <group col="2" colspan="2">
                         <separator string="Closing Method" colspan="4"/>
@@ -2385,12 +2386,13 @@
                           <attribute name='string'></attribute>
                   </xpath>
                 <group string="res_config_contents" position="replace">
-                    <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it --> 
+                    <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                     <field name ="code_digits" groups="base.group_extended"/>
                     <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)"/>
                     <field name ="seq_journal" groups="base.group_extended"/>
-                  <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
+                    <field name="sale_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
-                  <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                    <field name="purchase_tax" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('purchase', 'all'))]"/>
+                    <newline/>
                     <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
                         <form string="Bank Information">
                             <field name="acc_name"/>
@@ -2567,7 +2569,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
                                     <field name="date" groups="base.group_extended"/>
                                     <field name="name"/>
                                     <field name="ref"/>
-                                    <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
                                     <field domain="[('journal_id','=',parent.journal_id)]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
@@ -2576,12 +2578,12 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
                                 <form string="Statement lines">
                                     <field name="date"/>
                                     <field name="name"/>
+                                    <field name="ref"/>
+                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" />
                                     <field name="amount"/>
-                                    <field name="ref"/>
                                     <field name="sequence"/>
                                     <separator colspan="4" string="Notes"/>
                                     <field colspan="4" name="note" nolabel="1"/>
@@ -2693,14 +2695,6 @@ action = self.pool.get('res.config').next(cr, uid, [], context)
         <menuitem action="action_view_bank_statement_tree" id="journal_cash_move_lines"
             parent="menu_finance_bank_and_cash"/>
 
-        <record id="action_partner_all" model="ir.actions.act_window">
-            <field name="name">Partners</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.partner</field>
-            <field name="view_type">form</field>
-            <field name="filter" eval="True"/>
-        </record>
-
         <menuitem id="menu_account_customer" name="Customers"
             parent="menu_finance_receivables"
             action="base.action_partner_customer_form" sequence="100"/>

addons/account/board_account_view.xml

@@ -27,6 +27,7 @@
           <field name="view_mode">tree,graph</field>
           <field name="context">{'group_by':['user_type'], 'group_by_no_leaf':1}</field>
           <field name="view_id" ref="account.view_account_entries_report_tree"/>
+          <field name="domain">[('year','=',time.strftime('%Y'))]</field>
       </record>
       <record id="action_treasory_graph" model="ir.actions.act_window">
           <field name="name">Treasury</field>

addons/account/i18n/account.pot

@@ -28,7 +28,7 @@ msgstr ""
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
 #, python-format
-msgid "No journal for ending writing has been defined for the fiscal year"
+msgid "No End of year journal defined for the fiscal year"
 msgstr ""
 
 #. module: account
@@ -3920,6 +3920,12 @@ msgstr ""
 msgid "Error ! You can not create recursive accounts."
 msgstr ""
 
+#. module: account
+#: constraint:account.account:0
+msgid "You cannot create an account! \n"
+"Make sure if the account has children then it should be type \"View\"!"
+msgstr ""
+
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
@@ -8718,6 +8724,12 @@ msgstr ""
 msgid "Error ! You can not create recursive account templates."
 msgstr ""
 
+#. module: account
+#: constraint:account.account.template:0
+msgid "You cannot create an account template! \n"
+"Make sure if the account template has parent then it should be type \"View\"! "
+msgstr ""
+
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"

addons/account/invoice.py

@@ -328,8 +328,7 @@ class account_invoice(osv.osv):
     def get_log_context(self, cr, uid, context=None):
         if context is None:
             context = {}
-        mob_obj = self.pool.get('ir.model.data')
+        res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_form')
-        res = mob_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
         view_id = res and res[1] or False
         context.update({'view_id': view_id})
         return context
@@ -541,7 +540,11 @@ class account_invoice(osv.osv):
             journal_ids = obj_journal.search(cr, uid, [('company_id','=',company_id), ('type', '=', journal_type)])
             if journal_ids:
                 val['journal_id'] = journal_ids[0]
-            else:
+            res_journal_default = self.pool.get('ir.values').get(cr, uid, 'default', 'type=%s' % (type), ['account.invoice'])
+            for r in res_journal_default:
+                if r[1] == 'journal_id' and r[2] in journal_ids:
+                    val['journal_id'] = r[2]
+            if not val.get('journal_id', False):
                 raise osv.except_osv(_('Configuration Error !'), (_('Can\'t find any account journal of %s type for this company.\n\nYou can create one in the menu: \nConfiguration\Financial Accounting\Accounts\Journals.') % (journal_type)))
             dom = {'journal_id':  [('id', 'in', journal_ids)]}
         else:
@@ -559,7 +562,6 @@ class account_invoice(osv.osv):
                 val['currency_id'] = False
             else:
                 val['currency_id'] = company.currency_id.id
-
         return {'value': val, 'domain': dom}
 
     # go from canceled state to draft state
@@ -991,15 +993,13 @@ class account_invoice(osv.osv):
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
+        context = {} # TODO: Use context from arguments
         account_move_obj = self.pool.get('account.move')
         invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
+        move_ids = [] # ones that we will need to remove
         for i in invoices:
             if i['move_id']:
-                account_move_obj.button_cancel(cr, uid, [i['move_id'][0]])
+                move_ids.append(i['move_id'][0])
-                # delete the move this invoice was pointing to
-                # Note that the corresponding move_lines and move_reconciles
-                # will be automatically deleted too
-                account_move_obj.unlink(cr, uid, [i['move_id'][0]])
             if i['payment_ids']:
                 account_move_line_obj = self.pool.get('account.move.line')
                 pay_ids = account_move_line_obj.browse(cr, uid, i['payment_ids'])
@@ -1007,7 +1007,15 @@ class account_invoice(osv.osv):
                     if move_line.reconcile_partial_id and move_line.reconcile_partial_id.line_partial_ids:
                         raise osv.except_osv(_('Error !'), _('You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!'))
 
+        # First, set the invoices as cancelled and detach the move ids
         self.write(cr, uid, ids, {'state':'cancel', 'move_id':False})
+        if move_ids:
+            # second, invalidate the move(s)
+            account_move_obj.button_cancel(cr, uid, move_ids, context=context)
+            # delete the move this invoice was pointing to
+            # Note that the corresponding move_lines and move_reconciles
+            # will be automatically deleted too
+            account_move_obj.unlink(cr, uid, move_ids, context=context)
         self._log_event(cr, uid, ids, -1.0, 'Cancel Invoice')
         return True
 
@@ -1267,7 +1275,7 @@ class account_invoice_line(osv.osv):
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
         'note': fields.text('Notes'),
         'account_analytic_id':  fields.many2one('account.analytic.account', 'Analytic Account'),
-        'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company',store=True),
+        'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
     _defaults = {
@@ -1524,7 +1532,7 @@ class account_invoice_tax(osv.osv):
         'base_amount': fields.float('Base Code Amount', digits_compute=dp.get_precision('Account')),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."),
         'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')),
-        'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
+        'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'factor_base': fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"),
         'factor_tax': fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all")
     }

addons/account/report/__init__.py

@@ -39,8 +39,6 @@ import account_invoice_report
 import account_report
 import account_entries_report
 import account_analytic_entries_report
-#import voucher_print
-import account_voucher_print
 import account_balance_sheet
 import account_profit_loss
 

addons/account/report/account_balance.py

@@ -20,6 +20,7 @@
 ##############################################################################
 
 import time
+
 from report import report_sxw
 from common_report_header import common_report_header
 

addons/account/report/account_entries_report.py

@@ -94,25 +94,21 @@ class account_entries_report(osv.osv):
         return super(account_entries_report, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order,
             context=context, count=count)
 
-    def read_group(self, cr, uid, domain, *args, **kwargs):
+    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
-        todel=[]
+        if context is None:
+            context = {}
         fiscalyear_obj = self.pool.get('account.fiscalyear')
         period_obj = self.pool.get('account.period')
-        for arg in domain:
+        if context.get('period', False) == 'current_period':
-            if arg[0] == 'period_id' and arg[2] == 'current_period':
+            current_period = period_obj.find(cr, uid)[0]
-                current_period = period_obj.find(cr, uid)[0]
+            domain.append(['period_id','in',[current_period]])
-                domain.append(['period_id','in',[current_period]])
+        elif context.get('year', False) == 'current_year':
-                todel.append(arg)
+            current_year = fiscalyear_obj.find(cr, uid)
-                break
+            ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
-            elif arg[0] == 'period_id' and arg[2] == 'current_year':
+            domain.append(['period_id','in',ids])
-                current_year = fiscalyear_obj.find(cr, uid)
+        else:
-                ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids']
+            domain = domain
-                domain.append(['period_id','in',ids])
+        return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby)
-                todel.append(arg)
-        for a in [['period_id','in','current_year'], ['period_id','in','current_period']]:
-            if a in domain:
-                domain.remove(a)
-        return super(account_entries_report, self).read_group(cr, uid, domain, *args, **kwargs)
 
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'account_entries_report')

addons/account/report/account_entries_report_view.xml

@@ -70,17 +70,17 @@
                 <group colspan="10" col="12">
                     <filter icon="terp-go-year" string="This F.Year"
                             name="thisyear"
-                            domain="[('period_id','in','current_year')]"
+                            context="{'year':'current_year'}"
                             help="Journal Entries with period in current year"/>
                     <filter icon="terp-go-month" string="This Period"
                             name="period"
-                            domain="[('period_id','in','current_period')]"
+                            context="{'period':'current_period'}"
                             help="Journal Entries with period in current period"/>
                     <separator orientation="vertical"/>
                     <filter string="Unposted" icon="terp-document-new" domain="[('move_state','=','draft')]" help = "entries"/>
                     <filter string="Posted" icon="terp-camera_test" domain="[('move_state','=','posted')]" help = "Posted entries"/>
                     <separator orientation="vertical"/>
-                    <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False)]" help = "Unreconciled entries"/>
+                    <filter string="Unreconciled" icon="terp-dolar_ok!" domain="[('reconcile_id','=',False), ('account_id.reconcile','=',True)]" help = "Unreconciled entries"/>
                     <filter string="Reconciled" icon="terp-dolar" domain="[('reconcile_id','!=',False)]" help = "Reconciled entries"/>
                     <separator orientation="vertical"/>
                     <field name="account_id"/>

addons/account/report/account_general_ledger.py

@@ -103,7 +103,9 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
 
     def get_children_accounts(self, account):
         res = []
+        currency_obj = self.pool.get('res.currency')
         ids_acc = self.pool.get('account.account')._get_children_and_consol(self.cr, self.uid, account.id)
+        currency = account.currency_id and account.currency_id or account.company_id.currency_id
         for child_account in self.pool.get('account.account').browse(self.cr, self.uid, ids_acc, context=self.context):
             sql = """
                 SELECT count(id)
@@ -119,7 +121,7 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
                     res.append(child_account)
             elif self.display_account == 'bal_solde':
                 if child_account.type != 'view' and num_entry <> 0:
-                    if ( sold_account <> 0.0):
+                    if not currency_obj.is_zero(self.cr, self.uid, currency, sold_account):
                         res.append(child_account)
             else:
                 res.append(child_account)

addons/account/report/account_invoice_report_view.xml

@@ -150,6 +150,7 @@
     <act_window
         id="act_account_invoice_partner_relation"
         name="Monthly Turnover"
+        groups="group_account_manager"
         context="{'search_default_partner_id':[active_id], 'search_default_month':1,'search_default_user':1,'group_by_no_leaf':1,'group_by':[]}"
         res_model="account.invoice.report"
         src_model="res.partner"/>

addons/account/report/account_voucher_print.py

@@ -1,69 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-from report import report_sxw
-from tools import amount_to_text_en
-
-class report_voucher_move(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context=None):
-        super(report_voucher_move, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update({
-            'time': time,
-            'convert':self.convert,
-            'get_title': self.get_title,
-            'debit':self.debit,
-            'credit':self.credit,
-        })
-        self.user = uid
-
-    def convert(self, amount):
-        user_id = self.pool.get('res.users').browse(self.cr, self.user, [self.user])[0]
-        return amount_to_text_en.amount_to_text(amount, 'en', user_id.company_id.currency_id.name)
-
-    def get_title(self, voucher):
-        title = ''
-        if voucher.journal_id:
-            type = voucher.journal_id.type
-            title = type[0].swapcase() + type[1:] + " Voucher"
-        return title
-
-    def debit(self, move_ids):
-        debit = 0.0
-        for move in move_ids:
-            debit +=move.debit
-        return debit
-
-    def credit(self, move_ids):
-        credit = 0.0
-        for move in move_ids:
-            credit +=move.credit
-        return credit
-
-report_sxw.report_sxw(
-    'report.account.move.voucher',
-    'account.move',
-    'addons/account/report/account_voucher_print.rml',
-    parser=report_voucher_move,header="external"
-)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/report/account_voucher_print.rml

@@ -1,470 +0,0 @@
-<?xml version="1.0"?>
-<document filename="Voucher.pdf">
-  <template pageSize="(595.0,842.0)" title="Voucher" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="42.0" width="525" height="772"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#b3b3b3" start="5,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Heading1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <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="last_info">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#b3b3b3" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#b3b3b3" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="2,-1" stop="2,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica"/>
-    <paraStyle name="P2" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica-Bold" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
-    <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="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <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="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Footer" fontName="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_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Header" fontName="Helvetica"/>
-    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
-    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
-    <paraStyle name="Signature" fontName="Helvetica"/>
-    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Salutation" fontName="Helvetica"/>
-    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_9_30" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9_italic" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9_30_italic" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-  <pto>
-  <pto_header>
-    <blockTable colWidths="313.0,107.0,105.0" style="Heading1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Particulars</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
-    <para style="P8">[[ repeatIn(objects,'voucher') ]]</para>
-    <blockTable colWidths="524.0" style="Table6">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">[[ get_title(voucher) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="63.0,200.0,52.0,210.0" style="Table4">
-      <tr>
-        <td>
-          <para style="terp_tblheader_General">Journal:</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ voucher.journal_id.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General">Number:</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ voucher.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="63.0,72.0,44.0,84.0,52.0,210.0" style="Table5">
-      <tr>
-        <td>
-          <para style="terp_tblheader_General">State:</para>
-        </td>
-        <td>
-          <para style="terp_default_9">PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
-          <para style="terp_default_9">Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]]</para>
-          <para style="terp_default_9">Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
-          <para style="terp_default_9">Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General">Ref. :</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ voucher.ref]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General">Date:</para>
-        </td>
-        <td>
-          <para style="terp_default_9">[[ formatLang(voucher.date , date=True) or '' ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="313.0,107.0,105.0" style="Heading1">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Particulars</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Debit</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Credit</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(voucher.line_id,'line_id') ]]</para>
-      <blockTable colWidths="313.0,106.0,105.0" style="Table2">
-        <tr>
-          <td>
-            <para style="terp_default_Bold_9">[[ (line_id.partner_id and line_id.partner_id.name) or 'Account']]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(line_id.debit) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(line_id.credit) ]]</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="terp_default_9_30">[[ line_id.account_id.name ]] </para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="terp_default_9_30_italic">[[ line_id.name ]]-[[voucher.ref]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_1">
-        <font color="white"> </font>
-      </para>
-    </section>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="313.0,106.0,105.0" style="last_info">
-      <tr>
-        <td>
-          <para style="P4">Through : </para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9_italic">[[ voucher.narration or '']]</para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P4">On Account of : </para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P7">[[ voucher.line_id and voucher.line_id[0].name or removeParentNode('para') ]]</para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P2">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P4">Amount (in words) : </para>
-        </td>
-        <td>
-          <para style="P4">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P4">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P7">[[ convert(voucher.amount) ]]</para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P3">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="313.0,106.0,105.0" style="Table1">
-      <tr>
-        <td>
-          <para style="P5">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(debit(voucher.line_id))]]</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(credit(voucher.line_id)) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="154.0,160.0,63.0,148.0" style="Table3">
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P6">Receiver's Signature</para>
-        </td>
-        <td>
-          <para style="P6">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P6">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_Right_9">Authorised Signatory</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P1">
-      <font color="white"> </font>
-    </para>
-  </pto>
-  </story>
-</document>

addons/account/res_currency.py

@@ -21,6 +21,7 @@
 from osv import osv
 
 """Inherit res.currency to handle accounting date values when converting currencies"""
+
 class res_currency_account(osv.osv):
     _inherit = "res.currency"
 
@@ -41,4 +42,6 @@ class res_currency_account(osv.osv):
                 rate = float(tot2)/float(tot1)
         return rate
 
-res_currency_account()
+res_currency_account()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

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

@@ -98,6 +98,7 @@
 "access_account_bank_statement_manager","account.bank.statement manager","model_account_bank_statement","account.group_account_manager",1,1,1,1
 "access_account_entries_report_manager","account.entries.report","model_account_entries_report","account.group_account_manager",1,1,1,1
 "access_account_entries_report_user","account.entries.report","model_account_entries_report","account.group_account_user",1,0,0,0
+"access_account_entries_report_invoice","account.entries.report","model_account_entries_report","account.group_account_invoice",1,0,0,0
 "access_account_entries_report_employee","account.entries.report employee","model_account_entries_report","base.group_user",1,0,0,0
 "access_analytic_entries_report_manager","analytic.entries.report","model_analytic_entries_report","account.group_account_manager",1,0,0,0
 "access_account_cashbox_line","account.cashbox.line","model_account_cashbox_line","account.group_account_manager",1,1,1,1

addons/account/test/account_bank_statement.yml

@@ -6,14 +6,14 @@
   !record {model: account.bank.statement, id: account_bank_statement_0}:
     balance_end_real: 0.0
     balance_start: 0.0
-    date: '2010-10-14'
+    date: !eval time.strftime('%Y-%m-%d')
     journal_id: account.bank_journal
     name: /
     period_id: account.period_10
     line_ids:
       - account_id: account.a_recv
         amount: 1000.0
-        date: '2010-10-14'
+        date: !eval time.strftime('%Y-%m-%d')
         name: a
         partner_id: base.res_partner_4
         sequence: 0.0

addons/account/test/account_cash_statement.yml

@@ -2,7 +2,7 @@
   In order to test Cash statement I create a Cash statement and confirm it and check it's move created
 -
  !record {model: account.bank.statement, id: account_bank_statement_1}:
-    date: '2010-10-16'
+    date: !eval time.strftime('%Y-%m-%d')
     journal_id: account.cash_journal
     name: /
     period_id: account.period_10
@@ -41,7 +41,7 @@
     line_ids:
       - account_id: account.a_recv
         amount: 1000.0
-        date: '2010-10-16'
+        date: !eval time.strftime('%Y-%m-%d')
         name: test
         partner_id: base.res_partner_4
         sequence: 0.0

addons/account/test/account_customer_invoice.yml

@@ -7,7 +7,7 @@
     address_invoice_id: base.res_partner_address_zen
     company_id: base.main_company
     currency_id: base.EUR
-    date_invoice: '2010-05-26'
+    date_invoice: !eval time.strftime('%Y-%m-%d')
     invoice_line:
       - account_id: account.a_sale
         name: '[PC3] Medium PC'

addons/account/test/account_period_close.yml

@@ -4,10 +4,10 @@
 -
   !record {model: account.period, id: account_period_jan0}:
     company_id: base.main_company
-    date_start: '2010-01-01'
+    date_start: !eval "'%s-01-01' %(datetime.now().year)"
-    date_stop: '2010-01-31'
+    date_stop: !eval "'%s-01-31' %(datetime.now().year)"
     fiscalyear_id: account.data_fiscalyear
-    name: Jan-2010
+    name: !eval "'Jan-%s' %(datetime.now().year)"
     special: 1
 
 -
@@ -16,7 +16,7 @@
   !assert {model: account.period, id: account_period_jan0, string: Period is in Draft state}:
     - state == 'draft'
 -
-  I use "Close a Period" wizard to close period Jan-2010
+  I use "Close a Period" wizard to close period
 -
   !record {model: account.period.close, id: account_period_close_0}:
     sure: 1

addons/account/test/account_report.yml

@@ -28,14 +28,6 @@
     (data, format) = netsvc.LocalService('report.account.overdue').create(cr, uid, [ref('base.res_partner_asus'),ref('base.res_partner_agrolait'),ref('base.res_partner_c2c')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-report_overdue.'+format), 'wb+').write(data)
--
-  In order to test the PDF reports defined on Account Move, we will print the Voucher Report
--
-  !python {model: account.move}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.move.voucher').create(cr, uid, [ref('account.account_move_0')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data)
 -
   Print the Aged Partner Balance Report
 -
@@ -44,7 +36,7 @@
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
     data_dict = {'chart_account_id':ref('account.chart0')}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account') 
+    test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Account Balance Sheet in Horizontal mode
 -
@@ -53,7 +45,7 @@
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
     data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')    
+    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Account Balance Sheet in Normal mode
 -
@@ -62,7 +54,7 @@
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
     data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account') 
+    test_reports.try_report_action(cr, uid, 'action_account_bs_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Account Balance Report in Normal mode through the wizard - From Account Chart
 -
@@ -157,7 +149,7 @@
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
     data_dict = {'chart_account_id':ref('account.chart0'),'display_type': False}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')    
+    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
   Print the Profit-Loss Report in Horizontal Mode
 -
@@ -166,7 +158,7 @@
     ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
     data_dict = {'chart_account_id':ref('account.chart0'),'display_type': True}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account') 
+    test_reports.try_report_action(cr, uid, 'action_account_pl_report',wiz_data=data_dict, context=ctx, our_module='account')
 -
  Print the Analytic Balance Report through the wizard
 -
@@ -215,4 +207,4 @@
     ctx.update({'model': 'account.analytic.account','active_ids': [ref('account.analytic_root')]})
     data_dict = {}
     from tools import test_reports
-    test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')   
+    test_reports.try_report_action(cr, uid, 'action_account_analytic_invert_balance',wiz_data=data_dict, context=ctx, our_module='account')

addons/account/test/account_validate_account_move.yml

@@ -8,36 +8,36 @@
   In order to test the 'Post Journal Entries' wizard in OpenERP, I created an account move
 -
   !record {model: account.move, id: account_move_0}:
-    date: '2010-06-07'
+    date: !eval time.strftime('%Y-%m-%d')
     journal_id: account.bank_journal
     line_id:
       - account_id: account.cash
         amount_currency: 0.0
         credit: 2000.0
-        date: '2010-06-07'
+        date: !eval time.strftime('%Y-%m-%d')
         debit: 0.0
         journal_id: account.bank_journal
         name: Basic Computer
         partner_id: base.res_partner_desertic_hispafuentes
         period_id: account.period_6
-        ref: '2010010'
+        ref: '2011010'
         tax_amount: 0.0
       - journal_id: account.bank_journal
         period_id: account.period_6
-        ref: '2010010'
+        ref: '2011010'
         tax_code_id: account_tax_code_0      
         tax_amount: 0.0
         account_id: account.a_recv
         amount_currency: 0.0
         credit: 0.0
-        date: '2010-06-07'
+        date: !eval time.strftime('%Y-%m-%d')
         debit: 2000.0
         name: Basic Computer
         partner_id: base.res_partner_desertic_hispafuentes
         quantity: 0.0
     name: /
     period_id: account.period_6
-    ref: '2010010'
+    ref: '2011010'
     state: draft
 
 -

addons/account/test/chart_of_account.yml

@@ -43,8 +43,8 @@
 
 -
   !record {model: account.analytic.chart, id: account_analytic_chart_0}:
-    from_date: '2010-01-01'
+    from_date: !eval "'%s-01-01' %(datetime.now().year)"
-    to_date: '2010-06-30'
+    to_date: !eval "'%s-06-30' %(datetime.now().year)"
 -
   I clicked on Open chart Button to open the charts
 

addons/account/wizard/account_open_closed_fiscalyear.py

@@ -37,7 +37,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
         data = self.read(cr, uid, ids, [], context=context)[0]
         data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context)
         if not data_fyear.end_journal_period_id:
-            raise osv.except_osv(_('Error'), _('No journal for ending writing has been defined for the fiscal year'))
+            raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year'))
         period_journal = data_fyear.end_journal_period_id
         ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
         if ids_move:

addons/account/wizard/account_tax_chart_view.xml

@@ -28,7 +28,7 @@
             <field name="res_model">account.tax.chart</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('parent_id','=',False)]</field>
+            <field name="domain">[]</field>
             <field name="view_id" ref="view_account_tax_chart"/>
             <field name="help">Chart of Taxes is a tree view reflecting the structure of the Tax Cases (or tax codes) and shows the current tax situation. The tax chart represents the amount of each area of the tax declaration for your country. It’s presented in a hierarchical structure, which can be modified to fit your needs.</field>
             <field name="target">new</field>

addons/account_budget/account_budget.py

@@ -197,7 +197,7 @@ class crossovered_budget_lines(osv.osv):
         'paid_date': fields.date('Paid Date'),
         'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Account')),
         'practical_amount':fields.function(_prac, method=True, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')),
-        'theoritical_amount':fields.function(_theo, method=True, string='Theoritical Amount', type='float', digits_compute=dp.get_precision('Account')),
+        'theoritical_amount':fields.function(_theo, method=True, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')),
         'percentage':fields.function(_perc, method=True, string='Percentage', type='float'),
         'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }

addons/account_budget/account_budget_view.xml

@@ -78,7 +78,7 @@
                                     <field name="paid_date"/>
                                     <field name="planned_amount" sum="Planned Amount"/>
                                     <field name="practical_amount" select="1" sum="Practical Amount" />
-                                    <field name="theoritical_amount" sum="Theoritical Amount"/>
+                                    <field name="theoritical_amount" sum="Theoretical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">
@@ -121,7 +121,7 @@
                                     <field name="paid_date"/>
                                     <field name="planned_amount" sum="Planned Amount"/>
                                     <field name="practical_amount" sum="Practical Amount"/>
-                                    <field name="theoritical_amount" sum="Theoritical Amount"/>
+                                    <field name="theoritical_amount" sum="Theoretical Amount"/>
                                     <field name="percentage"/>
                                 </tree>
                                 <form string="Budget Lines">

addons/account_budget/test/account_budget.yml

@@ -5,9 +5,9 @@
 -
   !record {model: crossovered.budget, id: crossovered_budget_budget0}:
     code: B2011
-    date_from: '2011-01-01'
+    date_from: !eval "'%s-01-01' %(datetime.now().year+1)"
-    date_to: '2011-12-31'
+    date_to: !eval "'%s-12-31' %(datetime.now().year+1)"
-    name: Budget 2011
+    name: !eval "'Budget %s' %(datetime.now().year+1)"
     state: draft
 -
   I created two different budget lines
@@ -17,13 +17,13 @@
   !record {model: crossovered.budget, id: crossovered_budget_budget0}:
     crossovered_budget_line:
       - analytic_account_id: account.analytic_consultancy
-        date_from: '2011-01-01'
+        date_from: !eval "'%s-01-01' %(datetime.now().year+1)"
-        date_to: '2011-12-31'
+        date_to: !eval "'%s-12-31' %(datetime.now().year+1)"
         general_budget_id: account_budget.account_budget_post_purchase0
         planned_amount: 10000.0
       - analytic_account_id: account.analytic_super_product_trainings
-        date_from: '2011-09-01'
+        date_from: !eval "'%s-09-01' %(datetime.now().year+1)"
-        date_to: '2011-09-30'
+        date_to: !eval "'%s-09-30' %(datetime.now().year+1)"
         general_budget_id: account_budget.account_budget_post_sales0
         planned_amount: 400000.0
 

addons/account_followup/report/account_followup_report.py

@@ -40,7 +40,6 @@ class account_followup_stat(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'blocked': fields.boolean('Blocked', readonly=True),
         'period_id': fields.many2one('account.period', 'Period', readonly=True),
-
     }
     _order = 'date_move'
 
@@ -69,7 +68,7 @@ class account_followup_stat(osv.osv):
         cr.execute("""
             create or replace view account_followup_stat as (
                 SELECT
-                    l.id AS id,
+                    l.partner_id as id,
                     l.partner_id AS partner_id,
                     min(l.date) AS date_move,
                     max(l.date) AS date_move_last,

addons/account_followup/test/account_followup.yml

@@ -66,7 +66,7 @@
   I create a send followup record
 -
   !record {model: account.followup.print, id: account_followup_print_0}:
-    date: '2010-06-08'
+    date: !eval time.strftime('%Y-%m-%d')
     followup_id: account_followup_followup_testfollowups0
 
 
@@ -97,7 +97,8 @@
   I clicked on Print Follow Ups to print Followups reports
 -
   !python {model: account.followup.print.all}: |
+    import time
     self.do_print(cr, uid, [ref("account_followup_print_all_0")], {"lang": 'en_US',
       "active_model": "ir.ui.menu", "active_ids": [ref("account_followup.account_followup_print_menu")],
-      "tz": False, "date": "2010-06-08", "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"),
+      "tz": False, "date": time.strftime('%Y-%m-%d'), "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"),
       })

addons/account_followup/wizard/account_followup_print.py

@@ -219,8 +219,8 @@ class account_followup_print_all(osv.osv_memory):
             partners = []
             dict_lines = {}
             for line in move_lines:
-                partners.append(line.name)
+                partners.append(line.partner_id)
-                dict_lines[line.name.id] =line
+                dict_lines[line.partner_id.id] =line
             for partner in partners:
                 ids_lines = move_obj.search(cr,uid,[('partner_id','=',partner.id),('reconcile_id','=',False),('account_id.type','in',['receivable'])])
                 data_lines = move_obj.browse(cr, uid, ids_lines, context=context)
@@ -275,8 +275,11 @@ class account_followup_print_all(osv.osv_memory):
                 sub = tools.ustr(data['email_subject'])
                 msg = ''
                 if dest:
-                    tools.email_send(src,dest,sub,body)
+                    try:
-                    msg_sent += partner.name + '\n'
+                        tools.email_send(src, dest, sub, body)
+                        msg_sent += partner.name + '\n'
+                    except Exception, e:
+                        raise osv.except_osv('Error !', e )
                 else:
                     msg += partner.name + '\n'
                     msg_unsent += msg
@@ -301,7 +304,7 @@ class account_followup_print_all(osv.osv_memory):
             'type': 'ir.actions.act_window',
             'target': 'new',
             'nodestroy': True
-                    }
+            }
 
     def do_print(self, cr, uid, ids, context=None):
         if context is None:

addons/account_payment/test/account_payment.yml

@@ -60,7 +60,7 @@
   !record {model: payment.order, id: payment_order_0}:
     date_prefered: due
     mode: payment_mode_m0
-    reference: 2010/006
+    reference: !eval "'%s/006' %(datetime.now().year)"
     user_id: base.user_root
 
 
@@ -68,7 +68,7 @@
   Creating a payment.order.create record
 -
   !record {model: payment.order.create, id: payment_order_create_0}:
-    duedate: '2010-06-04'
+    duedate: !eval time.strftime('%Y-%m-%d')
 
 -
   I searched the entries using "Payment Create Order" wizard

addons/account_voucher/account_voucher.py

@@ -45,6 +45,11 @@ class account_voucher(osv.osv):
     def _get_journal(self, cr, uid, context=None):
         if context is None: context = {}
         journal_pool = self.pool.get('account.journal')
+        invoice_pool = self.pool.get('account.invoice')
+        if context.get('invoice_id', False):
+            currency_id = invoice_pool.browse(cr, uid, context['invoice_id'], context=context).currency_id.id
+            journal_id = journal_pool.search(cr, uid, [('currency', '=', currency_id)], limit=1)
+            return journal_id and journal_id[0] or False
         if context.get('journal_id', False):
             return context.get('journal_id')
         if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
@@ -700,7 +705,7 @@ class account_voucher(osv.osv):
                     continue
                 #we check if the voucher line is fully paid or not and create a move line to balance the payment and initial invoice if needed
                 if line.amount == line.amount_unreconciled:
-                    amount = line.move_line_id.amount_residual #residual amount in company currency 
+                    amount = line.move_line_id.amount_residual #residual amount in company currency
                 else:
                     amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.untax_amount or line.amount, context=context_multi_currency)
                 move_line = {
@@ -766,7 +771,6 @@ class account_voucher(osv.osv):
                     #'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1, context=context_multi_currency) or 0.0,
                     #'currency_id': company_currency <> current_currency and current_currency or False,
                 }
-
                 move_line_pool.create(cr, uid, move_line)
             self.write(cr, uid, [inv.id], {
                 'move_id': move_id,
@@ -840,7 +844,7 @@ class account_voucher_line(osv.osv):
         'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1),
         'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amount', store=True),
         'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True),
-        'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True),
+        'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True),
     }
     _defaults = {
         'name': ''

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

@@ -5,3 +5,5 @@
 "access_account_voucher_line_manager","account.voucher.line","model_account_voucher_line","account.group_account_manager",1,0,0,0
 "access_account_voucher_invoice","account.voucher invoice","model_account_voucher","account.group_account_invoice",1,1,1,1
 "access_account_voucher_line_invoice","account.voucher.line invoice","model_account_voucher_line","account.group_account_invoice",1,1,1,1
+"access_sale_receipt_report_manager","account.sale.receipt.report","model_sale_receipt_report","account.group_account_manager",1,1,1,1
+"access_sale_receipt_report_user","account.sale.receipt.report","model_sale_receipt_report","account.group_account_user",1,0,0,0

addons/account_voucher/voucher_sales_purchase_view.xml

@@ -158,7 +158,7 @@
                                    <field name="state"/>
                                    <field name="reconcile_id"/>
                                </tree>
-                            </field> 
+                            </field>
                         </page>
                     </notebook>
                     <group col="8" colspan="4">
@@ -278,7 +278,7 @@
                                    <field name="state"/>
                                    <field name="reconcile_id"/>
                                </tree>
-                            </field> 
+                            </field>
                         </page>
                     </notebook>
                     <group col="10" colspan="4">

addons/auction/test/auction.yml

@@ -122,10 +122,10 @@
     acc_expense: account.a_pay
     acc_income: account.a_recv
     account_analytic_id: account.analytic_root
-    auction1: '2010-08-01'
+    auction1: !eval "'%s-08-01' %(datetime.now().year)"
-    auction2: '2010-08-31'
+    auction2: !eval "'%s-08-31' %(datetime.now().year)"
-    expo1: '2010-08-01'
+    expo1: !eval "'%s-08-01' %(datetime.now().year)"
-    expo2: '2010-08-31'
+    expo2: !eval "'%s-08-31' %(datetime.now().year)"
     journal_id: account.expenses_journal
     journal_seller_id: account.sales_journal
     name: Antique furniture exhibition
@@ -137,7 +137,7 @@
   An object is being deposited for an auction,I create a seller's deposit record with deposit cost.  
 -
   !record {model: auction.deposit, id: auction_deposit_ad0}:
-    date_dep: '2010-08-01'
+    date_dep: !eval "'%s-08-01' %(datetime.now().year)"
     method: keep
     name: AD/006
     partner_id: res_partner_mrpinakin0
@@ -251,7 +251,7 @@
   !record {model: auction.lots.make.invoice.buyer, id: auction_lots_make_invoice_buyer_0}:
     amount: 3090.0
     buyer_id: res_partner_mrkjohnson0
-    number: 2010/003
+    number: !eval "'%s/003' %(datetime.now().year)"
     objects: 1
 -
   I click on the "Create Invoices" button.

addons/auction/test/auction_wizard.yml

@@ -31,10 +31,10 @@
     acc_expense: account.a_pay
     acc_income: account.a_recv
     account_analytic_id: account.analytic_root
-    auction1: '2010-05-24'
+    auction1: !eval "'%s-05-24' %(datetime.now().year)"
-    auction2: '2010-05-25'
+    auction2: !eval "'%s-05-25' %(datetime.now().year)"
-    expo1: '2010-05-21'
+    expo1: !eval "'%s-05-21' %(datetime.now().year)"
-    expo2: '2010-05-22'
+    expo2: !eval "'%s-05-22' %(datetime.now().year)"
     journal_id: account.expenses_journal
     journal_seller_id: account.sales_journal
     name: Picasso's painting exhibition
@@ -42,7 +42,7 @@
   An object is being deposited for an auction,I create a seller's deposit record.
 -
   !record {model: auction.deposit, id: auction_deposit_ad1}:
-    date_dep: '2010-05-18'
+    date_dep: !eval "'%s-05-18' %(datetime.now().year)"
     method: keep
     name: AD/007
     partner_id: base.res_partner_9
@@ -95,7 +95,7 @@
 -
   !record {model: account.bank.statement, id: account_bank_statement_st0}:
     balance_end_real: 0.0
-    date: '2010-05-19'
+    date: !eval "'%s-05-19' %(datetime.now().year)"
     journal_id: account.bank_journal
     name: St. 05/19
     period_id: account.period_5
@@ -132,7 +132,7 @@
 -  
   !record {model: auction.lots.make.invoice, id: auction_lots_make_invoice_0}:
     amount: 3500.0
-    number: 2010/002
+    number: !eval "'%s/002' %(datetime.now().year)"
     objects: 1
 -
   I click on the "Create Invoices" button.
@@ -154,7 +154,7 @@
   !record {model: auction.lots.make.invoice.buyer, id: auction_lots_make_invoice_buyer_0}:
     amount: 3500.0
     buyer_id: base.res_partner_3
-    number: 2010/003
+    number: !eval "'%s/003' %(datetime.now().year)"
     objects: 1
 -
   I click on the "Create Invoices" button.

addons/base_calendar/test/base_calendar_test.yml

@@ -3,8 +3,8 @@
 -
     !record {model: calendar.event, id: calendar_event_technicalpresentation0}:
         class: private
-        date: '2010-04-30 16:00:00'
+        date: '2011-04-30 16:00:00'
-        date_deadline: '2010-04-30 18:30:00'
+        date_deadline: '2011-04-30 18:30:00'
         description: The Technical Presentation will cover following topics:\n* Creating OpenERP
           class\n* Views\n* Wizards\n* Workflows
         duration: 2.5
@@ -27,16 +27,16 @@
     I will search for one of the recurrent event and count the number of events
 -
     !python {model: calendar.event}: |
-     ids = self.search(cr, uid, [('date', '>=', '2010-04-30 16:00:00'), ('date', '<=', '2010-05-31 00:00:00')] )
+     ids = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')] )
-     assert len(ids) == 10
+     assert len(ids) == 9
 -   |
     Now I will make All day event and test it
 -
     !record {model: calendar.event, id: calendar_event_alldaytestevent0}:
         allday: 1
         class: confidential
-        date: '2010-04-30 00:00:00'
+        date: '2011-04-30 00:00:00'
-        date_deadline: '2010-04-30 00:00:00'
+        date_deadline: '2011-04-30 00:00:00'
         description: 'All day technical test '
         location: School
         name: All day test event

addons/crm/test/test_crm_meeting.yml

@@ -6,8 +6,8 @@
 - 
   !record {model: crm.meeting, id: crm_meeting_regardingpresentation0}:
     categ_id: crm.categ_meet2
-    date: '2010-04-21 16:04:00'
+    date: !eval time.strftime('%Y-%m-%d 16:04:00')
-    date_deadline: '2010-04-22 00:04:00'
+    date_deadline: !eval "'%s-%s-%s 00:04:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
     duration: 8.0
     email_from: info@balmerinc.be
     location: Ahmedabad
@@ -55,7 +55,9 @@
   I will search for one of the recurrent event and count the number of meeting.
 -
   !python {model: crm.meeting}: |
-     ids = self.search(cr, uid, [('date', '>=', '2010-04-21 00:00:00'), ('date', '<=', '2010-05-21 00:00:00')] )
+     import time
+     from datetime import datetime, date, timedelta
+     ids = self.search(cr, uid, [('date', '>=', time.strftime('%Y-%m-%d 00:00:00')), ('date', '<=', (datetime.now()+timedelta(31)).strftime('%Y-%m-%d 00:00:00')), ('name', '=', 'Regarding Presentation')] )
      assert len(ids) == 10      
 
 - |

addons/crm/test/test_crm_opportunity.yml

@@ -36,8 +36,8 @@
    I fill proper data for that meeting and save it
 -
   !record {model: crm.meeting, id: crm_meeting_abcfuelcounits0}:
-    date: '2010-04-16 00:00:00'
+    date: !eval time.strftime('%Y-%m-%d 00:00:00')
-    date_deadline: '2010-04-16 08:00:00'
+    date_deadline: !eval time.strftime('%Y-%m-%d 08:00:00')
     duration: 8.0
     email_from: info@balmerinc.be
     name: 'ABC FUEL CO 829264 - 10002 units'
@@ -51,7 +51,7 @@
   I click on "schedule call" button and select planned date for the call.
 -
   !record {model: crm.opportunity2phonecall, id: crm_opportunity2phonecall_abcfuelcounits0}:
-    date: '2010-04-17 11:15:00'
+    date: !eval "'%s-%s-%s 11:15:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
     name: 'ABC FUEL CO 829264 - 10002 units'
     section_id: crm.section_sales_department
     user_id: base.user_demo
@@ -72,7 +72,7 @@
   I can see phonecall record after click on "Schedule call" wizard.
 -
   !record {model: crm.phonecall, id: crm_phonecall_abcfuelcounits0}:
-    date: '2010-04-17 11:15:00'
+    date: !eval "'%s-%s-%s 11:15:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
     duration: 3.0
     name: 'ABC FUEL CO 829264 - 10002 units'
     partner_address_id:  base.res_partner_address_1

addons/crm/test/test_crm_phonecall.yml

@@ -2,8 +2,9 @@
   I start by creating a new phonecall.
 -
   !record {model: crm.phonecall, id: crm_phonecall_interviewcall0}:
-    date: '2010-04-21 18:59:00'
+    date: !eval time.strftime('%Y-%m-%d 08:00:00')
     name: Interview call
+    duration: 2.0
     section_id: crm.section_sales_department
 -
   Now , I select partner by click on "Create a Partner" button.
@@ -63,8 +64,8 @@
 -
   !record {model: crm.meeting, id: crm_meeting_interviewcall0}:
     alarm_id: base_calendar.alarm3
-    date: '2010-04-20 00:00:00'
+    date: !eval "'%s-%s-%s 09:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
-    date_deadline: '2010-04-20 08:00:00'
+    date_deadline: !eval "'%s-%s-%s 17:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
     duration: 8.0
     email_from: info@balmerinc.be
     name: Interview call
@@ -80,7 +81,7 @@
   phonecall.
 -
   !record {model: crm.phonecall2phonecall, id: crm_phonecall2phonecall_interviewcall0}:
-    date: '2010-04-21 19:49:00'
+    date: !eval "'%s-%s-%s 19:49:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
     name: Interview call
     section_id: crm.section_sales_department
     user_id: base.user_root

addons/crm_claim/test/test_crm_claim.yml

@@ -7,7 +7,7 @@
 - 
   !record {model: crm.claim, id: crm_claim_damagedproduct0}:
     categ_id: crm_claim.categ_claim2
-    date: '2010-04-21 20:13:00'
+    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
     email_from: info@balmerinc.be
     name: 'Damaged product '
     partner_address_id: base.res_partner_address_1

addons/crm_helpdesk/crm_helpdesk_demo.xml

@@ -9,7 +9,7 @@
             <field name="priority">3</field>
             <field name="state">draft</field>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="date">2010-07-04 11:10:36</field>
+            <field name="date" eval="time.strftime('%Y-%m-04 11:10:36')"/>
             <field name="name">Download old version of OpenERP? </field>
             <field eval="&quot;Is there any link to download old versions of OpenERP?&quot;" name="description"/>
         </record>
@@ -22,7 +22,7 @@
             <field name="priority">3</field>
             <field name="state">draft</field>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="date">2010-07-12 11:12:09</field>
+            <field name="date" eval="time.strftime('%Y-%m-12 11:12:09')"/>
             <field name="name">Can not able to connect to Server</field>
             <field eval="&quot;I am not able to connect Server, Can anyone help?&quot;" name="description"/>
         </record>
@@ -35,7 +35,7 @@
             <field name="priority">2</field>
             <field name="state">draft</field>
             <field name="section_id" ref="crm.section_sales_department"/>
-            <field name="date">2010-07-12 11:13:10</field>
+            <field name="date" eval="time.strftime('%Y-%m-12 11:13:10')"/>
             <field name="name">Documentation for CRM?</field>
             <field eval="&quot;Can anyone give link of document for CRM&quot;" name="description"/>
         </record>
@@ -49,7 +49,7 @@
             <field name="company_id" ref="base.main_company"/>
             <field name="priority">3</field>
             <field name="state">draft</field>
-            <field name="date">2010-07-12 11:15:17</field>
+            <field name="date" eval="time.strftime('%Y-%m-12 11:15:17')"/>
             <field name="name">How to create a new module</field>
             <field eval="&quot;How can I create new module in OpenERP?&quot;" name="description"/>
         </record>

addons/crm_helpdesk/test/test_crm_helpdesk.yml

@@ -4,7 +4,7 @@
   I select Date at which helpdesk request is created.
 - 
   !record {model: crm.helpdesk, id: crm_helpdesk_somefunctionalquestion0}:
-    date: '2010-04-22 10:17:00'
+    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
     email_from: info@balmerinc.be
     name: Some functional question.
     partner_address_id: base.res_partner_address_1

addons/delivery/test/delivery_report.yml

@@ -8,18 +8,18 @@
     origin: SO001
     address_id: base.res_partner_address_4
     company_id: base.main_company
-    date: '2010-05-11 15:18:52'
+    date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
     invoice_state: none
     move_lines:
       - company_id: base.main_company
-        date: '2010-05-11 15:18:57'
+        date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
         location_dest_id: stock.stock_location_customers
         location_id: stock.stock_location_stock
         name: HP CD writers
         product_id: product.product_product_pc1
         product_qty: 3.0
         product_uom: product.product_uom_unit
-        date: '2010-05-11 15:18:57'
+        date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
         product_uos_qty: 3.0
     move_type: direct
     type: out

addons/event/test/test_event.yml

@@ -18,8 +18,8 @@
   I'm creating one Event "Conference on OpenERP Business" which will last from 1st of this month to 10th of this month.
 -
   !record {model: event.event, id: event_event_conference0}:
-    date_begin: 2010-08-01
+    date_begin: !eval time.strftime('%Y-%m-01')
-    date_end: 2010-08-10
+    date_end: !eval time.strftime('%Y-%m-10')
     name: Conference on OpenERP Business.
     product_id: 'product_product_ticketforconcert0'
     type: 'event_type_conference0'

addons/hr_attendance/test/test_hr_attendance.yml

@@ -30,7 +30,7 @@
     action: sign_in
     action_desc: 'hr_action_reason_login0'
     employee_id: 'hr_employee_employee0'
-    name: '2010-05-18 19:08:08'
+    name: !eval "'%s-01-01 19:08:08' %(datetime.now().year)"
 -
   I check that Employee state is "Present".
 -
@@ -43,7 +43,7 @@
   !record {model: hr.attendance, id: hr_attendance_1}:
     action: sign_out
     employee_id: 'hr_employee_employee0'
-    name: '2010-05-18 19:10:55'
+    name: !eval "'%s-01-01 19:10:55' %(datetime.now().year)"
 -
   I check that Employee state is Absent.
 -

addons/hr_contract/test/test_hr_contract.yml

@@ -39,10 +39,10 @@
     advantages_gross: 0.0
     employee_id: 'hr_employee_employee0'
     advantages_net: 0.0
-    date_end: '2011-05-18'
+    date_end: !eval "'%s-05-18' %(datetime.now().year+1)"
-    date_start: '2010-05-18'
+    date_start: !eval "'%s-05-18' %(datetime.now().year)"
-    trial_date_end: '2010-03-01'
+    trial_date_end: !eval "'%s-03-01' %(datetime.now().year)"
-    trial_date_start: '2010-04-30'
+    trial_date_start: !eval "'%s-04-30' %(datetime.now().year)"
     name: contract1
     wage: 1.0
     wage_type_id: hr_contract_wage_type_monthlygrosswage0

addons/hr_evaluation/hr_evaluation.py

@@ -51,7 +51,7 @@ class hr_evaluation_plan_phase(osv.osv):
     _columns = {
         'name': fields.char("Phase", size=64, required=True),
         'sequence': fields.integer("Sequence"),
-        'company_id': fields.related('plan_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True),
+        'company_id': fields.related('plan_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
         'plan_id': fields.many2one('hr_evaluation.plan','Evaluation Plan', ondelete='cascade'),
         'action': fields.selection([
             ('top-down','Top-Down Appraisal Requests'),

addons/hr_evaluation/test/test_hr_evaluation.yml

@@ -101,7 +101,7 @@
   I create an Evaluation for employee under "Manager Evaluation Plan".
 -
   !record {model: hr_evaluation.evaluation, id: hr_evaluation_evaluation_0}:
-    date: '2010-06-28'
+    date: !eval time.strftime('%Y-%m-%d')
     employee_id: 'hr_employee_employee1'
     plan_id: 'hr_evaluation_plan_managersplan0'
     progress: 0.0
@@ -110,7 +110,7 @@
   I create an Interview Request record
 - 
   !record {model: hr.evaluation.interview, id: hr_evaluation_interview_0}:
-    date_deadline: '2010-06-28'
+    date_deadline: !eval time.strftime('%Y-%m-%d')
     evaluation_id: 'hr_evaluation_evaluation_0'
     survey_id:  hr_evaluation.survey_0
 -

addons/hr_expense/hr_expense_demo.xml

@@ -44,13 +44,13 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="name">May Expenses</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="date">2010-05-03</field>
+            <field name="date" eval="time.strftime('%Y-%m-03')"/>
             <field name="state">draft</field>
         </record>
 
         <record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
             <field name="name">Travel by Air</field>
-            <field name="date_value">2010-05-03</field>
+            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
             <field name="analytic_account" ref="account.analytic_consultancy"/>
             <field name="product_id" ref="product_product_expense_air"/>
             <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
@@ -61,7 +61,7 @@
 
         <record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
             <field name="name">Basic PC - Server for Seagate</field>
-            <field name="date_value">2010-05-03</field>
+            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
             <field name="analytic_account" ref="account.analytic_seagate_p2"/>
             <field name="product_id" ref="product.product_product_pc4"/>
             <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
@@ -79,13 +79,13 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="name">Travel Expenses</field>
             <field name="company_id" ref="base.main_company"/>
-            <field name="date">2010-04-20</field>
+            <field name="date" eval="time.strftime('%Y-%m-20')"/>
             <field name="state">draft</field>
         </record>
 
         <record id="hr_expense_line_hotelexpensesthymbra0" model="hr.expense.line">
             <field name="name">Hotel Expenses - Thymbra</field>
-            <field name="date_value">2010-05-03</field>
+            <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
             <field name="analytic_account" ref="account.analytic_thymbra"/>
             <field name="product_id" ref="product_product_expense_hotel"/>
             <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
@@ -96,7 +96,7 @@
 
         <record id="hr_expense_line_car_travel" model="hr.expense.line">
                 <field name="name">Bruxelles - Paris</field>
-                <field name="date_value">2010-05-03</field>
+                <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
                 <field name="analytic_account" ref="account.analytic_thymbra"/>
                 <field name="product_id" ref="product_product_expense_car"/>
                 <field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>

addons/hr_expense/test/test_hr_expense.yml

@@ -47,11 +47,11 @@
   !record {model: hr.expense.expense, id: hr_expense_expense_september0}:
     company_id: base.main_company
     currency_id: base.EUR
-    date: '2010-05-05'
+    date: !eval "'%s-05-05' %(datetime.now().year)"
     employee_id: hr.employee1
     name: September Expenses
     line_ids:
-      - date_value: '2010-05-27'
+      - date_value: !eval "'%s-05-27' %(datetime.now().year)"
         name: Travel
         product_id: 'product_product_travel0'
         sequence: 0.0

addons/hr_holidays/hr_holidays_view.xml

@@ -70,7 +70,7 @@
                 <form string="Leave Request">
                     <group col="8" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager" string="Leave Type"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" groups="base.group_hr_manager, base.group_extended" string="Leave Type"/>
                     <group attrs="{'invisible':[('holiday_type','=','employee')]}">
                         <field name="category_id"  attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')]}"/>
                         </group>
@@ -114,7 +114,7 @@
             <form string="Allocation Request">
                 <group col="8" colspan="4">
                     <field name="name" />
-                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type" groups="base.group_hr_manager"/>
+                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Type" groups="base.group_hr_manager, base.group_extended"/>
                         <group attrs="{'invisible':[('holiday_type','=','category')]}">
                         <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}"/>
                         </group>

addons/hr_holidays/test/test_hr_holiday.yml

@@ -46,8 +46,8 @@
     holiday_status_id: hr_holidays_status_sick0
     name: Sick Leaves for Phil Graves
     number_of_days_temp: 12.0
-    date_from: '2010-05-20 13:59:00'
+    date_from: !eval "'%s-05-20 13:59:00' %(datetime.now().year)"
-    date_to: '2010-05-22 13:59:00'
+    date_to: !eval "'%s-05-22 13:59:00' %(datetime.now().year)"
     type: add
 -
   I confirmed the allocation by clicking on "Confirm" button.
@@ -63,8 +63,8 @@
   I connect as "test_holiday_user1", and create a new leave request for employee "Phil Graves".
 -
   !record {model: hr.holidays, id: hr_holidays_iwanttoleaveforgotohospital0}:
-    date_from: '2010-05-20 11:48:00'
+    date_from: !eval "'%s-05-20 11:48:00' %(datetime.now().year)"
-    date_to: '2010-05-21 11:48:00'
+    date_to: !eval "'%s-05-21 11:48:00' %(datetime.now().year)"
     employee_id: 'hr_employee_philgraves0'
     holiday_status_id: 'hr_holidays_status_sick0'
     name: Appointment with Doctor

addons/hr_payroll/hr_payroll.py

@@ -661,8 +661,8 @@ class payment_category(osv.osv):
     _name = 'hr.allounce.deduction.categoty'
     _description = 'Allowance Deduction Heads'
     _columns = {
-        'name':fields.char('Categoty Name', size=64, required=True, readonly=False),
+        'name':fields.char('Category Name', size=64, required=True, readonly=False),
-        'code':fields.char('Categoty Code', size=64, required=True, readonly=False),
+        'code':fields.char('Category Code', size=64, required=True, readonly=False),
         'type':fields.selection([
             ('allowance','Allowance'),
             ('deduction','Deduction'),
@@ -721,7 +721,7 @@ class company_contribution(osv.osv):
             ('per','Percentage'),
             ('func','Function Calculation'),
         ],'Amount Type', select=True),
-        'contribute_per':fields.float('Contribution', digits=(16, 4), help='Define Company contribution ratio 1.00=100% contribution, If Employee Contribute 5% then company will and here 0.50 defined then company will contribute 50% on employee 5% contribution'),
+        'contribute_per':fields.float('Contribution', digits=(16, 4), help='Define Company contribution ratio 1.00=100% contribution.'),
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'active':fields.boolean('Active', required=False),
         'note': fields.text('Description'),
@@ -769,7 +769,7 @@ class company_contribution_line(osv.osv):
     """
 
     _name = 'company.contribution.line'
-    _description = 'Allowance Deduction Categoty'
+    _description = 'Allowance Deduction Category'
     _order = 'sequence'
     _columns = {
         'contribution_id':fields.many2one('company.contribution', 'Contribution', required=False),

addons/hr_payroll/hr_payroll_data.xml

@@ -4,14 +4,14 @@
         <record id="HRA" model="hr.allounce.deduction.categoty">
             <field name="code">HRA</field>
             <field name="type">allowance</field>
-            <field name="name">House Rant Allowance</field>
+            <field name="name">House Rent Allowance</field>
             <field name="sequence" eval="5"/>
         </record>
-        
+
         <record id="CA" model="hr.allounce.deduction.categoty">
             <field name="code">CA</field>
             <field name="type">allowance</field>
-            <field name="name">Convance Allowance</field>
+            <field name="name">Conveyance Allowance</field>
             <field name="sequence" eval="10"/>
         </record>
         

addons/hr_payroll/hr_payroll_demo.xml

@@ -17,7 +17,7 @@
             <field name="type">allowance</field>
             <field name="category_id" ref="hr_payroll.HRA"/>
             <field name="function_id" ref="hr_payroll.structure_001"/>
-            <field name="name">House Rant Allowance</field>
+            <field name="name">House Rent Allowance</field>
         </record>
 
         <record id="hr_payslip_line_convanceallowance1" model="hr.payslip.line">
@@ -28,7 +28,7 @@
             <field name="type">allowance</field>
             <field name="category_id" ref="hr_payroll.CA"/>
             <field name="function_id" ref="hr_payroll.structure_001"/>
-            <field name="name">Convance Allowance</field>
+            <field name="name">Conveyance Allowance</field>
         </record>
 
         <record id="hr_payslip_line_professionaltax1" model="hr.payslip.line">

addons/hr_payroll/hr_payroll_view.xml

@@ -277,8 +277,6 @@
                 <group colspan="2">
                             <separator string="Validation" colspan="2"/>
                                 <newline/>
-                            <field name="active" />
-                                <newline/>
                             <field name="double_validation"/>
                                 <newline/>
                             <field name="limit"/>

addons/hr_payroll/i18n/hr_payroll.pot

@@ -1009,7 +1009,7 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,code:0
-msgid "Categoty Code"
+msgid "Category Code"
 msgstr ""
 
 #. module: hr_payroll
@@ -1383,7 +1383,7 @@ msgstr ""
 
 #. module: hr_payroll
 #: field:hr.allounce.deduction.categoty,name:0
-msgid "Categoty Name"
+msgid "Category Name"
 msgstr ""
 
 #. module: hr_payroll

addons/hr_payroll/test/payment_advice.yml

@@ -11,8 +11,8 @@
     contract_ids:
       - advantages_gross: 0.0
         advantages_net: 0.0
-        date_end: '2011-07-01'
+        date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
-        date_start: '2010-07-01'
+        date_start: !eval time.strftime('%Y-%m-%d')
         name: reference
         wage: 5000.0
         wage_type_id: hr_contract.hr_contract_monthly_gross

addons/hr_payroll/test/payroll_register.yml

@@ -10,8 +10,8 @@
     contract_ids:
       - advantages_gross: 0.0
         advantages_net: 0.0
-        date_end: '2011-07-01'
+        date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
-        date_start: '2010-07-01'
+        date_start: !eval time.strftime('%Y-%m-%d')
         name: reference
         wage: 5000.0
         wage_type_id: hr_contract.hr_contract_monthly_gross
@@ -26,7 +26,7 @@
   I create a payroll register record.
 -
   !record {model: hr.payroll.register, id: hr_payroll_register_payroll0}:
-    date: '2010-07-02'
+    date: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
     line_ids:
       - employee_id: hr_payroll.hr_employee_keith0
     name: payroll1

addons/hr_payroll/test/payslip.yml

@@ -21,8 +21,8 @@
     contract_ids:
       - advantages_gross: 0.0
         advantages_net: 0.0
-        date_end: '2011-07-01'
+        date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)"
-        date_start: '2010-07-01'
+        date_start: !eval time.strftime('%Y-%m-%d')
         name: reference
         wage: 5000.0
         wage_type_id: hr_contract.hr_contract_monthly_gross

addons/hr_recruitment/test/test_hr_recruitment.yml

@@ -63,7 +63,7 @@
 -
   !record {model: hr.recruitment.job2phonecall, id: hr_recruitment_forinterview0}:
     user_id: base.user_root
-    deadline: '2010-05-28 11:51:00'
+    deadline: !eval time.strftime('%Y-%m-%d 11:51:00')
     note: 'For interview.'
     category_id: 'crm_case_categ_employee0'
 
@@ -84,8 +84,8 @@
   !record {model: crm.meeting, id: crm_meeting_fresher0}:
     alarm_id: base_calendar.alarm1
     count: 0.0
-    date: '2010-05-27 00:00:00'
+    date: !eval "'%s-%s-%s 00:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
-    date_deadline: '2010-05-27 08:00:00'
+    date_deadline: !eval "'%s-%s-%s 08:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)"
     day: 0.0
     duration: 8.0
     name: Fresher

addons/hr_timesheet/test/test_hr_timesheet.yml

@@ -79,7 +79,7 @@
   !record {model: hr.attendance, id: hr_attendance_0}:
     action: sign_in
     employee_id: 'hr_employee_fracline1'
-    name: '2010-05-26 10:08:08'
+    name: !eval time.strftime('%Y-%m-%d')+' '+'%s:%s:%s' %(datetime.now().hour-2,datetime.now().minute,datetime.now().second)
 
 -
   I create attendance and perform "Sign Out" action.
@@ -87,7 +87,7 @@
   !record {model: hr.attendance, id: hr_attendance_1}:
     action: sign_out
     employee_id: 'hr_employee_fracline1'
-    name: '2010-05-26 15:10:55'
+    name: !eval time.strftime('%Y-%m-%d')+' '+'%s:%s:%s' %(datetime.now().hour-1,datetime.now().minute,datetime.now().second)
 
 -
   On "Sign In/Sign Out by Project" wizard i click on "Sign In/Sign Out" button of this wizard.
@@ -99,8 +99,9 @@
   I select start date and Perform start work on project.
 -
   !python {model: hr.sign.in.project}: |
+      import time
       uid = ref('test_timesheet_user1')
-      new_id = self.create(cr, uid, {'emp_id': ref('hr_employee_fracline1'), 'name': 'Francline', 'server_date': '2010-06-08 19:50:54', 'state': 'absent'})
+      new_id = self.create(cr, uid, {'emp_id': ref('hr_employee_fracline1'), 'name': 'Francline', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'absent'})
       self.sign_in_result(cr, uid, [new_id], context)
 
 -
@@ -130,7 +131,7 @@
        import time
        from datetime import datetime, date, timedelta
        uid = ref('test_timesheet_user1')
-       new_id = self.create(cr, uid, {'account_id': ref('account_analytic_account_project0'), 'analytic_amount': 7.0, 'date': (datetime.now()+timedelta(1)).strftime('%Y-%m-%d %H:%M:%S'), 'date_start': '2010-06-05 16:37:00', 'info': 'Create Yaml for hr module', 'name': 'Francline', 'server_date': '2010-06-09 16:40:15', 'state': 'absent'})
+       new_id = self.create(cr, uid, {'account_id': ref('account_analytic_account_project0'), 'analytic_amount': 7.0, 'date': (datetime.now()+timedelta(1)).strftime('%Y-%m-%d %H:%M:%S'), 'date_start': time.strftime('%Y-%m-%d %H:%M:%S'), 'info': 'Create Yaml for hr module', 'name': 'Francline', 'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'absent'})
        self.sign_out_result_end(cr, uid, [new_id], context)
 
 - |

addons/hr_timesheet_invoice/report/account_analytic_profit.rml

@@ -176,7 +176,7 @@
     <blockTable colWidths="159.0,62.0,63.0,68.0,65.0,53.0,52.0" style="Table_Header_Employee">
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Employee or Journal Name</para>
+          <para style="terp_tblheader_Details">User or Journal Name</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Units</para>

addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml

@@ -7,7 +7,7 @@
     account_id: account.analytic_sednacom
     amount: -1.0
     company_id: base.main_company
-    date: '2010-05-30'
+    date: !eval time.strftime('%Y-%m-%d')
     general_account_id: account.a_expense
     journal_id: hr_timesheet.analytic_journal
     name: develop yaml for hr module

addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py

@@ -30,7 +30,7 @@ class account_analytic_profit(osv.osv_memory):
         'date_from': fields.date('From', required=True),
         'date_to': fields.date('To', required=True),
         'journal_ids': fields.many2many('account.analytic.journal', 'analytic_profit_journal_rel', 'analytic_id', 'journal_id', 'Journal', required=True),
-        'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'Employee', required=True),
+        'employee_ids': fields.many2many('res.users', 'analytic_profit_emp_rel', 'analytic_id', 'emp_id', 'User', required=True),
                 }
 
     def _date_from(*a):

addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml

@@ -8,13 +8,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
 				<form string="Timesheet Profit">
-					<group height="400" width="480">
+					<group height="420" width="370">
-						<group col="4" colspan="6">
+						<group col="4" colspan="4">
 							<field name="date_from"/>
 							<field name="date_to"/>
                             <separator string="Journals" colspan="4"/>
 							<field name="journal_ids" colspan="4" nolabel="1"/>
-                            <separator string="Employees" colspan="4"/>
+                            <separator string="Users" colspan="4"/>
 							<field name="employee_ids" colspan="4" nolabel="1"/>
 						</group>
 						<separator colspan="4"/>

addons/hr_timesheet_sheet/hr_timesheet_sheet.py

@@ -641,7 +641,7 @@ class hr_timesheet_sheet_sheet_day(osv.osv):
     _columns = {
         'name': fields.date('Date', readonly=True),
         'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True, select="1"),
-        'total_timesheet': fields.float('Project Timesheet', readonly=True),
+        'total_timesheet': fields.float('Total Timesheet', readonly=True),
         'total_attendance': fields.float('Attendance', readonly=True),
         'total_difference': fields.float('Difference', readonly=True),
     }

addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
        <record id="hr_timesheet_sheet_graph" model="ir.ui.view">
          <field name="name">hr.timesheet.sheet.graph</field>
          <field name="model">hr_timesheet_sheet.sheet</field>
@@ -26,7 +27,20 @@
                 </form>
             </field>
         </record>
-
+        <record id="hr_timesheet_account_filter" model="ir.ui.view">
+            <field name="name">hr.timesheet.account.filter</field>
+            <field name="model">hr_timesheet_sheet.sheet.account</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Account">
+                    <group col="10" colspan="4">
+                        <field name="sheet_id" />
+                        <field name="name" groups="analytic.group_analytic_accounting"/>
+                        <field name="invoice_rate"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="hr_timesheet_account_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.account.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>

addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot

@@ -207,11 +207,6 @@ msgstr ""
 msgid "Analytic Account"
 msgstr ""
 
-#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
-msgid "Project Timesheet"
-msgstr ""
-
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
@@ -418,6 +413,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
 #: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
 msgstr ""
 

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

@@ -6,3 +6,4 @@
 "access_hr_timesheet_report","hr.timesheet.report","model_hr_timesheet_report","base.group_hr_manager",1,1,1,1
 "access_hr_analytic_timesheet_system_user","hr.analytic.timesheet.system.user","model_hr_analytic_timesheet","base.group_user",1,0,0,0
 "access_hr_timesheet_sheet_sheet_day","hr.timesheet.sheet.sheet.day.user","model_hr_timesheet_sheet_sheet_day","base.group_user",1,0,0,0
+"access_timesheet_report","timesheet.report","model_timesheet_report","base.group_hr_manager",1,1,1,1

addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml

@@ -64,10 +64,10 @@
   I create my current timesheet for "Mark Johnson".
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
-    date_current: '2010-05-26'
+    date_current: !eval "'%s-05-26' %(datetime.now().year)"
-    date_from: '2010-05-01'
+    date_from: !eval "'%s-05-01' %(datetime.now().year)"
-    date_to: '2010-05-31'
+    date_to: !eval "'%s-05-31' %(datetime.now().year)"
-    name: Week-22(2010)
+    name: !eval "'Week-22(%s)' %(datetime.now().year)"
     state: new
     user_id: base.user_root
     employee_id: 'hr_employee_employee0'
@@ -77,7 +77,7 @@
   !record {model: hr.attendance, id: hr_attendance_0}:
     action: sign_in
     employee_id: 'hr_employee_employee0'
-    name: '2010-05-26 10:08:08'
+    name: !eval "'%s-05-26 10:08:08' %(datetime.now().year)"
 
 -
   At the time of logout, I create attendance and perform "Sign Out".
@@ -85,7 +85,7 @@
   !record {model: hr.attendance, id: hr_attendance_1}:
     action: sign_out
     employee_id: 'hr_employee_employee0'
-    name: '2010-05-26 15:10:55'
+    name: !eval "'%s-05-26 15:10:55' %(datetime.now().year)"
 
 -
   I create Timesheet Entry for time spend on today work.
@@ -94,7 +94,7 @@
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     timesheet_ids:
       - account_id: account.analytic_sednacom
-        date: '2010-05-26'
+        date: !eval "'%s-05-26' %(datetime.now().year)"
         name: 'Develop yaml for hr module'
         unit_amount: 3.00
         amount: -90.00
@@ -125,7 +125,7 @@
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
     timesheet_ids:
       - account_id: account.analytic_sednacom
-        date: '2010-05-26'
+        date: !eval "'%s-05-26' %(datetime.now().year)"
         name: 'Develop yaml for hr module'
         unit_amount: 2.0
         amount: -90.00

addons/idea/test/test_idea.yml

@@ -11,7 +11,7 @@
 - 
   !record {model: idea.idea, id: idea_idea_0}: 
     category_id: idea_category_technical0
-    created_date: '2010-05-13 19:16:26'
+    created_date: !eval time.strftime('%Y-%m-%d %H:%M:%S')
     description: I want that Technical presentation are arranged for 1 hours in every
       day.\nso, on that presentation, we can know all things what improvement and development
       are done in our company.\n\n\n\n\n

addons/l10n_br/i18n/l10n_br.pot

@@ -0,0 +1,29 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_br
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-07 06:40:10+0000\n"
+"PO-Revision-Date: 2011-01-07 06:40:10+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_br
+#: model:ir.actions.todo,note:l10n_br.config_call_account_template_brazilian_localization
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
+"    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_br
+#: model:ir.module.module,description:l10n_br.module_meta_information
+#: model:ir.module.module,shortdesc:l10n_br.module_meta_information
+msgid "Brazilian Localization"
+msgstr ""
+

addons/l10n_cn/i18n/l10n_cn.pot

@@ -0,0 +1,36 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_cn
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-07 05:27:59+0000\n"
+"PO-Revision-Date: 2011-01-07 05:27:59+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_cn
+#: model:ir.module.module,shortdesc:l10n_cn.module_meta_information
+msgid "中国会计科目表"
+msgstr ""
+
+#. module: l10n_cn
+#: model:ir.module.module,description:l10n_cn.module_meta_information
+msgid "\n"
+"        添加中文省份数据\n"
+"        科目类型\\会计科目表模板\\增值税\\辅助核算类别\\管理会计凭证簿\\财务会计凭证簿\n"
+"    "
+msgstr ""
+
+#. module: l10n_cn
+#: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
+"	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgstr ""
+

addons/l10n_cr/i18n/l10n_cr.pot

@@ -0,0 +1,159 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_cr
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-07 05:56:37+0000\n"
+"PO-Revision-Date: 2011-01-07 05:56:37+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_ing
+msgid "Ingeniero/a"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_dr
+msgid "Doctor"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_lic
+msgid "Licenciado"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_sal
+msgid "S.A.L."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_dr
+msgid "Dr."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_sal
+msgid "Sociedad Anónima Laboral"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_licda
+msgid "Licenciada"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_dra
+msgid "Doctora"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_lic
+msgid "Lic."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_gov
+msgid "Government"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_edu
+msgid "Educational Institution"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_mba
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_mba
+msgid "MBA"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_msc
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_msc
+msgid "Msc."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_dra
+msgid "Dra."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_indprof
+msgid "Ind. Prof."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_ing
+msgid "Ing."
+msgstr ""
+
+#. module: l10n_cr
+#: model:ir.module.module,shortdesc:l10n_cr.module_meta_information
+msgid "Costa Rica - Chart of Accounts"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_prof
+msgid "Professor"
+msgstr ""
+
+#. module: l10n_cr
+#: model:ir.module.module,description:l10n_cr.module_meta_information
+msgid "Chart of accounts for Costa Rica\n"
+"Includes:\n"
+"* account.type\n"
+"* account.account.template\n"
+"* account.tax.template\n"
+"* account.tax.code.template\n"
+"* account.chart.template\n"
+"\n"
+"Everything is in English with Spanish translation. Further translations are welcome, please go to\n"
+"http://translations.launchpad.net/openerp-costa-rica\n"
+"    "
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_gov
+msgid "Gov."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_licda
+msgid "Licda."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_prof
+msgid "Prof."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_asoc
+msgid "Asociation"
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_asoc
+msgid "Asoc."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,shortcut:l10n_cr.res_partner_title_edu
+msgid "Edu."
+msgstr ""
+
+#. module: l10n_cr
+#: model:res.partner.title,name:l10n_cr.res_partner_title_indprof
+msgid "Independant Professional"
+msgstr ""
+

addons/l10n_de/account_chart_skr04.xml

@@ -603,7 +603,7 @@
       <field name="name">Konzessionen- gewerbliche Schutzrechte und ähnliche Rechte und Werte sowie Lizenzen an solchen Rechten und Werten</field>
       <field name="parent_id" ref="chart_skr04_K0BA31"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -733,7 +733,7 @@
       <field name="name">Grundstücke- grundstücksgleiche Rechte und Bauten einschließlich der Bauten auf fremden Grundstücken</field>
       <field name="parent_id" ref="chart_skr04_K0BA41"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -1011,7 +1011,7 @@
       <field name="name">Technische Anlagen und Maschinen</field>
       <field name="parent_id" ref="chart_skr04_K0BA42"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -1064,7 +1064,7 @@
       <field name="name">Andere Anlagen- Betriebs- und Geschäftsaustattung</field>
       <field name="parent_id" ref="chart_skr04_K0BA43"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -1180,7 +1180,7 @@
       <field name="name">Geleistete Anzahlungen und Anlagen im Bau</field>
       <field name="parent_id" ref="chart_skr04_K0BA44"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -1365,7 +1365,7 @@
       <field name="name">Beteiligungen</field>
       <field name="parent_id" ref="chart_skr04_K0BA53"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -1444,7 +1444,7 @@
       <field name="name">Wertpapiere des Anlagevermögens</field>
       <field name="parent_id" ref="chart_skr04_K0BA55"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -1479,7 +1479,7 @@
       <field name="name">Sonstige Ausleihungen</field>
       <field name="parent_id" ref="chart_skr04_K0BA56"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -3225,7 +3225,7 @@
       <field name="name">Geleistete Anzahlungen auf Vorräte</field>
       <field name="parent_id" ref="chart_skr04_K1BA16"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -3303,7 +3303,7 @@
       <field name="name">Forderungen aus Lieferungen und Leistungen </field>
       <field name="parent_id" ref="chart_skr04_K1BA21"/>
       <field name="reconcile" eval="True"/>
-      <field name="type">receivable</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -3321,7 +3321,7 @@
       <field name="name">Forderungen aus Lieferungen und Leistungen ohne Kontokorent</field>
       <field name="parent_id" ref="chart_skr04_1200"/>
       <field name="reconcile" eval="True"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -3606,7 +3606,7 @@
       <field name="name">Forderungen gegen verbundene Unternehmen </field>
       <field name="parent_id" ref="chart_skr04_K1BA24"/>
       <field name="reconcile" eval="True"/>
-      <field name="type">receivable</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -3730,7 +3730,7 @@
       <field name="name">Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
       <field name="parent_id" ref="chart_skr04_K1BA26"/>
       <field name="reconcile" eval="True"/>
-      <field name="type">receivable</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -3888,7 +3888,7 @@
       <field name="name">Sonstige Vermögensgegenstände</field>
       <field name="parent_id" ref="chart_skr04_K1BA2a"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -4674,7 +4674,7 @@
       <field name="name">Sonstige Wertpapiere</field>
       <field name="parent_id" ref="chart_skr04_K1BA33"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -4735,7 +4735,7 @@
       <field name="name">Kasse </field>
       <field name="parent_id" ref="chart_skr04_K1BA41"/>
       <field name="reconcile" eval="True"/>
-      <field name="type">liquidity</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -4913,7 +4913,7 @@
       <field name="name">Aktive Rechnungsabgrenzung</field>
       <field name="parent_id" ref="chart_skr04_K1BA51"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_asset"/>
     </record>
     
@@ -5326,7 +5326,7 @@
       <field name="name">Kapitalrücklage</field>
       <field name="parent_id" ref="chart_skr04_K2BP61"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -5447,7 +5447,7 @@
       <field name="name">Andere Gewinnrücklagen </field>
       <field name="parent_id" ref="chart_skr04_K2BP74"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -5744,7 +5744,7 @@
       <field name="name">Rückstellungen für Pensionen und ähnliche Verpflichtungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP11"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -5779,7 +5779,7 @@
       <field name="name">Steuerrückstellungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP12"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -5823,7 +5823,7 @@
       <field name="name">Sonstige Rückstellungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP13"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -5938,7 +5938,7 @@
       <field name="name">Anleihen- nicht konvertibel</field>
       <field name="parent_id" ref="chart_skr04_K3BP21"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -6018,7 +6018,7 @@
       <field name="name">Verbindlichkeiten gegenüber Kreditinstituten </field>
       <field name="parent_id" ref="chart_skr04_K3BP22"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -6124,7 +6124,7 @@
       <field name="name">Erhaltene Anzahlungen auf Bestellungen</field>
       <field name="parent_id" ref="chart_skr04_K3BP24"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -6204,7 +6204,7 @@
       <field name="name">Verbindlichkeiten aus Lieferungen und Leistungen </field>
       <field name="parent_id" ref="chart_skr04_K3BP25"/>
       <field name="reconcile" eval="True"/>
-      <field name="type">payable</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -6364,7 +6364,7 @@
       <field name="name">Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel</field>
       <field name="parent_id" ref="chart_skr04_K3BP27"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -6408,7 +6408,7 @@
       <field name="name">Verbindlichkeiten gegenüber verbundenen Unternehmen</field>
       <field name="parent_id" ref="chart_skr04_K3BP28"/>
       <field name="reconcile" eval="True"/>
-      <field name="type">payable</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -6479,7 +6479,7 @@
       <field name="code">K3BP29</field>
       <field name="name">Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht oder Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht</field>
       <field name="parent_id" ref="chart_skr04_K3BP2"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
     
@@ -6488,7 +6488,7 @@
       <field name="name">Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht </field>
       <field name="parent_id" ref="chart_skr04_K3BP29"/>
       <field name="reconcile" eval="True"/>
-      <field name="type">payable</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -6568,7 +6568,7 @@
       <field name="name">Sonstige Verbindlichkeiten</field>
       <field name="parent_id" ref="chart_skr04_K3BP2a"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -7088,7 +7088,7 @@
       <field name="name">Lohn- und Gehaltsverrechnungskonto</field>
       <field name="parent_id" ref="chart_skr04_K3BP2b"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_liability"/>
     </record>
     
@@ -7996,7 +7996,7 @@
       <field name="code">K4GVE22</field>
       <field name="name">Sonstige betriebliche Erträge</field>
       <field name="parent_id" ref="chart_skr04_K4GVE2"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_view"/>
     </record>
     
@@ -10182,7 +10182,7 @@
       <field name="name">Soziale Abgaben und Aufwendungen für Altersversorgung und für Unterstützung</field>
       <field name="parent_id" ref="chart_skr04_K6GVA12"/>
       <field name="reconcile" eval="False"/>
-      <field name="type">other</field>
+      <field name="type">view</field>
       <field name="user_type" ref="account.account_type_expense"/>
     </record>
     

addons/l10n_ec/account_chart.xml

@@ -1428,7 +1428,7 @@
 	  <field name="code">15.01</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="15" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="150101">
@@ -1452,7 +1452,7 @@
 	  <field name="code">15.02</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="15" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="150201">
@@ -1540,7 +1540,7 @@
 	  <field name="code">17.02</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_view" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="17" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="170201">
@@ -3854,7 +3854,7 @@
 	  <field name="code">74.01.01</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="7401" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="74010101">
@@ -3886,7 +3886,7 @@
 	  <field name="code">74.01.02</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="7401" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="74010201">
@@ -3926,7 +3926,7 @@
 	  <field name="code">74.02.01</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="7402" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="74020101">
@@ -3934,7 +3934,7 @@
 	  <field name="code">74.02.01.01</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="740201" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="7402010101">
@@ -3958,7 +3958,7 @@
 	  <field name="code">74.02.01.02</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="740201" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="7402010201">
@@ -3990,7 +3990,7 @@
 	  <field name="code">74.02.02.01</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="740202" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="7402020101">
@@ -4038,7 +4038,7 @@
 	  <field name="code">74.02.02.02</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="740202" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="7402020201">
@@ -4078,7 +4078,7 @@
 	  <field name="code">74.02.02.03</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="740202" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="7402020301">
@@ -4118,7 +4118,7 @@
 	  <field name="code">74.02.02.04</field>
 	  <field name="reconcile" eval="False"/>
 	  <field ref="account_type_asset" name="user_type"/>
-	  <field name="type">other</field>
+	  <field name="type">view</field>
 	  <field ref="740202" name="parent_id"/>
 	</record>
 	<record model="account.account.template" id="7402020401">

addons/l10n_ec/i18n/l10n_ec.pot

@@ -0,0 +1,35 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_ec
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-07 06:01:29+0000\n"
+"PO-Revision-Date: 2011-01-07 06:01:29+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_ec
+#: model:ir.module.module,shortdesc:l10n_ec.module_meta_information
+msgid "Ecuador - Accounting Chart"
+msgstr ""
+
+#. module: l10n_ec
+#: model:ir.module.module,description:l10n_ec.module_meta_information
+msgid "\n"
+"    This is the base module to manage the accounting chart for Ecuador in OpenERP.\n"
+"    "
+msgstr ""
+
+#. module: l10n_ec
+#: model:ir.actions.todo,note:l10n_ec.config_call_account_template_ec
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
+"	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgstr ""
+

addons/l10n_in/l10n_in_chart.xml

@@ -117,7 +117,7 @@
         <record model="account.account.template" id="IA_AC01121">
             <field name="name">Cash Account</field>
             <field name="code">IA_AC01121</field>
-            <field name="type">liquidity</field>
+            <field name="type">view</field>
             <field name="user_type" ref="account_type_asset1"/>
             <field name="reconcile" eval="False"/>
             <field name="parent_id" ref="IA_AC0112"/>

addons/l10n_it/data/account.account.template.csv

@@ -1,234 +1,234 @@
 "id","code","name","parent_id:id","user_type:id","type","reconcile"
-"0","0","Azienda",,"account_type_view","view","FALSE"
+0,0,"Azienda",,"account_type_view","view",FALSE
-"1","1","ATTIVO ","0","account_type_view","view","TRUE"
+1,1,"ATTIVO ",0,"account_type_view","view",TRUE
-"11","11","IMMOBILIZZAZIONI IMMATERIALI ","1","account_type_view","view","TRUE"
+11,11,"IMMOBILIZZAZIONI IMMATERIALI ",1,"account_type_view","view",TRUE
-"1101","1101","costi di impianto ","11","account_type_view","other","TRUE"
+1101,1101,"costi di impianto ",11,"account_type_view","other",TRUE
-"1106","1106","software ","11","account_type_view","other","TRUE"
+1106,1106,"software ",11,"account_type_view","other",TRUE
-"1108","1108","avviamento ","11","account_type_view","other","TRUE"
+1108,1108,"avviamento ",11,"account_type_view","other",TRUE
-"1111","1111","fondo ammortamento costi di impianto ","11","account_type_view","other","TRUE"
+1111,1111,"fondo ammortamento costi di impianto ",11,"account_type_view","other",TRUE
-"1116","1116","fondo ammortamento software ","11","account_type_view","other","TRUE"
+1116,1116,"fondo ammortamento software ",11,"account_type_view","other",TRUE
-"1118","1118","fondo ammortamento avviamento ","11","account_type_view","other","TRUE"
+1118,1118,"fondo ammortamento avviamento ",11,"account_type_view","other",TRUE
-"12","12","IMMOBILIZZAZIONI MATERIALI ","1","account_type_view","view","TRUE"
+12,12,"IMMOBILIZZAZIONI MATERIALI ",1,"account_type_view","view",TRUE
-"1201","1201","fabbricati ","12","account_type_view","other","TRUE"
+1201,1201,"fabbricati ",12,"account_type_view","other",TRUE
-"1202","1202","impianti e macchinari ","12","account_type_view","other","TRUE"
+1202,1202,"impianti e macchinari ",12,"account_type_view","other",TRUE
-"1204","1204","attrezzature commerciali ","12","account_type_view","other","TRUE"
+1204,1204,"attrezzature commerciali ",12,"account_type_view","other",TRUE
-"1205","1205","macchine d'ufficio ","12","account_type_view","other","TRUE"
+1205,1205,"macchine d'ufficio ",12,"account_type_view","other",TRUE
-"1206","1206","arredamento ","12","account_type_view","other","TRUE"
+1206,1206,"arredamento ",12,"account_type_view","other",TRUE
-"1207","1207","automezzi ","12","account_type_view","other","TRUE"
+1207,1207,"automezzi ",12,"account_type_view","other",TRUE
-"1208","1208","imballaggi durevoli ","12","account_type_view","other","TRUE"
+1208,1208,"imballaggi durevoli ",12,"account_type_view","other",TRUE
-"1211","1211","fondo ammortamento fabbricati ","12","account_type_view","other","TRUE"
+1211,1211,"fondo ammortamento fabbricati ",12,"account_type_view","other",TRUE
-"1212","1212","fondo ammortamento impianti e macchinari ","12","account_type_view","other","TRUE"
+1212,1212,"fondo ammortamento impianti e macchinari ",12,"account_type_view","other",TRUE
-"1214","1214","fondo ammortamento attrezzature commerciali ","12","account_type_view","other","TRUE"
+1214,1214,"fondo ammortamento attrezzature commerciali ",12,"account_type_view","other",TRUE
-"1215","1215","fondo ammortamento macchine d'ufficio ","12","account_type_view","other","TRUE"
+1215,1215,"fondo ammortamento macchine d'ufficio ",12,"account_type_view","other",TRUE
-"1216","1216","fondo ammortamento arredamento ","12","account_type_view","other","TRUE"
+1216,1216,"fondo ammortamento arredamento ",12,"account_type_view","other",TRUE
-"1217","1217","fondo ammortamento automezzi ","12","account_type_view","other","TRUE"
+1217,1217,"fondo ammortamento automezzi ",12,"account_type_view","other",TRUE
-"1218","1218","fondo ammortamento imballaggi durevoli ","12","account_type_view","other","TRUE"
+1218,1218,"fondo ammortamento imballaggi durevoli ",12,"account_type_view","other",TRUE
-"1220","1220","fornitori immobilizzazioni c/acconti ","12","account_type_view","other","TRUE"
+1220,1220,"fornitori immobilizzazioni c/acconti ",12,"account_type_view","other",TRUE
-"13","13","IMMOBILIZZAZIONI FINANZIARIE ","1","account_type_view","view","TRUE"
+13,13,"IMMOBILIZZAZIONI FINANZIARIE ",1,"account_type_view","view",TRUE
-"1301","1301","mutui attivi ","13","account_type_view","other","TRUE"
+1301,1301,"mutui attivi ",13,"account_type_view","other",TRUE
-"14","14","RIMANENZE ","1","account_type_view","view","TRUE"
+14,14,"RIMANENZE ",1,"account_type_view","view",TRUE
-"1401","1401","materie di consumo ","14","account_type_view","other","TRUE"
+1401,1401,"materie di consumo ",14,"account_type_view","other",TRUE
-"1404","1404","merci ","14","account_type_view","other","TRUE"
+1404,1404,"merci ",14,"account_type_view","other",TRUE
-"1410","1410","fornitori c/acconti ","14","account_type_view","other","TRUE"
+1410,1410,"fornitori c/acconti ",14,"account_type_view","other",TRUE
-"15","15","CREDITI COMMERCIALI ","1","account_type_view","view","TRUE"
+15,15,"CREDITI COMMERCIALI ",1,"account_type_view","view",TRUE
-"1501","1501","crediti v/clienti ","15","account_type_receivable","receivable","TRUE"
+1501,1501,"crediti v/clienti ",15,"account_type_receivable","receivable",TRUE
-"1502","1502","crediti commerciali diversi ","15","account_type_receivable","other","TRUE"
+1502,1502,"crediti commerciali diversi ",15,"account_type_receivable","other",TRUE
-"1503","1503","clienti c/spese anticipate ","15","account_type_receivable","receivable","TRUE"
+1503,1503,"clienti c/spese anticipate ",15,"account_type_receivable","receivable",TRUE
-"1505","1505","cambiali attive ","15","account_type_receivable","other","TRUE"
+1505,1505,"cambiali attive ",15,"account_type_receivable","other",TRUE
-"1506","1506","cambiali allo sconto ","15","account_type_receivable","other","TRUE"
+1506,1506,"cambiali allo sconto ",15,"account_type_receivable","other",TRUE
-"1507","1507","cambiali all'incasso ","15","account_type_receivable","other","TRUE"
+1507,1507,"cambiali all'incasso ",15,"account_type_receivable","other",TRUE
-"1509","1509","fatture da emettere ","15","account_type_receivable","other","TRUE"
+1509,1509,"fatture da emettere ",15,"account_type_receivable","other",TRUE
-"1510","1510","crediti insoluti ","15","account_type_receivable","other","TRUE"
+1510,1510,"crediti insoluti ",15,"account_type_receivable","other",TRUE
-"1511","1511","cambiali insolute ","15","account_type_receivable","other","TRUE"
+1511,1511,"cambiali insolute ",15,"account_type_receivable","other",TRUE
-"1531","1531","crediti da liquidare ","15","account_type_receivable","other","TRUE"
+1531,1531,"crediti da liquidare ",15,"account_type_receivable","other",TRUE
-"1540","1540","fondo svalutazione crediti ","15","account_type_receivable","other","TRUE"
+1540,1540,"fondo svalutazione crediti ",15,"account_type_receivable","other",TRUE
-"1541","1541","fondo rischi su crediti ","15","account_type_receivable","other","TRUE"
+1541,1541,"fondo rischi su crediti ",15,"account_type_receivable","other",TRUE
-"16","16","CREDITI DIVERSI ","1","account_type_view","view","TRUE"
+16,16,"CREDITI DIVERSI ",1,"account_type_view","view",TRUE
-"1601","1601","IVA n/credito ","16","account_type_receivable","other","TRUE"
+1601,1601,"IVA n/credito ",16,"account_type_receivable","other",TRUE
-"1602","1602","IVA c/acconto ","16","account_type_receivable","other","TRUE"
+1602,1602,"IVA c/acconto ",16,"account_type_receivable","other",TRUE
-"1605","1605","crediti per IVA ","16","account_type_receivable","other","TRUE"
+1605,1605,"crediti per IVA ",16,"account_type_receivable","other",TRUE
-"1607","1607","imposte c/acconto ","16","account_type_receivable","other","TRUE"
+1607,1607,"imposte c/acconto ",16,"account_type_receivable","other",TRUE
-"1608","1608","crediti per imposte ","16","account_type_receivable","other","TRUE"
+1608,1608,"crediti per imposte ",16,"account_type_receivable","other",TRUE
-"1609","1609","crediti per ritenute subite ","16","account_type_receivable","other","TRUE"
+1609,1609,"crediti per ritenute subite ",16,"account_type_receivable","other",TRUE
-"1610","1610","crediti per cauzioni ","16","account_type_receivable","other","TRUE"
+1610,1610,"crediti per cauzioni ",16,"account_type_receivable","other",TRUE
-"1620","1620","personale c/acconti ","16","account_type_receivable","other","TRUE"
+1620,1620,"personale c/acconti ",16,"account_type_receivable","other",TRUE
-"1630","1630","crediti v/istituti previdenziali ","16","account_type_receivable","other","TRUE"
+1630,1630,"crediti v/istituti previdenziali ",16,"account_type_receivable","other",TRUE
-"1640","1640","debitori diversi ","16","account_type_receivable","receivable","TRUE"
+1640,1640,"debitori diversi ",16,"account_type_receivable","receivable",TRUE
-"18","18","DISPONIBILITÀ LIQUIDE ","1","account_type_view","view","TRUE"
+18,18,"DISPONIBILITÀ LIQUIDE ",1,"account_type_view","view",TRUE
-"1801","1801","banche c/c ","18","account_type_bank","liquidity","TRUE"
+1801,1801,"banche c/c ",18,"account_type_bank","liquidity",TRUE
-"1810","1810","c/c postali ","18","account_type_cash","liquidity","TRUE"
+1810,1810,"c/c postali ",18,"account_type_cash","liquidity",TRUE
-"1820","1820","denaro in cassa ","18","account_type_cash","liquidity","TRUE"
+1820,1820,"denaro in cassa ",18,"account_type_cash","liquidity",TRUE
-"1821","1821","assegni ","18","account_type_cash","liquidity","TRUE"
+1821,1821,"assegni ",18,"account_type_cash","liquidity",TRUE
-"1822","1822","valori bollati ","18","account_type_cash","liquidity","TRUE"
+1822,1822,"valori bollati ",18,"account_type_cash","liquidity",TRUE
-"19","19","RATEI E RISCONTI ATTIVI ","1","account_type_view","view","TRUE"
+19,19,"RATEI E RISCONTI ATTIVI ",1,"account_type_view","view",TRUE
-"1901","1901","ratei attivi ","19","account_type_view","other","TRUE"
+1901,1901,"ratei attivi ",19,"account_type_view","other",TRUE
-"1902","1902","risconti attivi ","19","account_type_view","other","TRUE"
+1902,1902,"risconti attivi ",19,"account_type_view","other",TRUE
-"2","2","PASSIVO ","0","account_type_view","view","TRUE"
+2,2,"PASSIVO ",0,"account_type_view","view",TRUE
-"20","20","PATRIMONIO NETTO ","2","account_type_view","view","TRUE"
+20,20,"PATRIMONIO NETTO ",2,"account_type_view","view",TRUE
-"2101","2101","patrimonio netto ","20","account_type_view","other","TRUE"
+2101,2101,"patrimonio netto ",20,"account_type_view","other",TRUE
-"2102","2102","utile d'esercizio ","20","account_type_view","receivable","TRUE"
+2102,2102,"utile d'esercizio ",20,"account_type_view","receivable",TRUE
-"2103","2103","perdita d'esercizio ","20","account_type_view","payable","TRUE"
+2103,2103,"perdita d'esercizio ",20,"account_type_view","payable",TRUE
-"2104","2104","prelevamenti extra gestione ","20","account_type_view","other","TRUE"
+2104,2104,"prelevamenti extra gestione ",20,"account_type_view","other",TRUE
-"2105","2105","titolare c/ritenute subite ","20","account_type_view","other","TRUE"
+2105,2105,"titolare c/ritenute subite ",20,"account_type_view","other",TRUE
-"22","22","FONDI PER RISCHI E ONERI ","2","account_type_view","view","TRUE"
+22,22,"FONDI PER RISCHI E ONERI ",2,"account_type_view","view",TRUE
-"2201","2201","fondo per imposte ","22","account_type_view","other","TRUE"
+2201,2201,"fondo per imposte ",22,"account_type_view","other",TRUE
-"2204","2204","fondo responsabilità civile ","22","account_type_view","other","TRUE"
+2204,2204,"fondo responsabilità civile ",22,"account_type_view","other",TRUE
-"2205","2205","fondo spese future ","22","account_type_view","other","TRUE"
+2205,2205,"fondo spese future ",22,"account_type_view","other",TRUE
-"2211","2211","fondo manutenzioni programmate ","22","account_type_view","other","TRUE"
+2211,2211,"fondo manutenzioni programmate ",22,"account_type_view","other",TRUE
-"23","23","TRATTAMENTO FINE RAPPORTO DI LAVORO ","2","account_type_view","view","TRUE"
+23,23,"TRATTAMENTO FINE RAPPORTO DI LAVORO ",2,"account_type_view","view",TRUE
-"2301","2301","debiti per TFRL ","23","account_type_view","other","TRUE"
+2301,2301,"debiti per TFRL ",23,"account_type_view","other",TRUE
-"24","24","DEBITI FINANZIARI ","2","account_type_view","view","TRUE"
+24,24,"DEBITI FINANZIARI ",2,"account_type_view","view",TRUE
-"2410","2410","mutui passivi ","24","account_type_payable","other","TRUE"
+2410,2410,"mutui passivi ",24,"account_type_payable","other",TRUE
-"2411","2411","banche c/sovvenzioni ","24","account_type_payable","other","TRUE"
+2411,2411,"banche c/sovvenzioni ",24,"account_type_payable","other",TRUE
-"2420","2420","banche c/c passivi ","24","account_type_payable","other","TRUE"
+2420,2420,"banche c/c passivi ",24,"account_type_payable","other",TRUE
-"2421","2421","banche c/RIBA all'incasso ","24","account_type_payable","other","TRUE"
+2421,2421,"banche c/RIBA all'incasso ",24,"account_type_payable","other",TRUE
-"2422","2422","banche c/cambiali all'incasso ","24","account_type_payable","other","TRUE"
+2422,2422,"banche c/cambiali all'incasso ",24,"account_type_payable","other",TRUE
-"2423","2423","banche c/anticipi su fatture ","24","account_type_payable","other","TRUE"
+2423,2423,"banche c/anticipi su fatture ",24,"account_type_payable","other",TRUE
-"2440","2440","debiti v/altri finanziatori ","24","account_type_payable","other","TRUE"
+2440,2440,"debiti v/altri finanziatori ",24,"account_type_payable","other",TRUE
-"25","25","DEBITI COMMERCIALI ","2","account_type_view","view","TRUE"
+25,25,"DEBITI COMMERCIALI ",2,"account_type_view","view",TRUE
-"2501","2501","debiti v/fornitori ","25","account_type_payable","payable","TRUE"
+2501,2501,"debiti v/fornitori ",25,"account_type_payable","payable",TRUE
-"2503","2503","cambiali passive ","25","account_type_payable","other","TRUE"
+2503,2503,"cambiali passive ",25,"account_type_payable","other",TRUE
-"2520","2520","fatture da ricevere ","25","account_type_payable","other","TRUE"
+2520,2520,"fatture da ricevere ",25,"account_type_payable","other",TRUE
-"2521","2521","debiti da liquidare ","25","account_type_payable","other","TRUE"
+2521,2521,"debiti da liquidare ",25,"account_type_payable","other",TRUE
-"2530","2530","clienti c/acconti ","25","account_type_payable","payable","TRUE"
+2530,2530,"clienti c/acconti ",25,"account_type_payable","payable",TRUE
-"26","26","DEBITI DIVERSI ","2","account_type_view","view","TRUE"
+26,26,"DEBITI DIVERSI ",2,"account_type_view","view",TRUE
-"2601","2601","IVA n/debito ","26","account_type_payable","other","TRUE"
+2601,2601,"IVA n/debito ",26,"account_type_payable","other",TRUE
-"2602","2602","debiti per ritenute da versare ","26","account_type_payable","other","TRUE"
+2602,2602,"debiti per ritenute da versare ",26,"account_type_payable","other",TRUE
-"2605","2605","erario c/IVA ","26","account_type_payable","other","TRUE"
+2605,2605,"erario c/IVA ",26,"account_type_payable","other",TRUE
-"2606","2606","debiti per imposte ","26","account_type_payable","other","TRUE"
+2606,2606,"debiti per imposte ",26,"account_type_payable","other",TRUE
-"2619","2619","debiti per cauzioni ","26","account_type_payable","other","TRUE"
+2619,2619,"debiti per cauzioni ",26,"account_type_payable","other",TRUE
-"2620","2620","personale c/retribuzioni ","26","account_type_payable","other","TRUE"
+2620,2620,"personale c/retribuzioni ",26,"account_type_payable","other",TRUE
-"2621","2621","personale c/liquidazioni ","26","account_type_payable","other","TRUE"
+2621,2621,"personale c/liquidazioni ",26,"account_type_payable","other",TRUE
-"2622","2622","clienti c/cessione ","26","account_type_payable","other","TRUE"
+2622,2622,"clienti c/cessione ",26,"account_type_payable","other",TRUE
-"2630","2630","debiti v/istituti previdenziali ","26","account_type_payable","other","TRUE"
+2630,2630,"debiti v/istituti previdenziali ",26,"account_type_payable","other",TRUE
-"2640","2640","creditori diversi ","26","account_type_payable","payable","TRUE"
+2640,2640,"creditori diversi ",26,"account_type_payable","payable",TRUE
-"27","27","RATEI E RISCONTI PASSIVI ","2","account_type_view","view","TRUE"
+27,27,"RATEI E RISCONTI PASSIVI ",2,"account_type_view","view",TRUE
-"2701","2701","ratei passivi ","27","account_type_view","other","TRUE"
+2701,2701,"ratei passivi ",27,"account_type_view","other",TRUE
-"2702","2702","risconti passivi ","27","account_type_view","other","TRUE"
+2702,2702,"risconti passivi ",27,"account_type_view","other",TRUE
-"28","28","CONTI TRANSITORI E DIVERSI ","2","account_type_view","view","TRUE"
+28,28,"CONTI TRANSITORI E DIVERSI ",2,"account_type_view","view",TRUE
-"2801","2801","bilancio di apertura ","28","account_type_view","other","TRUE"
+2801,2801,"bilancio di apertura ",28,"account_type_view","other",TRUE
-"2802","2802","bilancio di chiusura ","28","account_type_view","other","TRUE"
+2802,2802,"bilancio di chiusura ",28,"account_type_view","other",TRUE
-"2810","2810","IVA c/liquidazioni ","28","account_type_view","other","TRUE"
+2810,2810,"IVA c/liquidazioni ",28,"account_type_view","other",TRUE
-"2811","2811","istituti previdenziali ","28","account_type_view","other","TRUE"
+2811,2811,"istituti previdenziali ",28,"account_type_view","other",TRUE
-"2820","2820","banca ... c/c ","28","account_type_view","other","TRUE"
+2820,2820,"banca ... c/c ",28,"account_type_view","other",TRUE
-"2821","2821","banca ... c/c ","28","account_type_view","other","TRUE"
+2821,2821,"banca ... c/c ",28,"account_type_view","other",TRUE
-"2822","2822","banca ... c/c ","28","account_type_view","other","TRUE"
+2822,2822,"banca ... c/c ",28,"account_type_view","other",TRUE
-"29","29","CONTI DEI SISTEMI SUPPLEMENTARI ","2","account_type_view","view","TRUE"
+29,29,"CONTI DEI SISTEMI SUPPLEMENTARI ",2,"account_type_view","view",TRUE
-"2901","2901","beni di terzi ","29","account_type_view","other","TRUE"
+2901,2901,"beni di terzi ",29,"account_type_view","other",TRUE
-"2902","2902","depositanti beni ","29","account_type_view","other","TRUE"
+2902,2902,"depositanti beni ",29,"account_type_view","other",TRUE
-"2911","2911","merci da ricevere ","29","account_type_view","other","TRUE"
+2911,2911,"merci da ricevere ",29,"account_type_view","other",TRUE
-"2912","2912","fornitori c/impegni ","29","account_type_view","other","TRUE"
+2912,2912,"fornitori c/impegni ",29,"account_type_view","other",TRUE
-"2913","2913","impegni per beni in leasing ","29","account_type_view","other","TRUE"
+2913,2913,"impegni per beni in leasing ",29,"account_type_view","other",TRUE
-"2914","2914","creditori c/leasing ","29","account_type_view","other","TRUE"
+2914,2914,"creditori c/leasing ",29,"account_type_view","other",TRUE
-"2916","2916","clienti c/impegni ","29","account_type_view","other","TRUE"
+2916,2916,"clienti c/impegni ",29,"account_type_view","other",TRUE
-"2917","2917","merci da consegnare ","29","account_type_view","other","TRUE"
+2917,2917,"merci da consegnare ",29,"account_type_view","other",TRUE
-"2921","2921","rischi per effetti scontati ","29","account_type_view","other","TRUE"
+2921,2921,"rischi per effetti scontati ",29,"account_type_view","other",TRUE
-"2922","2922","banche c/effetti scontati ","29","account_type_view","other","TRUE"
+2922,2922,"banche c/effetti scontati ",29,"account_type_view","other",TRUE
-"2926","2926","rischi per fideiussioni ","29","account_type_view","other","TRUE"
+2926,2926,"rischi per fideiussioni ",29,"account_type_view","other",TRUE
-"2927","2927","creditori per fideiussioni ","29","account_type_view","other","TRUE"
+2927,2927,"creditori per fideiussioni ",29,"account_type_view","other",TRUE
-"2931","2931","rischi per avalli ","29","account_type_view","other","TRUE"
+2931,2931,"rischi per avalli ",29,"account_type_view","other",TRUE
-"2932","2932","creditori per avalli ","29","account_type_view","other","TRUE"
+2932,2932,"creditori per avalli ",29,"account_type_view","other",TRUE
-"3","3","VALORE DELLA PRODUZIONE ","0","account_type_view","view","TRUE"
+3,3,"VALORE DELLA PRODUZIONE ",0,"account_type_view","view",TRUE
-"31","31","VENDITE E PRESTAZIONI ","3","account_type_view","view","TRUE"
+31,31,"VENDITE E PRESTAZIONI ",3,"account_type_view","view",TRUE
-"3101","3101","merci c/vendite ","31","account_type_income","other","TRUE"
+3101,3101,"merci c/vendite ",31,"account_type_income","other",TRUE
-"3103","3103","rimborsi spese di vendita ","31","account_type_income","other","TRUE"
+3103,3103,"rimborsi spese di vendita ",31,"account_type_income","other",TRUE
-"3110","3110","resi su vendite ","31","account_type_income","other","TRUE"
+3110,3110,"resi su vendite ",31,"account_type_income","other",TRUE
-"3111","3111","ribassi e abbuoni passivi ","31","account_type_income","other","TRUE"
+3111,3111,"ribassi e abbuoni passivi ",31,"account_type_income","other",TRUE
-"3112","3112","premi su vendite ","31","account_type_income","other","TRUE"
+3112,3112,"premi su vendite ",31,"account_type_income","other",TRUE
-"32","32","RICAVI E PROVENTI DIVERSI ","3","account_type_view","view","TRUE"
+32,32,"RICAVI E PROVENTI DIVERSI ",3,"account_type_view","view",TRUE
-"3201","3201","fitti attivi ","32","account_type_income","other","TRUE"
+3201,3201,"fitti attivi ",32,"account_type_income","other",TRUE
-"3202","3202","proventi vari ","32","account_type_income","other","TRUE"
+3202,3202,"proventi vari ",32,"account_type_income","other",TRUE
-"3210","3210","arrotondamenti attivi ","32","account_type_income","other","TRUE"
+3210,3210,"arrotondamenti attivi ",32,"account_type_income","other",TRUE
-"3220","3220","plusvalenze ordinarie diverse ","32","account_type_income","other","TRUE"
+3220,3220,"plusvalenze ordinarie diverse ",32,"account_type_income","other",TRUE
-"3230","3230","sopravvenienze attive ordinarie diverse ","32","account_type_income","other","TRUE"
+3230,3230,"sopravvenienze attive ordinarie diverse ",32,"account_type_income","other",TRUE
-"3240","3240","insussistenze attive ordinarie diverse ","32","account_type_income","other","TRUE"
+3240,3240,"insussistenze attive ordinarie diverse ",32,"account_type_income","other",TRUE
-"4","4","COSTI DELLA PRODUZIONE ","0","account_type_view","view","TRUE"
+4,4,"COSTI DELLA PRODUZIONE ",0,"account_type_view","view",TRUE
-"41","41","COSTO DEL VENDUTO ","4","account_type_view","view","TRUE"
+41,41,"COSTO DEL VENDUTO ",4,"account_type_view","view",TRUE
-"4101","4101","merci c/acquisti ","41","account_type_expense","other","TRUE"
+4101,4101,"merci c/acquisti ",41,"account_type_expense","other",TRUE
-"4102","4102","materie di consumo c/acquisti ","41","account_type_expense","other","TRUE"
+4102,4102,"materie di consumo c/acquisti ",41,"account_type_expense","other",TRUE
-"4105","4105","merci c/apporti ","41","account_type_expense","other","TRUE"
+4105,4105,"merci c/apporti ",41,"account_type_expense","other",TRUE
-"4110","4110","resi su acquisti ","41","account_type_expense","other","TRUE"
+4110,4110,"resi su acquisti ",41,"account_type_expense","other",TRUE
-"4111","4111","ribassi e abbuoni attivi ","41","account_type_expense","other","TRUE"
+4111,4111,"ribassi e abbuoni attivi ",41,"account_type_expense","other",TRUE
-"4112","4112","premi su acquisti ","41","account_type_expense","other","TRUE"
+4112,4112,"premi su acquisti ",41,"account_type_expense","other",TRUE
-"4121","4121","merci c/esistenze iniziali ","41","account_type_expense","other","TRUE"
+4121,4121,"merci c/esistenze iniziali ",41,"account_type_expense","other",TRUE
-"4122","4122","materie di consumo c/esistenze iniziali ","41","account_type_expense","other","TRUE"
+4122,4122,"materie di consumo c/esistenze iniziali ",41,"account_type_expense","other",TRUE
-"4131","4131","merci c/rimanenze finali ","41","account_type_expense","other","TRUE"
+4131,4131,"merci c/rimanenze finali ",41,"account_type_expense","other",TRUE
-"4132","4132","materie di consumo c/rimanenze finali ","41","account_type_expense","other","TRUE"
+4132,4132,"materie di consumo c/rimanenze finali ",41,"account_type_expense","other",TRUE
-"42","42","COSTI PER SERVIZI ","4","account_type_view","view","TRUE"
+42,42,"COSTI PER SERVIZI ",4,"account_type_view","view",TRUE
-"4201","4201","costi di trasporto ","42","account_type_expense","other","TRUE"
+4201,4201,"costi di trasporto ",42,"account_type_expense","other",TRUE
-"4202","4202","costi per energia ","42","account_type_expense","other","TRUE"
+4202,4202,"costi per energia ",42,"account_type_expense","other",TRUE
-"4203","4203","costi di pubblicità ","42","account_type_expense","other","TRUE"
+4203,4203,"costi di pubblicità ",42,"account_type_expense","other",TRUE
-"4204","4204","costi di consulenze ","42","account_type_expense","other","TRUE"
+4204,4204,"costi di consulenze ",42,"account_type_expense","other",TRUE
-"4205","4205","costi postali ","42","account_type_expense","other","TRUE"
+4205,4205,"costi postali ",42,"account_type_expense","other",TRUE
-"4206","4206","costi telefonici ","42","account_type_expense","other","TRUE"
+4206,4206,"costi telefonici ",42,"account_type_expense","other",TRUE
-"4207","4207","costi di assicurazione ","42","account_type_expense","other","TRUE"
+4207,4207,"costi di assicurazione ",42,"account_type_expense","other",TRUE
-"4208","4208","costi di vigilanza ","42","account_type_expense","other","TRUE"
+4208,4208,"costi di vigilanza ",42,"account_type_expense","other",TRUE
-"4209","4209","costi per i locali ","42","account_type_expense","other","TRUE"
+4209,4209,"costi per i locali ",42,"account_type_expense","other",TRUE
-"4210","4210","costi di esercizio automezzi ","42","account_type_expense","other","TRUE"
+4210,4210,"costi di esercizio automezzi ",42,"account_type_expense","other",TRUE
-"4211","4211","costi di manutenzione e riparazione ","42","account_type_expense","other","TRUE"
+4211,4211,"costi di manutenzione e riparazione ",42,"account_type_expense","other",TRUE
-"4212","4212","provvigioni passive ","42","account_type_expense","other","TRUE"
+4212,4212,"provvigioni passive ",42,"account_type_expense","other",TRUE
-"4213","4213","spese di incasso ","42","account_type_expense","other","TRUE"
+4213,4213,"spese di incasso ",42,"account_type_expense","other",TRUE
-"43","43","COSTI PER GODIMENTO BENI DI TERZI ","4","account_type_view","view","TRUE"
+43,43,"COSTI PER GODIMENTO BENI DI TERZI ",4,"account_type_view","view",TRUE
-"4301","4301","fitti passivi ","43","account_type_expense","other","TRUE"
+4301,4301,"fitti passivi ",43,"account_type_expense","other",TRUE
-"4302","4302","canoni di leasing ","43","account_type_expense","other","TRUE"
+4302,4302,"canoni di leasing ",43,"account_type_expense","other",TRUE
-"44","44","COSTI PER IL PERSONALE ","4","account_type_view","view","TRUE"
+44,44,"COSTI PER IL PERSONALE ",4,"account_type_view","view",TRUE
-"4401","4401","salari e stipendi ","44","account_type_expense","other","TRUE"
+4401,4401,"salari e stipendi ",44,"account_type_expense","other",TRUE
-"4402","4402","oneri sociali ","44","account_type_expense","other","TRUE"
+4402,4402,"oneri sociali ",44,"account_type_expense","other",TRUE
-"4403","4403","TFRL ","44","account_type_expense","other","TRUE"
+4403,4403,"TFRL ",44,"account_type_expense","other",TRUE
-"4404","4404","altri costi per il personale ","44","account_type_expense","other","TRUE"
+4404,4404,"altri costi per il personale ",44,"account_type_expense","other",TRUE
-"45","45","AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ","4","account_type_view","view","TRUE"
+45,45,"AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ",4,"account_type_view","view",TRUE
-"4501","4501","ammortamento costi di impianto ","45","account_type_view","other","TRUE"
+4501,4501,"ammortamento costi di impianto ",45,"account_type_view","other",TRUE
-"4506","4506","ammortamento software ","45","account_type_view","other","TRUE"
+4506,4506,"ammortamento software ",45,"account_type_view","other",TRUE
-"4508","4508","ammortamento avviamento ","45","account_type_view","other","TRUE"
+4508,4508,"ammortamento avviamento ",45,"account_type_view","other",TRUE
-"46","46","AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ","4","account_type_view","view","TRUE"
+46,46,"AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ",4,"account_type_view","view",TRUE
-"4601","4601","ammortamento fabbricati ","46","account_type_view","other","TRUE"
+4601,4601,"ammortamento fabbricati ",46,"account_type_view","other",TRUE
-"4602","4602","ammortamento impianti e macchinari ","46","account_type_view","other","TRUE"
+4602,4602,"ammortamento impianti e macchinari ",46,"account_type_view","other",TRUE
-"4604","4604","ammortamento attrezzature commerciali ","46","account_type_view","other","TRUE"
+4604,4604,"ammortamento attrezzature commerciali ",46,"account_type_view","other",TRUE
-"4605","4605","ammortamento macchine d'ufficio ","46","account_type_view","other","TRUE"
+4605,4605,"ammortamento macchine d'ufficio ",46,"account_type_view","other",TRUE
-"4606","4606","ammortamento arredamento ","46","account_type_view","other","TRUE"
+4606,4606,"ammortamento arredamento ",46,"account_type_view","other",TRUE
-"4607","4607","ammortamento automezzi ","46","account_type_view","other","TRUE"
+4607,4607,"ammortamento automezzi ",46,"account_type_view","other",TRUE
-"4608","4608","ammortamento imballaggi durevoli ","46","account_type_view","other","TRUE"
+4608,4608,"ammortamento imballaggi durevoli ",46,"account_type_view","other",TRUE
-"47","47","SVALUTAZIONI ","4","account_type_view","view","TRUE"
+47,47,"SVALUTAZIONI ",4,"account_type_view","view",TRUE
-"4701","4701","svalutazioni immobilizzazioni immateriali ","47","account_type_view","other","TRUE"
+4701,4701,"svalutazioni immobilizzazioni immateriali ",47,"account_type_view","other",TRUE
-"4702","4702","svalutazioni immobilizzazioni materiali ","47","account_type_view","other","TRUE"
+4702,4702,"svalutazioni immobilizzazioni materiali ",47,"account_type_view","other",TRUE
-"4706","4706","svalutazione crediti ","47","account_type_view","other","TRUE"
+4706,4706,"svalutazione crediti ",47,"account_type_view","other",TRUE
-"48","48","ACCANTONAMENTI ","4","account_type_view","view","TRUE"
+48,48,"ACCANTONAMENTI ",4,"account_type_view","view",TRUE
-"481","481","ACCANTONAMENTI PER RISCHI ","48","account_type_view","other","TRUE"
+481,481,"ACCANTONAMENTI PER RISCHI ",48,"account_type_view","view",TRUE
-"4814","4814","accantonamento per responsabilità civile ","481","account_type_view","other","TRUE"
+4814,4814,"accantonamento per responsabilità civile ",481,"account_type_view","other",TRUE
-"482","482","ALTRI ACCANTONAMENTI ","48","account_type_view","other","TRUE"
+482,482,"ALTRI ACCANTONAMENTI ",48,"account_type_view","view",TRUE
-"4821","4821","accantonamento per spese future ","482","account_type_view","other","TRUE"
+4821,4821,"accantonamento per spese future ",482,"account_type_view","other",TRUE
-"4823","4823","accantonamento per manutenzioni programmate ","482","account_type_view","other","TRUE"
+4823,4823,"accantonamento per manutenzioni programmate ",482,"account_type_view","other",TRUE
-"49","49","ONERI DIVERSI ","4","account_type_view","view","TRUE"
+49,49,"ONERI DIVERSI ",4,"account_type_view","view",TRUE
-"4901","4901","oneri fiscali diversi ","49","account_type_view","other","TRUE"
+4901,4901,"oneri fiscali diversi ",49,"account_type_view","other",TRUE
-"4903","4903","oneri vari ","49","account_type_view","other","TRUE"
+4903,4903,"oneri vari ",49,"account_type_view","other",TRUE
-"4905","4905","perdite su crediti ","49","account_type_view","other","TRUE"
+4905,4905,"perdite su crediti ",49,"account_type_view","other",TRUE
-"4910","4910","arrotondamenti passivi ","49","account_type_view","other","TRUE"
+4910,4910,"arrotondamenti passivi ",49,"account_type_view","other",TRUE
-"4920","4920","minusvalenze ordinarie diverse ","49","account_type_view","other","TRUE"
+4920,4920,"minusvalenze ordinarie diverse ",49,"account_type_view","other",TRUE
-"4930","4930","sopravvenienze passive ordinarie diverse ","49","account_type_view","other","TRUE"
+4930,4930,"sopravvenienze passive ordinarie diverse ",49,"account_type_view","other",TRUE
-"4940","4940","insussistenze passive ordinarie diverse ","49","account_type_view","other","TRUE"
+4940,4940,"insussistenze passive ordinarie diverse ",49,"account_type_view","other",TRUE
-"5","5","PROVENTI E ONERI FINANZIARI ","0","account_type_view","view","TRUE"
+5,5,"PROVENTI E ONERI FINANZIARI ",0,"account_type_view","view",TRUE
-"51","51","PROVENTI FINANZIARI ","5","account_type_view","view","TRUE"
+51,51,"PROVENTI FINANZIARI ",5,"account_type_view","view",TRUE
-"5110","5110","interessi attivi v/clienti ","51","account_type_view","other","TRUE"
+5110,5110,"interessi attivi v/clienti ",51,"account_type_view","other",TRUE
-"5115","5115","interessi attivi bancari ","51","account_type_view","other","TRUE"
+5115,5115,"interessi attivi bancari ",51,"account_type_view","other",TRUE
-"5116","5116","interessi attivi postali ","51","account_type_view","other","TRUE"
+5116,5116,"interessi attivi postali ",51,"account_type_view","other",TRUE
-"5140","5140","proventi finanziari diversi ","51","account_type_view","other","TRUE"
+5140,5140,"proventi finanziari diversi ",51,"account_type_view","other",TRUE
-"52","52","ONERI FINANZIARI ","5","account_type_view","view","TRUE"
+52,52,"ONERI FINANZIARI ",5,"account_type_view","view",TRUE
-"5201","5201","interessi passivi v/fornitori ","52","account_type_view","other","TRUE"
+5201,5201,"interessi passivi v/fornitori ",52,"account_type_view","other",TRUE
-"5202","5202","interessi passivi bancari ","52","account_type_view","other","TRUE"
+5202,5202,"interessi passivi bancari ",52,"account_type_view","other",TRUE
-"5203","5203","sconti passivi bancari ","52","account_type_view","other","TRUE"
+5203,5203,"sconti passivi bancari ",52,"account_type_view","other",TRUE
-"5210","5210","interessi passivi su mutui ","52","account_type_view","other","TRUE"
+5210,5210,"interessi passivi su mutui ",52,"account_type_view","other",TRUE
-"5240","5240","oneri finanziari diversi ","52","account_type_view","other","TRUE"
+5240,5240,"oneri finanziari diversi ",52,"account_type_view","other",TRUE
-"7","7","PROVENTI E ONERI STRAORDINARI ","0","account_type_view","view","TRUE"
+7,7,"PROVENTI E ONERI STRAORDINARI ",0,"account_type_view","view",TRUE
-"71","71","PROVENTI STRAORDINARI ","7","account_type_view","view","TRUE"
+71,71,"PROVENTI STRAORDINARI ",7,"account_type_view","view",TRUE
-"7101","7101","plusvalenze straordinarie ","71","account_type_view","other","TRUE"
+7101,7101,"plusvalenze straordinarie ",71,"account_type_view","other",TRUE
-"7102","7102","sopravvenienze attive straordinarie ","71","account_type_view","other","TRUE"
+7102,7102,"sopravvenienze attive straordinarie ",71,"account_type_view","other",TRUE
-"7103","7103","insussistenze attive straordinarie ","71","account_type_view","other","TRUE"
+7103,7103,"insussistenze attive straordinarie ",71,"account_type_view","other",TRUE
-"72","72","ONERI STRAORDINARI ","7","account_type_view","view","TRUE"
+72,72,"ONERI STRAORDINARI ",7,"account_type_view","view",TRUE
-"7201","7201","minusvalenze straordinarie ","72","account_type_view","other","TRUE"
+7201,7201,"minusvalenze straordinarie ",72,"account_type_view","other",TRUE
-"7202","7202","sopravvenienze passive straordinarie ","72","account_type_view","other","TRUE"
+7202,7202,"sopravvenienze passive straordinarie ",72,"account_type_view","other",TRUE
-"7203","7203","insussistenze passive straordinarie ","72","account_type_view","other","TRUE"
+7203,7203,"insussistenze passive straordinarie ",72,"account_type_view","other",TRUE
-"7204","7204","imposte esercizi precedenti ","72","account_type_view","other","TRUE"
+7204,7204,"imposte esercizi precedenti ",72,"account_type_view","other",TRUE
-"81","81","IMPOSTE DELL'ESERCIZIO ","7","account_type_view","view","TRUE"
+81,81,"IMPOSTE DELL'ESERCIZIO ",7,"account_type_view","view",TRUE
-"8101","8101","imposte dell'esercizio ","81","account_type_view","other","TRUE"
+8101,8101,"imposte dell'esercizio ",81,"account_type_view","other",TRUE
-"91","91","CONTI DI RISULTATO ","7","account_type_view","view","TRUE"
+91,91,"CONTI DI RISULTATO ",7,"account_type_view","view",TRUE
-"9101","9101","conto di risultato economico ","91","account_type_view","other","TRUE"
+9101,9101,"conto di risultato economico ",91,"account_type_view","other",TRUE

addons/l10n_it/i18n/l10n_it.pot

@@ -0,0 +1,155 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* l10n_it
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-07 06:04:30+0000\n"
+"PO-Revision-Date: 2011-01-07 06:04:30+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: l10n_it
+#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_debit
+msgid "Registro acquisti"
+msgstr ""
+
+#. module: l10n_it
+#: model:ir.actions.todo,note:l10n_it.config_call_account_template_generic
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
+"	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_it
+#: view:account.report_libroiva:0
+msgid "Anno Fiscale"
+msgstr ""
+
+#. module: l10n_it
+#: model:account.fiscal.position.template,name:l10n_it.it
+msgid "Italia"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "REGISTRO IVA"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Protocollo"
+msgstr ""
+
+#. module: l10n_it
+#: model:account.fiscal.position.template,name:l10n_it.extra
+msgid "Regime Extra comunitario"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+msgid "VENDITE"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Aliquota"
+msgstr ""
+
+#. module: l10n_it
+#: field:account.report_libroiva,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_it
+#: field:account.report_libroiva,name:0
+msgid "Fiscal year"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Numero"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Fornitore"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "ACQUISTI"
+msgstr ""
+
+#. module: l10n_it
+#: model:ir.module.module,description:l10n_it.module_meta_information
+msgid "\n"
+"    Piano dei conti italiano di un'impresa generica\n"
+"    "
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+msgid "Cliente"
+msgstr ""
+
+#. module: l10n_it
+#: model:ir.actions.report.xml,name:l10n_it.account_ita_libroIVA_credit
+msgid "Registro vendite"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Periodo"
+msgstr ""
+
+#. module: l10n_it
+#: view:account.report_libroiva:0
+#: model:ir.actions.act_window,name:l10n_it.l10n_chart_it_report_libroIVA_action
+#: model:ir.ui.menu,name:l10n_it.menu_report_l10n_chart_it_libroIVA
+msgid "Registri IVA"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Imposta"
+msgstr ""
+
+#. module: l10n_it
+#: model:account.fiscal.position.template,name:l10n_it.intra
+msgid "Regime Intra comunitario"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Data fattura"
+msgstr ""
+
+#. module: l10n_it
+#: report:l10n_it.report.libroIVA_credito:0
+#: report:l10n_it.report.libroIVA_debito:0
+msgid "Imponibile"
+msgstr ""
+
+#. module: l10n_it
+#: model:ir.module.module,shortdesc:l10n_it.module_meta_information
+msgid "Italy - Generic Chart of Accounts"
+msgstr ""
+
+#. module: l10n_it
+#: model:ir.model,name:l10n_it.model_account_report_libroiva
+msgid "SQL view for libro IVA"
+msgstr ""
+

addons/l10n_mx/account_chart.xml

@@ -80,7 +80,7 @@
 		<field name="code">1050</field>
 		<field name="reconcile" eval="False"/>
 		<field name="parent_id" ref="chart0"/>
-		<field name="type">other</field>
+		<field name="type">view</field>
 		<field name="user_type" ref="account_type_asset"/>
 		<field name="name">Caja</field>
 	</record>