diff --git a/addons/account/account.py b/addons/account/account.py index c60a37602cf..212aaee26d5 100644 --- a/addons/account/account.py +++ b/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: \ No newline at end of file diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index b59df303170..fa150b291dc 100644 --- a/addons/account/account_analytic_line.py +++ b/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, diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index a42d35c59ed..a2e641dc39c 100644 --- a/addons/account/account_bank_statement.py +++ b/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') diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml index 96d076805e5..6ebdf74b977 100644 --- a/addons/account/account_installer.xml +++ b/addons/account/account_installer.xml @@ -28,7 +28,7 @@ - + diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index cc8475d4fc3..48c817ff58f 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -434,7 +434,6 @@ {'type':'out_invoice', 'journal_type': 'sale'} 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. - diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 9010fc3594d..dfd6acdf7c3 100644 --- a/addons/account/account_move_line.py +++ b/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. - 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 + 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 + 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 diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml index bf17e607e24..b3030dbaa96 100644 --- a/addons/account/account_report.xml +++ b/addons/account/account_report.xml @@ -2,6 +2,7 @@ + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 0ef24bcd38d..a56d850a8e3 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -170,6 +170,8 @@ + + @@ -565,7 +567,7 @@ - + @@ -574,12 +576,12 @@
+ + - - @@ -744,7 +746,6 @@ - @@ -2385,12 +2386,13 @@ - + - - + + + @@ -2567,7 +2569,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context) - + @@ -2576,12 +2578,12 @@ action = self.pool.get('res.config').next(cr, uid, [], context) + + - - @@ -2693,14 +2695,6 @@ action = self.pool.get('res.config').next(cr, uid, [], context) - - Partners - ir.actions.act_window - res.partner - form - - - diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index 673cdfab8e1..dd424e17ceb 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -27,6 +27,7 @@ tree,graph {'group_by':['user_type'], 'group_by_no_leaf':1} + [('year','=',time.strftime('%Y'))] Treasury diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 87a3ff12447..d8dbcb92c58 100644 --- a/addons/account/i18n/account.pot +++ b/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" diff --git a/addons/account/invoice.py b/addons/account/invoice.py index f9bf0b26efc..78b3322bbf4 100644 --- a/addons/account/invoice.py +++ b/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 = mob_obj.get_object_reference(cr, uid, 'account', 'invoice_form') + res = self.pool.get('ir.model.data').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]]) - # 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]]) + move_ids.append(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") } diff --git a/addons/account/report/__init__.py b/addons/account/report/__init__.py index 7084aa8c07f..d525d3a331b 100644 --- a/addons/account/report/__init__.py +++ b/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 diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index d077042e698..8fe9af39e00 100644 --- a/addons/account/report/account_balance.py +++ b/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 diff --git a/addons/account/report/account_entries_report.py b/addons/account/report/account_entries_report.py index e80cb290889..266b4a056d7 100644 --- a/addons/account/report/account_entries_report.py +++ b/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): - todel=[] + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): + if context is None: + context = {} fiscalyear_obj = self.pool.get('account.fiscalyear') period_obj = self.pool.get('account.period') - for arg in domain: - if arg[0] == 'period_id' and arg[2] == 'current_period': - current_period = period_obj.find(cr, uid)[0] - domain.append(['period_id','in',[current_period]]) - todel.append(arg) - break - elif arg[0] == 'period_id' and arg[2] == 'current_year': - current_year = fiscalyear_obj.find(cr, uid) - ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] - domain.append(['period_id','in',ids]) - 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) + if context.get('period', False) == 'current_period': + current_period = period_obj.find(cr, uid)[0] + domain.append(['period_id','in',[current_period]]) + elif context.get('year', False) == 'current_year': + current_year = fiscalyear_obj.find(cr, uid) + ids = fiscalyear_obj.read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] + domain.append(['period_id','in',ids]) + else: + domain = domain + return super(account_entries_report, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context, orderby) def init(self, cr): tools.drop_view_if_exists(cr, 'account_entries_report') diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 8eefe75838f..baa9e15182b 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -70,17 +70,17 @@ - + diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py index b904aba298f..1047b9017d6 100644 --- a/addons/account/report/account_general_ledger.py +++ b/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) diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 949a4c934db..62505c8a494 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -150,6 +150,7 @@ diff --git a/addons/account/report/account_voucher_print.py b/addons/account/report/account_voucher_print.py deleted file mode 100644 index 912e0794a9c..00000000000 --- a/addons/account/report/account_voucher_print.py +++ /dev/null @@ -1,69 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2008 Tiny SPRL (). 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 . -# -############################################################################## - -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: \ No newline at end of file diff --git a/addons/account/report/account_voucher_print.rml b/addons/account/report/account_voucher_print.rml deleted file mode 100644 index 1d8f237c132..00000000000 --- a/addons/account/report/account_voucher_print.rml +++ /dev/null @@ -1,470 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Particulars - - - Debit - - - Credit - - - - - [[ repeatIn(objects,'voucher') ]] - - - - [[ get_title(voucher) ]] - - - - - - - - - - Journal: - - - [[ voucher.journal_id.name ]] - - - Number: - - - [[ voucher.name ]] - - - - - - - State: - - - PRO-FORMA [[ ((voucher.state == 'proforma') or removeParentNode('para')) and '' ]] - Draft[[ ((voucher.state == 'draft') or removeParentNode('para')) and '' ]] - Canceled [[ ((voucher.state == 'cancel') or removeParentNode('para')) and '' ]] - Posted [[ ((voucher.state == 'posted') or removeParentNode('para')) and '' ]] - - - Ref. : - - - [[ voucher.ref]] - - - Date: - - - [[ formatLang(voucher.date , date=True) or '' ]] - - - - - - - - - - - - - Particulars - - - Debit - - - Credit - - - - - - -
- [[ repeatIn(voucher.line_id,'line_id') ]] - - - - [[ (line_id.partner_id and line_id.partner_id.name) or 'Account']] - - - [[ formatLang(line_id.debit) ]] - - - [[ formatLang(line_id.credit) ]] - - - - - [[ line_id.account_id.name ]] - - - - - - - - - - - - - - - [[ line_id.name ]]-[[voucher.ref]] - - - - - - - - - - - - - - - - -
- - - - - - - Through : - - - - - - - - - - - - - - - [[ voucher.narration or '']] - - - - - - - - - - - - - - - On Account of : - - - - - - - - - - - - - - - [[ voucher.line_id and voucher.line_id[0].name or removeParentNode('para') ]] - - - - - - - - - - - - - - - Amount (in words) : - - - - - - - - - - - - - - - [[ convert(voucher.amount) ]] - - - - - - - - - - - - - - - - - - - - - - - - - [[ formatLang(debit(voucher.line_id))]] - - - [[ formatLang(credit(voucher.line_id)) ]] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Receiver's Signature - - - - - - - - - - - - - Authorised Signatory - - - - - - - - - diff --git a/addons/account/res_currency.py b/addons/account/res_currency.py index 6ec404edcf4..8c9c6a8b103 100644 --- a/addons/account/res_currency.py +++ b/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() \ No newline at end of file +res_currency_account() + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 83efe67f103..ac6c0833e4d 100644 --- a/addons/account/security/ir.model.access.csv +++ b/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 diff --git a/addons/account/test/account_bank_statement.yml b/addons/account/test/account_bank_statement.yml index b05a4f820f6..6b66dd9029c 100644 --- a/addons/account/test/account_bank_statement.yml +++ b/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 diff --git a/addons/account/test/account_cash_statement.yml b/addons/account/test/account_cash_statement.yml index 03d0d54db83..2f1ae4b0076 100644 --- a/addons/account/test/account_cash_statement.yml +++ b/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 diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml index d94b791fe66..d14bf6f3cc1 100644 --- a/addons/account/test/account_customer_invoice.yml +++ b/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' diff --git a/addons/account/test/account_period_close.yml b/addons/account/test/account_period_close.yml index af180050b1b..e4b7aec8444 100644 --- a/addons/account/test/account_period_close.yml +++ b/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_stop: '2010-01-31' + date_start: !eval "'%s-01-01' %(datetime.now().year)" + 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 diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 312db44cd0c..d5bb6bada65 100644 --- a/addons/account/test/account_report.yml +++ b/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') diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml index abc382d40d4..650057646c3 100644 --- a/addons/account/test/account_validate_account_move.yml +++ b/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 - diff --git a/addons/account/test/chart_of_account.yml b/addons/account/test/chart_of_account.yml index 09271f778be..1cb83c4298f 100644 --- a/addons/account/test/chart_of_account.yml +++ b/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' - to_date: '2010-06-30' + from_date: !eval "'%s-01-01' %(datetime.now().year)" + to_date: !eval "'%s-06-30' %(datetime.now().year)" - I clicked on Open chart Button to open the charts diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py index 541e7b2cbdb..39c5be00f15 100644 --- a/addons/account/wizard/account_open_closed_fiscalyear.py +++ b/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: diff --git a/addons/account/wizard/account_tax_chart_view.xml b/addons/account/wizard/account_tax_chart_view.xml index c630633bcf6..a4f5860d41f 100644 --- a/addons/account/wizard/account_tax_chart_view.xml +++ b/addons/account/wizard/account_tax_chart_view.xml @@ -28,7 +28,7 @@ account.tax.chart form tree,form - [('parent_id','=',False)] + [] 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. new diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py index 66cee057d29..d8616a94ebf 100644 --- a/addons/account_budget/account_budget.py +++ b/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) } diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 4d3cbfa225f..8ddcf5cdc0a 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -78,7 +78,7 @@ - + @@ -121,7 +121,7 @@ - + diff --git a/addons/account_budget/test/account_budget.yml b/addons/account_budget/test/account_budget.yml index 4a2d5023fc7..f656d214405 100644 --- a/addons/account_budget/test/account_budget.yml +++ b/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_to: '2011-12-31' - name: Budget 2011 + date_from: !eval "'%s-01-01' %(datetime.now().year+1)" + date_to: !eval "'%s-12-31' %(datetime.now().year+1)" + 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_to: '2011-12-31' + date_from: !eval "'%s-01-01' %(datetime.now().year+1)" + 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_to: '2011-09-30' + date_from: !eval "'%s-09-01' %(datetime.now().year+1)" + date_to: !eval "'%s-09-30' %(datetime.now().year+1)" general_budget_id: account_budget.account_budget_post_sales0 planned_amount: 400000.0 diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py index 878f44ced30..8d4b914ffa6 100644 --- a/addons/account_followup/report/account_followup_report.py +++ b/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, diff --git a/addons/account_followup/test/account_followup.yml b/addons/account_followup/test/account_followup.yml index a81559011f3..c69fdb112c6 100644 --- a/addons/account_followup/test/account_followup.yml +++ b/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"), }) diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index 7d296f74f76..5d9c2da860f 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/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) - dict_lines[line.name.id] =line + partners.append(line.partner_id) + 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) - msg_sent += partner.name + '\n' + try: + 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: diff --git a/addons/account_payment/test/account_payment.yml b/addons/account_payment/test/account_payment.yml index 3d863686847..dba2a9052fd 100644 --- a/addons/account_payment/test/account_payment.yml +++ b/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 diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 12c8383445c..66be989b22c 100644 --- a/addons/account_voucher/account_voucher.py +++ b/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': '' diff --git a/addons/account_voucher/security/ir.model.access.csv b/addons/account_voucher/security/ir.model.access.csv index e2b048dcedd..a8d9c7f580b 100644 --- a/addons/account_voucher/security/ir.model.access.csv +++ b/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 diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 918099487ab..0921f0a5f8a 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -158,7 +158,7 @@ - + @@ -278,7 +278,7 @@ - + diff --git a/addons/auction/test/auction.yml b/addons/auction/test/auction.yml index bbab6786e27..72014f985ef 100644 --- a/addons/auction/test/auction.yml +++ b/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' - auction2: '2010-08-31' - expo1: '2010-08-01' - expo2: '2010-08-31' + auction1: !eval "'%s-08-01' %(datetime.now().year)" + auction2: !eval "'%s-08-31' %(datetime.now().year)" + expo1: !eval "'%s-08-01' %(datetime.now().year)" + 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. diff --git a/addons/auction/test/auction_wizard.yml b/addons/auction/test/auction_wizard.yml index bfe4f353ed5..35ed5766025 100644 --- a/addons/auction/test/auction_wizard.yml +++ b/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' - auction2: '2010-05-25' - expo1: '2010-05-21' - expo2: '2010-05-22' + auction1: !eval "'%s-05-24' %(datetime.now().year)" + auction2: !eval "'%s-05-25' %(datetime.now().year)" + expo1: !eval "'%s-05-21' %(datetime.now().year)" + 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. diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml index 52888e02688..4c0f3fc126f 100644 --- a/addons/base_calendar/test/base_calendar_test.yml +++ b/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_deadline: '2010-04-30 18:30:00' + date: '2011-04-30 16:00: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')] ) - assert len(ids) == 10 + ids = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')] ) + 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_deadline: '2010-04-30 00:00:00' + date: '2011-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 diff --git a/addons/base_crypt/__init__.py b/addons/base_crypt/__init__.py old mode 100755 new mode 100644 diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py old mode 100755 new mode 100644 diff --git a/addons/base_module_doc_rst/base_module_doc_rst.py b/addons/base_module_doc_rst/base_module_doc_rst.py old mode 100755 new mode 100644 diff --git a/addons/base_synchro/base_synchro_obj.py b/addons/base_synchro/base_synchro_obj.py old mode 100755 new mode 100644 diff --git a/addons/crm/test/test_crm_meeting.yml b/addons/crm/test/test_crm_meeting.yml index c4fd46c568c..d7c8a4691d6 100644 --- a/addons/crm/test/test_crm_meeting.yml +++ b/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_deadline: '2010-04-22 00:04:00' + date: !eval time.strftime('%Y-%m-%d 16: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 - | diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml index 1392402965a..3a25db66381 100644 --- a/addons/crm/test/test_crm_opportunity.yml +++ b/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_deadline: '2010-04-16 08:00:00' + date: !eval time.strftime('%Y-%m-%d 00: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 diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml index 5c12da99a7d..98020d345e6 100644 --- a/addons/crm/test/test_crm_phonecall.yml +++ b/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_deadline: '2010-04-20 08:00:00' + date: !eval "'%s-%s-%s 09:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)" + 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 diff --git a/addons/crm_claim/test/test_crm_claim.yml b/addons/crm_claim/test/test_crm_claim.yml index 14551ad65ad..a99831c0588 100644 --- a/addons/crm_claim/test/test_crm_claim.yml +++ b/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 diff --git a/addons/crm_helpdesk/crm_helpdesk_demo.xml b/addons/crm_helpdesk/crm_helpdesk_demo.xml index be8da99f140..f48af6b5de3 100644 --- a/addons/crm_helpdesk/crm_helpdesk_demo.xml +++ b/addons/crm_helpdesk/crm_helpdesk_demo.xml @@ -9,7 +9,7 @@ 3 draft - 2010-07-04 11:10:36 + Download old version of OpenERP? @@ -22,7 +22,7 @@ 3 draft - 2010-07-12 11:12:09 + Can not able to connect to Server @@ -35,7 +35,7 @@ 2 draft - 2010-07-12 11:13:10 + Documentation for CRM? @@ -49,7 +49,7 @@ 3 draft - 2010-07-12 11:15:17 + How to create a new module diff --git a/addons/crm_helpdesk/test/test_crm_helpdesk.yml b/addons/crm_helpdesk/test/test_crm_helpdesk.yml index 6872a99a60e..4023fad8c63 100644 --- a/addons/crm_helpdesk/test/test_crm_helpdesk.yml +++ b/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 diff --git a/addons/delivery/test/delivery_report.yml b/addons/delivery/test/delivery_report.yml index b66528ea18c..4205a374910 100644 --- a/addons/delivery/test/delivery_report.yml +++ b/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 diff --git a/addons/event/test/test_event.yml b/addons/event/test/test_event.yml index da657640e93..260e2f77add 100644 --- a/addons/event/test/test_event.yml +++ b/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_end: 2010-08-10 + date_begin: !eval time.strftime('%Y-%m-01') + date_end: !eval time.strftime('%Y-%m-10') name: Conference on OpenERP Business. product_id: 'product_product_ticketforconcert0' type: 'event_type_conference0' diff --git a/addons/hr_attendance/test/test_hr_attendance.yml b/addons/hr_attendance/test/test_hr_attendance.yml index e4a08476985..01681f86ec9 100644 --- a/addons/hr_attendance/test/test_hr_attendance.yml +++ b/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. - diff --git a/addons/hr_contract/test/test_hr_contract.yml b/addons/hr_contract/test/test_hr_contract.yml index e5ecc57f144..5659eb912ee 100644 --- a/addons/hr_contract/test/test_hr_contract.yml +++ b/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_start: '2010-05-18' - trial_date_end: '2010-03-01' - trial_date_start: '2010-04-30' + date_end: !eval "'%s-05-18' %(datetime.now().year+1)" + date_start: !eval "'%s-05-18' %(datetime.now().year)" + trial_date_end: !eval "'%s-03-01' %(datetime.now().year)" + trial_date_start: !eval "'%s-04-30' %(datetime.now().year)" name: contract1 wage: 1.0 wage_type_id: hr_contract_wage_type_monthlygrosswage0 diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index 68e658f87b9..b04bef02e17 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/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'), diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml index 7797ce417d2..a7a25eb45a6 100644 --- a/addons/hr_evaluation/test/test_hr_evaluation.yml +++ b/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 - diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml index 4c85bd8384e..49afbd8523c 100644 --- a/addons/hr_expense/hr_expense_demo.xml +++ b/addons/hr_expense/hr_expense_demo.xml @@ -44,13 +44,13 @@ May Expenses - 2010-05-03 + draft Travel by Air - 2010-05-03 + @@ -61,7 +61,7 @@ Basic PC - Server for Seagate - 2010-05-03 + @@ -79,13 +79,13 @@ Travel Expenses - 2010-04-20 + draft Hotel Expenses - Thymbra - 2010-05-03 + @@ -96,7 +96,7 @@ Bruxelles - Paris - 2010-05-03 + diff --git a/addons/hr_expense/test/test_hr_expense.yml b/addons/hr_expense/test/test_hr_expense.yml index b558556a5c0..fa237878023 100644 --- a/addons/hr_expense/test/test_hr_expense.yml +++ b/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 diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index adbc670c64e..a6adb1926d2 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -70,7 +70,7 @@ - + @@ -114,7 +114,7 @@ - + diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml index 6274bb5e23a..f43b0235e46 100644 --- a/addons/hr_holidays/test/test_hr_holiday.yml +++ b/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_to: '2010-05-22 13:59:00' + date_from: !eval "'%s-05-20 13:59:00' %(datetime.now().year)" + 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_to: '2010-05-21 11:48:00' + date_from: !eval "'%s-05-20 11:48:00' %(datetime.now().year)" + 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 diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index f8571c9dc46..b29bd1312ac 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/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), - 'code':fields.char('Categoty Code', size=64, required=True, readonly=False), + 'name':fields.char('Category Name', 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), diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/hr_payroll_data.xml index bc9ff965f45..cafc02cc1db 100644 --- a/addons/hr_payroll/hr_payroll_data.xml +++ b/addons/hr_payroll/hr_payroll_data.xml @@ -4,14 +4,14 @@ HRA allowance - House Rant Allowance + House Rent Allowance - + CA allowance - Convance Allowance + Conveyance Allowance diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml index 77b58ac861b..bc94426999e 100644 --- a/addons/hr_payroll/hr_payroll_demo.xml +++ b/addons/hr_payroll/hr_payroll_demo.xml @@ -17,7 +17,7 @@ allowance - House Rant Allowance + House Rent Allowance @@ -28,7 +28,7 @@ allowance - Convance Allowance + Conveyance Allowance diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 73d354bb26d..e2c54097cf7 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -277,8 +277,6 @@ - - diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot index fba8db4a6bc..90ba554b242 100644 --- a/addons/hr_payroll/i18n/hr_payroll.pot +++ b/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 diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml index c10ada27c56..ef600670a48 100644 --- a/addons/hr_payroll/test/payment_advice.yml +++ b/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_start: '2010-07-01' + date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)" + date_start: !eval time.strftime('%Y-%m-%d') name: reference wage: 5000.0 wage_type_id: hr_contract.hr_contract_monthly_gross diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml index 8bc346a34e1..4a16dafe6ed 100644 --- a/addons/hr_payroll/test/payroll_register.yml +++ b/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_start: '2010-07-01' + date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)" + 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 diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml index aa739d2c9a1..56387ee0a98 100644 --- a/addons/hr_payroll/test/payslip.yml +++ b/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_start: '2010-07-01' + date_end: !eval "'%s-%s-%s' %(datetime.now().year+1,datetime.now().month,datetime.now().day)" + date_start: !eval time.strftime('%Y-%m-%d') name: reference wage: 5000.0 wage_type_id: hr_contract.hr_contract_monthly_gross diff --git a/addons/hr_recruitment/test/test_hr_recruitment.yml b/addons/hr_recruitment/test/test_hr_recruitment.yml index 32f49ca4ad5..ae322475a62 100644 --- a/addons/hr_recruitment/test/test_hr_recruitment.yml +++ b/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_deadline: '2010-05-27 08:00:00' + date: !eval "'%s-%s-%s 00:00:00' %(datetime.now().year,datetime.now().month,datetime.now().day+1)" + 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 diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml index d472263150b..c28eeab3439 100644 --- a/addons/hr_timesheet/test/test_hr_timesheet.yml +++ b/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) - | diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml index b6d9f155cab..010ebdc3d7c 100644 --- a/addons/hr_timesheet_invoice/report/account_analytic_profit.rml +++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.rml @@ -176,7 +176,7 @@ - Employee or Journal Name + User or Journal Name Units diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml index 8dee90094ad..d48d045cbeb 100644 --- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml +++ b/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 diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py index 068119c44a1..7d5d7a36867 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py +++ b/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): diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml index 7bdae9bee1d..1ed51fc0a63 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml @@ -8,13 +8,13 @@ form - - + + - + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 986a4a734c3..85795b352f1 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/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), } diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 8456bca1f3d..2409b3d86b3 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -1,6 +1,7 @@ + hr.timesheet.sheet.graph hr_timesheet_sheet.sheet @@ -26,7 +27,20 @@ - + + hr.timesheet.account.filter + hr_timesheet_sheet.sheet.account + search + + + + + + + + + + hr.timesheet.account.tree hr_timesheet_sheet.sheet.account diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot index b36b1ba7bdd..21409066195 100644 --- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot +++ b/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 "" diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv index 462a2e5a512..4919f240466 100644 --- a/addons/hr_timesheet_sheet/security/ir.model.access.csv +++ b/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 diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml index 808045eb677..edab4b2d840 100644 --- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml +++ b/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_from: '2010-05-01' - date_to: '2010-05-31' - name: Week-22(2010) + date_current: !eval "'%s-05-26' %(datetime.now().year)" + date_from: !eval "'%s-05-01' %(datetime.now().year)" + date_to: !eval "'%s-05-31' %(datetime.now().year)" + 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 diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml index 4f6ea4bd568..402f93f4817 100644 --- a/addons/idea/test/test_idea.yml +++ b/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 diff --git a/addons/l10n_br/i18n/l10n_br.pot b/addons/l10n_br/i18n/l10n_br.pot new file mode 100644 index 00000000000..408c14a9885 --- /dev/null +++ b/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 "" + diff --git a/addons/l10n_cn/i18n/l10n_cn.pot b/addons/l10n_cn/i18n/l10n_cn.pot new file mode 100644 index 00000000000..8aa4788e92a --- /dev/null +++ b/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 "" + diff --git a/addons/l10n_cr/i18n/l10n_cr.pot b/addons/l10n_cr/i18n/l10n_cr.pot new file mode 100644 index 00000000000..4330de559e6 --- /dev/null +++ b/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 "" + diff --git a/addons/l10n_de/account_chart_skr04.xml b/addons/l10n_de/account_chart_skr04.xml index 249b2b0e758..8ca8f35b98f 100644 --- a/addons/l10n_de/account_chart_skr04.xml +++ b/addons/l10n_de/account_chart_skr04.xml @@ -603,7 +603,7 @@ Konzessionen- gewerbliche Schutzrechte und ähnliche Rechte und Werte sowie Lizenzen an solchen Rechten und Werten - other + view @@ -733,7 +733,7 @@ Grundstücke- grundstücksgleiche Rechte und Bauten einschließlich der Bauten auf fremden Grundstücken - other + view @@ -1011,7 +1011,7 @@ Technische Anlagen und Maschinen - other + view @@ -1064,7 +1064,7 @@ Andere Anlagen- Betriebs- und Geschäftsaustattung - other + view @@ -1180,7 +1180,7 @@ Geleistete Anzahlungen und Anlagen im Bau - other + view @@ -1365,7 +1365,7 @@ Beteiligungen - other + view @@ -1444,7 +1444,7 @@ Wertpapiere des Anlagevermögens - other + view @@ -1479,7 +1479,7 @@ Sonstige Ausleihungen - other + view @@ -3225,7 +3225,7 @@ Geleistete Anzahlungen auf Vorräte - other + view @@ -3303,7 +3303,7 @@ Forderungen aus Lieferungen und Leistungen - receivable + view @@ -3321,7 +3321,7 @@ Forderungen aus Lieferungen und Leistungen ohne Kontokorent - other + view @@ -3606,7 +3606,7 @@ Forderungen gegen verbundene Unternehmen - receivable + view @@ -3730,7 +3730,7 @@ Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht - receivable + view @@ -3888,7 +3888,7 @@ Sonstige Vermögensgegenstände - other + view @@ -4674,7 +4674,7 @@ Sonstige Wertpapiere - other + view @@ -4735,7 +4735,7 @@ Kasse - liquidity + view @@ -4913,7 +4913,7 @@ Aktive Rechnungsabgrenzung - other + view @@ -5326,7 +5326,7 @@ Kapitalrücklage - other + view @@ -5447,7 +5447,7 @@ Andere Gewinnrücklagen - other + view @@ -5744,7 +5744,7 @@ Rückstellungen für Pensionen und ähnliche Verpflichtungen - other + view @@ -5779,7 +5779,7 @@ Steuerrückstellungen - other + view @@ -5823,7 +5823,7 @@ Sonstige Rückstellungen - other + view @@ -5938,7 +5938,7 @@ Anleihen- nicht konvertibel - other + view @@ -6018,7 +6018,7 @@ Verbindlichkeiten gegenüber Kreditinstituten - other + view @@ -6124,7 +6124,7 @@ Erhaltene Anzahlungen auf Bestellungen - other + view @@ -6204,7 +6204,7 @@ Verbindlichkeiten aus Lieferungen und Leistungen - payable + view @@ -6364,7 +6364,7 @@ Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel - other + view @@ -6408,7 +6408,7 @@ Verbindlichkeiten gegenüber verbundenen Unternehmen - payable + view @@ -6479,7 +6479,7 @@ K3BP29 Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht oder Forderungen gegen Unternehmen- mit denen ein Beteiligungsverhältnis besteht - other + view @@ -6488,7 +6488,7 @@ Verbindlichkeiten gegenüber Unternehmen- mit denen ein Beteiligungsverhältnis besteht - payable + view @@ -6568,7 +6568,7 @@ Sonstige Verbindlichkeiten - other + view @@ -7088,7 +7088,7 @@ Lohn- und Gehaltsverrechnungskonto - other + view @@ -7996,7 +7996,7 @@ K4GVE22 Sonstige betriebliche Erträge - other + view @@ -10182,7 +10182,7 @@ Soziale Abgaben und Aufwendungen für Altersversorgung und für Unterstützung - other + view diff --git a/addons/l10n_ec/account_chart.xml b/addons/l10n_ec/account_chart.xml index dc32f25529f..b4ab542dc81 100644 --- a/addons/l10n_ec/account_chart.xml +++ b/addons/l10n_ec/account_chart.xml @@ -1428,7 +1428,7 @@ 15.01 - other + view @@ -1452,7 +1452,7 @@ 15.02 - other + view @@ -1540,7 +1540,7 @@ 17.02 - other + view @@ -3854,7 +3854,7 @@ 74.01.01 - other + view @@ -3886,7 +3886,7 @@ 74.01.02 - other + view @@ -3926,7 +3926,7 @@ 74.02.01 - other + view @@ -3934,7 +3934,7 @@ 74.02.01.01 - other + view @@ -3958,7 +3958,7 @@ 74.02.01.02 - other + view @@ -3990,7 +3990,7 @@ 74.02.02.01 - other + view @@ -4038,7 +4038,7 @@ 74.02.02.02 - other + view @@ -4078,7 +4078,7 @@ 74.02.02.03 - other + view @@ -4118,7 +4118,7 @@ 74.02.02.04 - other + view diff --git a/addons/l10n_ec/i18n/l10n_ec.pot b/addons/l10n_ec/i18n/l10n_ec.pot new file mode 100644 index 00000000000..16f29164cb7 --- /dev/null +++ b/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 "" + diff --git a/addons/l10n_fr/plan_comptable_general_demo.xml b/addons/l10n_fr/plan_comptable_general_demo.xml index dc17a39abd8..32aff2f638a 100644 --- a/addons/l10n_fr/plan_comptable_general_demo.xml +++ b/addons/l10n_fr/plan_comptable_general_demo.xml @@ -162,7 +162,7 @@ Capital 101 - other + view Capital pour sociétés de type (SARL, SA). Pour une EI utiliser le compte 108 @@ -190,7 +190,7 @@ Capital souscrit - appelé versé 1013 - other + view @@ -226,7 +226,7 @@ Primes liées au capital social 104 - other + view @@ -280,7 +280,7 @@ Écarts de réévaluation 105 - other + view @@ -343,7 +343,7 @@ Réserves 106 - other + view @@ -352,7 +352,7 @@ Réserve légale 1061 - other + view @@ -397,7 +397,7 @@ Réserves réglementées 1064 - other + view @@ -433,7 +433,7 @@ Autres réserves 1068 - other + view @@ -551,7 +551,7 @@ Subventions d'équipement 131 - other + view @@ -641,7 +641,7 @@ Subventions d'investissement inscrites au compte de résultat 139 - other + view @@ -650,7 +650,7 @@ Subventions d'équipement 1391 - other + view @@ -749,7 +749,7 @@ Provisions réglementées relatives aux immobilisations 142 - other + view @@ -776,7 +776,7 @@ Provisions réglementées relatives aux stocks 143 - other + view @@ -857,7 +857,7 @@ Provisions pour risques 151 - other + view @@ -965,7 +965,7 @@ Provisions pour charges à répartir sur plusieurs exercices 157 - other + view @@ -983,7 +983,7 @@ Autres provisions pour charges 158 - other + view @@ -1037,7 +1037,7 @@ Dépôts et cautionnements reçus 165 - other + view @@ -1064,7 +1064,7 @@ Participation des salariés aux résultats 166 - other + view @@ -1091,7 +1091,7 @@ Emprunts et dettes assortis de conditions particulières 167 - other + view @@ -1127,7 +1127,7 @@ Autres emprunts et dettes assimilées 168 - other + view @@ -1163,7 +1163,7 @@ Intérêts courus 1688 - other + view @@ -1271,7 +1271,7 @@ Dettes rattachées à des sociétés en participation 178 - other + view @@ -1362,7 +1362,7 @@ Frais d'établissement 201 - other + view @@ -1380,7 +1380,7 @@ Frais de premier établissement 2012 - other + view @@ -1471,7 +1471,7 @@ Terrains 211 - other + view @@ -1507,7 +1507,7 @@ Terrains de gisement 2114 - other + view @@ -1525,7 +1525,7 @@ Terrains bâtis 2115 - other + view @@ -1552,7 +1552,7 @@ Autres ensembles immobiliers 21158 - other + view @@ -1597,7 +1597,7 @@ Constructions 213 - other + view @@ -1606,7 +1606,7 @@ Bâtiments 2131 - other + view @@ -1633,7 +1633,7 @@ Autres ensembles immobiliers 21318 - other + view @@ -1669,7 +1669,7 @@ Ouvrages d'infrastructure 2138 - other + view @@ -1732,7 +1732,7 @@ Installations techniques matériels et outillages industriels 215 - other + view @@ -1741,7 +1741,7 @@ Installations complexes spécialisées 2151 - other + view @@ -1768,7 +1768,7 @@ Installations à caractère spécifique 2153 - other + view @@ -1822,7 +1822,7 @@ Autres immobilisations corporelles 218 - other + view @@ -1903,7 +1903,7 @@ Immobilisations corporelles en cours 231 - other + view @@ -1967,7 +1967,7 @@ Avances et acomptes versés sur commandes d'immobilisations corporelles 238 - other + view @@ -2030,7 +2030,7 @@ Titres de participation 261 - other + view Pas d'amortissement sur les titres de participation @@ -2078,7 +2078,7 @@ Créances rattachées à des participations 267 - other + view @@ -2141,7 +2141,7 @@ Créances rattachées à des sociétés en participation 268 - other + view @@ -2187,7 +2187,7 @@ Titres immobilisés autres que les titres immobilisés de l'activité de portefeuille (droit de propriété) 271 - other + view @@ -2214,7 +2214,7 @@ Titres immobilisés (droit de créance) 272 - other + view @@ -2250,7 +2250,7 @@ Prêts 274 - other + view @@ -2295,7 +2295,7 @@ Dépôts et cautionnements versés 275 - other + view ex : badge autoroute.. @@ -2323,7 +2323,7 @@ Autres créances immobilisées 276 - other + view @@ -2341,7 +2341,7 @@ Intérêts courus 2768 - other + view @@ -2386,7 +2386,7 @@ Actions propres ou parts propres 277 - other + view @@ -2432,7 +2432,7 @@ Amortissements des immobilisations incorporelles 280 - other + view @@ -2486,7 +2486,7 @@ Amortissements des immobilisations corporelles 281 - other + view @@ -2567,7 +2567,7 @@ Dépréciations des immobilisations incorporelles 290 - other + view @@ -2612,7 +2612,7 @@ Dépréciations des immobilisations corporelles (même ventilation que celle du compte 21) 291 - other + view @@ -2639,7 +2639,7 @@ Dépréciations des immobilisations en cours 293 - other + view @@ -2666,7 +2666,7 @@ Provisions pour dépréciation des participations et créances rattachées à des participations 296 - other + view @@ -2711,7 +2711,7 @@ Dépréciations des autres immobilisations financières 297 - other + view @@ -2826,7 +2826,7 @@ Matières consommables 321 - other + view @@ -2853,7 +2853,7 @@ Fournitures consommables 322 - other + view @@ -2907,7 +2907,7 @@ Emballages 326 - other + view @@ -2952,7 +2952,7 @@ Produits en cours 331 - other + view @@ -2979,7 +2979,7 @@ Travaux en cours 335 - other + view @@ -3015,7 +3015,7 @@ Études en cours 341 - other + view @@ -3042,7 +3042,7 @@ Prestations de services en cours 345 - other + view @@ -3078,7 +3078,7 @@ Produits intermédiaires 351 - other + view @@ -3105,7 +3105,7 @@ Produits finis 355 - other + view @@ -3132,7 +3132,7 @@ Produits résiduels (ou matières de récupération) 358 - other + view @@ -3222,7 +3222,7 @@ Provisions pour dépréciation des matières premières (et fournitures) 391 - other + view @@ -3258,7 +3258,7 @@ Provisions pour dépréciation des autres approvisionnements 392 - other + view @@ -3294,7 +3294,7 @@ Provisions pour dépréciation des en-cours de production de biens 393 - other + view @@ -3321,7 +3321,7 @@ Provisions pour dépréciation des en-cours de production de services 394 - other + view @@ -3348,7 +3348,7 @@ Provisions pour dépréciation des stocks de produits 395 - other + view @@ -3375,7 +3375,7 @@ Provisions pour dépréciation des stocks de marchandises 397 - other + view @@ -3466,7 +3466,7 @@ Fournisseurs d'immobilisations 404 - payable + view @@ -3502,7 +3502,7 @@ Fournisseurs - Factures non parvenues 408 - payable + view @@ -3571,7 +3571,7 @@ Fournisseurs - Autres avoirs 4097 - other + view @@ -3683,7 +3683,7 @@ Clients - Produits non encore facturés 418 - receivable + view @@ -3792,7 +3792,7 @@ Participation des salariés aux résultats 424 - other + view @@ -3852,7 +3852,7 @@ Personnel - Charges à payer et produits à recevoir 428 - other + view @@ -3931,7 +3931,7 @@ Organismes sociaux - Charges à payer et produits à recevoir 438 - other + view @@ -3980,7 +3980,7 @@ État - Subventions à recevoir 441 - receivable + view @@ -4030,7 +4030,7 @@ État -Impôts et taxes recouvrables sur des tiers 442 - other + view @@ -4060,7 +4060,7 @@ Opérations particulières avec l'État, les collectivités publiques, les organismes internationaux 443 - other + view @@ -4100,7 +4100,7 @@ État - Taxes sur le chiffre d'affaires 445 - other + view @@ -4110,7 +4110,7 @@ TVA due intracommunautaire 4452 - other + view @@ -4150,7 +4150,7 @@ Taxes sur le chiffre d'affaires à décaisser 4455 - other + view @@ -4210,7 +4210,7 @@ TVA sur autres biens et services 44566 - other + view @@ -4261,7 +4261,7 @@ TVA collectée 44571 - other + view @@ -4311,7 +4311,7 @@ Taxes sur le chiffre d'affaires à régulariser ou en attente 4458 - other + view @@ -4401,7 +4401,7 @@ État - Charges à payer et produits à recevoir 448 - other + view @@ -4470,7 +4470,7 @@ Associés - Comptes courants 455 - receivable + view Pour frais avancés personnellement @@ -4501,7 +4501,7 @@ Associés - Opérations sur le capital 456 - receivable + view @@ -4511,7 +4511,7 @@ Associés - Comptes d'apport en société 4561 - receivable + view @@ -4541,7 +4541,7 @@ Apporteurs - Capital appelé, non versé 4562 - receivable + view @@ -4621,7 +4621,7 @@ Associés - Opérations faites en commun et en GIE 458 - receivable + view @@ -4699,7 +4699,7 @@ Divers - Charges à payer et produits à recevoir 468 - receivable + view @@ -4788,7 +4788,7 @@ Différences de conversion - ACTIF 476 - receivable + view @@ -4828,7 +4828,7 @@ Différences de conversion - PASSIF 477 - other + view @@ -4886,7 +4886,7 @@ Charges à répartir sur plusieurs exercices 481 - receivable + view @@ -4984,7 +4984,7 @@ Dépréciation des comptes du groupe et des associés 495 - other + view @@ -5024,7 +5024,7 @@ Dépréciations des comptes de débiteurs divers 496 - receivable + view @@ -5100,7 +5100,7 @@ Actions 503 - other + view @@ -5145,7 +5145,7 @@ Obligations 506 - other + view @@ -5181,7 +5181,7 @@ Autres valeurs mobilières de placement et autres créances assimilées 508 - other + view @@ -5235,7 +5235,7 @@ Valeurs à l'encaissement 511 - other + view @@ -5345,7 +5345,7 @@ Intérêts courus 518 - other + view @@ -5372,7 +5372,7 @@ Concours bancaires courants 519 - other + view @@ -5426,7 +5426,7 @@ Caisse siège social 531 - other + view @@ -5499,7 +5499,7 @@ Provisions pour dépréciation des valeurs mobilières de placement 590 - other + view @@ -5571,7 +5571,7 @@ Achats stockés - Matières premières (et fournitures) 601 - other + view Destinés à la production ou revente @@ -5608,7 +5608,7 @@ Achats stockés - Autres approvisionnements 602 - other + view Destinés à la production ou revente @@ -5618,7 +5618,7 @@ Matières consommables 6021 - other + view @@ -5645,7 +5645,7 @@ Fournitures consommables 6022 - other + view @@ -5699,7 +5699,7 @@ Emballages 6026 - other + view @@ -5736,7 +5736,7 @@ Variation des stocks (approvisionnements et marchandises) 603 - other + view Utilisé lors des inventaires @@ -5793,7 +5793,7 @@ Achats non stockés de matières et fournitures 606 - other + view Pour l'usage interne à l'entreprise @@ -5839,7 +5839,7 @@ Achats de marchandises 607 - other + view Biens revendus tels quels (707) soit une marge @@ -5878,7 +5878,7 @@ Rabais, remises et ristournes obtenus sur achats 609 - other + view @@ -5968,7 +5968,7 @@ Redevances de crédit-bail 612 - other + view @@ -5995,7 +5995,7 @@ Locations 613 - other + view @@ -6040,7 +6040,7 @@ Entretien et réparations 615 - other + view @@ -6076,7 +6076,7 @@ Primes d'assurance 616 - other + view @@ -6103,7 +6103,7 @@ Assurance transport 6163 - other + view @@ -6166,7 +6166,7 @@ Divers 618 - other + view @@ -6220,7 +6220,7 @@ Personnel extérieur à l'entreprise 621 - other + view @@ -6247,7 +6247,7 @@ Rémunérations d'intermédiaires et honoraires 622 - other + view @@ -6319,7 +6319,7 @@ Publicité, publications, relations publiques 623 - other + view Dont annonces légales, greffe, cartes visites @@ -6402,7 +6402,7 @@ Transports de biens et transports collectifs du personnel 624 - other + view @@ -6465,7 +6465,7 @@ Déplacements missions et réceptions 625 - other + view @@ -6519,7 +6519,7 @@ Services bancaires et assimilés 627 - other + view Frais de tenue de compte, etc @@ -6574,7 +6574,7 @@ Divers 628 - other + view @@ -6620,7 +6620,7 @@ Impôts, taxes et versements assimilés sur rémunérations (administration des impôts) 631 - other + view @@ -6674,7 +6674,7 @@ Impôts, taxes et versements assimilés sur rémunérations (autres organismes) 633 - other + view @@ -6737,7 +6737,7 @@ Autres impôts, taxes et versements assimilés (administration des impôts) 635 - other + view @@ -6746,7 +6746,7 @@ Impôts directs (sauf impôts sur les bénéfices) 6351 - other + view @@ -6809,7 +6809,7 @@ Droits d'enregistrement et de timbre 6354 - other + view @@ -6836,7 +6836,7 @@ Autres impôts, taxes et versements assimilés (autres organismes) 637 - other + view @@ -6890,7 +6890,7 @@ Rémunérations du personnel 641 - other + view @@ -7016,7 +7016,7 @@ Autres charges sociales 647 - other + view @@ -7088,7 +7088,7 @@ Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires 651 - other + view @@ -7133,7 +7133,7 @@ Pertes sur créances irrécouvrables 654 - other + view Faire et conserver les relances et mises en demeures @@ -7161,7 +7161,7 @@ Quotes-parts de résultat sur opérations faites en commun 655 - other + view @@ -7207,7 +7207,7 @@ Charges d'intérêt 661 - other + view @@ -7216,7 +7216,7 @@ Intérêts des emprunts et dettes 6611 - other + view @@ -7270,7 +7270,7 @@ Intérêts des autres dettes 6618 - other + view @@ -7352,7 +7352,7 @@ Charges exceptionnelles sur opérations de gestion 671 - other + view @@ -7434,7 +7434,7 @@ Valeurs comptables des éléments d'actif cédés 675 - other + view Vente d'immobilisation = (Valeur d'origine - amortissements) (contrepartie 775) @@ -7481,7 +7481,7 @@ Autres charges exceptionnelles 678 - other + view @@ -7535,7 +7535,7 @@ Dotations aux amortissements, dépréciations et provisions - Charges d'exploitation 681 - other + view @@ -7544,7 +7544,7 @@ Dotations aux amortissements des immobilisations incorporelles et corporelles 6811 - other + view @@ -7589,7 +7589,7 @@ Dotations pour dépréciations des immobilisations incorporelles et corporelles 6816 - other + view @@ -7616,7 +7616,7 @@ Dotations aux provisions pour dépréciation des actifs circulants 6817 - other + view @@ -7643,7 +7643,7 @@ Dotations aux amortissements, dépréciations et provisions - Charges financières 686 - other + view @@ -7670,7 +7670,7 @@ Dotations aux dépréciation des éléments financiers 6866 - other + view @@ -7706,7 +7706,7 @@ Dotations aux amortissements, dépréciations et provisions - Charges exceptionnelles 687 - other + view @@ -7724,7 +7724,7 @@ Dotations aux provisions réglementées (immobilisations) 6872 - other + view @@ -7796,7 +7796,7 @@ Impôts sur les bénéfices 695 - other + view @@ -7850,7 +7850,7 @@ Intégration fiscale 698 - other + view @@ -7904,7 +7904,7 @@ Ventes de produits finis 701 - other + view @@ -7950,7 +7950,7 @@ Travaux 704 - other + view @@ -7995,7 +7995,7 @@ Ventes de marchandises 707 - other + view 707-607 = marge commerciale (contrepartie 607) @@ -8032,7 +8032,7 @@ Produits des activités annexes 708 - other + view Activité accessoire ou occasionnelle @@ -8114,7 +8114,7 @@ Rabais, remises et ristournes accordés par l'entreprise 709 - other + view @@ -8195,7 +8195,7 @@ Variation des stocks (en-cours de production, produits) 713 - other + view @@ -8204,7 +8204,7 @@ Variation des en-cours de production de biens 7133 - other + view @@ -8231,7 +8231,7 @@ Variation des en-cours de production de services 7134 - other + view @@ -8258,7 +8258,7 @@ Variation des stocks de produits 7135 - other + view @@ -8339,7 +8339,7 @@ Redevances pour concessions, brevets, licences, marques, procédés, logiciels, droits et valeurs similaires 751 - other + view @@ -8402,7 +8402,7 @@ Quotes-parts de résultats sur opérations faites en commun 755 - other + view @@ -8448,7 +8448,7 @@ Produits de participations 761 - other + view @@ -8484,7 +8484,7 @@ Produits des autres immobilisations financières 762 - other + view @@ -8520,7 +8520,7 @@ Revenus des autres créances 763 - other + view @@ -8602,7 +8602,7 @@ Produits exceptionnels sur opérations de gestion 771 - other + view Écarts d'arrondis @@ -8675,7 +8675,7 @@ Produits des cessions d'éléments d'actif 775 - other + view vente d'immobilisation = prix de vente (contrepartie 675) @@ -8730,7 +8730,7 @@ Autres produits exceptionnels 778 - other + view @@ -8784,7 +8784,7 @@ Reprises sur amortissements, dépréciations et provisions (à inscrire dans les produits d'exploitation) 781 - other + view @@ -8793,7 +8793,7 @@ Reprises sur amortissements des immobilisations incorporelles et corporelles 7811 - other + view @@ -8829,7 +8829,7 @@ Reprises sur dépréciations des immobilisations corporelles et incorporelles 7816 - other + view @@ -8856,7 +8856,7 @@ Reprises sur dépréciations des actifs circulants 7817 - other + view @@ -8883,7 +8883,7 @@ Reprises sur dépréciations et provisions (à inscrire dans les produits financiers) 786 - other + view @@ -8901,7 +8901,7 @@ Reprises sur dépréciations des éléments financiers 7866 - other + view @@ -8928,7 +8928,7 @@ Reprises sur dépréciations et provisions (à inscrire dans les produits exceptionnels) 787 - other + view @@ -8937,7 +8937,7 @@ Reprises sur provisions réglementées (immobilisations) 7872 - other + view @@ -9063,7 +9063,7 @@ Engagements donnés par l'entité 801 - other + view @@ -9090,7 +9090,7 @@ Redevances crédit-bail restant à courir 8016 - other + view @@ -9126,7 +9126,7 @@ Engagements reçus par l'entité 802 - other + view @@ -9153,7 +9153,7 @@ Engagements reçus pour utilisation en crédit-bail 8026 - other + view diff --git a/addons/l10n_in/l10n_in_chart.xml b/addons/l10n_in/l10n_in_chart.xml index 9c12be2134c..f1b6a8a3b0c 100644 --- a/addons/l10n_in/l10n_in_chart.xml +++ b/addons/l10n_in/l10n_in_chart.xml @@ -117,7 +117,7 @@ Cash Account IA_AC01121 - liquidity + view diff --git a/addons/l10n_it/data/account.account.template.csv b/addons/l10n_it/data/account.account.template.csv index 7e92b7d340f..ff91ccba79a 100644 --- a/addons/l10n_it/data/account.account.template.csv +++ b/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" -"1","1","ATTIVO ","0","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" -"1106","1106","software ","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" -"1116","1116","fondo ammortamento software ","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" -"1201","1201","fabbricati ","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" -"1205","1205","macchine d'ufficio ","12","account_type_view","other","TRUE" -"1206","1206","arredamento ","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" -"1211","1211","fondo ammortamento fabbricati ","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" -"1215","1215","fondo ammortamento macchine d'ufficio ","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" -"1218","1218","fondo ammortamento imballaggi durevoli ","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" -"1301","1301","mutui attivi ","13","account_type_view","other","TRUE" -"14","14","RIMANENZE ","1","account_type_view","view","TRUE" -"1401","1401","materie di consumo ","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" -"15","15","CREDITI COMMERCIALI ","1","account_type_view","view","TRUE" -"1501","1501","crediti v/clienti ","15","account_type_receivable","receivable","TRUE" -"1502","1502","crediti commerciali diversi ","15","account_type_receivable","other","TRUE" -"1503","1503","clienti c/spese anticipate ","15","account_type_receivable","receivable","TRUE" -"1505","1505","cambiali attive ","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" -"1509","1509","fatture da emettere ","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" -"1531","1531","crediti da liquidare ","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" -"16","16","CREDITI DIVERSI ","1","account_type_view","view","TRUE" -"1601","1601","IVA n/credito ","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" -"1607","1607","imposte c/acconto ","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" -"1610","1610","crediti per cauzioni ","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" -"1640","1640","debitori diversi ","16","account_type_receivable","receivable","TRUE" -"18","18","DISPONIBILITÀ LIQUIDE ","1","account_type_view","view","TRUE" -"1801","1801","banche c/c ","18","account_type_bank","liquidity","TRUE" -"1810","1810","c/c postali ","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" -"1822","1822","valori bollati ","18","account_type_cash","liquidity","TRUE" -"19","19","RATEI E RISCONTI ATTIVI ","1","account_type_view","view","TRUE" -"1901","1901","ratei 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" -"20","20","PATRIMONIO NETTO ","2","account_type_view","view","TRUE" -"2101","2101","patrimonio netto ","20","account_type_view","other","TRUE" -"2102","2102","utile d'esercizio ","20","account_type_view","receivable","TRUE" -"2103","2103","perdita d'esercizio ","20","account_type_view","payable","TRUE" -"2104","2104","prelevamenti extra gestione ","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" -"2201","2201","fondo per imposte ","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" -"2211","2211","fondo manutenzioni programmate ","22","account_type_view","other","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" -"24","24","DEBITI FINANZIARI ","2","account_type_view","view","TRUE" -"2410","2410","mutui passivi ","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" -"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" -"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" -"25","25","DEBITI COMMERCIALI ","2","account_type_view","view","TRUE" -"2501","2501","debiti v/fornitori ","25","account_type_payable","payable","TRUE" -"2503","2503","cambiali passive ","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" -"2530","2530","clienti c/acconti ","25","account_type_payable","payable","TRUE" -"26","26","DEBITI DIVERSI ","2","account_type_view","view","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" -"2605","2605","erario c/IVA ","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" -"2620","2620","personale c/retribuzioni ","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" -"2630","2630","debiti v/istituti previdenziali ","26","account_type_payable","other","TRUE" -"2640","2640","creditori diversi ","26","account_type_payable","payable","TRUE" -"27","27","RATEI E RISCONTI PASSIVI ","2","account_type_view","view","TRUE" -"2701","2701","ratei 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" -"2801","2801","bilancio di apertura ","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" -"2811","2811","istituti previdenziali ","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" -"2822","2822","banca ... c/c ","28","account_type_view","other","TRUE" -"29","29","CONTI DEI SISTEMI SUPPLEMENTARI ","2","account_type_view","view","TRUE" -"2901","2901","beni di terzi ","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" -"2912","2912","fornitori c/impegni ","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" -"2916","2916","clienti c/impegni ","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" -"2922","2922","banche c/effetti scontati ","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" -"2931","2931","rischi 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" -"31","31","VENDITE E PRESTAZIONI ","3","account_type_view","view","TRUE" -"3101","3101","merci c/vendite ","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" -"3111","3111","ribassi e abbuoni passivi ","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" -"3201","3201","fitti attivi ","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" -"3220","3220","plusvalenze 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" -"4","4","COSTI DELLA PRODUZIONE ","0","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" -"4102","4102","materie di consumo c/acquisti ","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" -"4111","4111","ribassi e abbuoni attivi ","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" -"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" -"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" -"4201","4201","costi di trasporto ","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" -"4204","4204","costi di consulenze ","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" -"4207","4207","costi di assicurazione ","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" -"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" -"4212","4212","provvigioni passive ","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" -"4301","4301","fitti passivi ","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" -"4401","4401","salari e stipendi ","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" -"4404","4404","altri costi per il personale ","44","account_type_expense","other","TRUE" -"45","45","AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ","4","account_type_view","view","TRUE" -"4501","4501","ammortamento costi di impianto ","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" -"46","46","AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ","4","account_type_view","view","TRUE" -"4601","4601","ammortamento fabbricati ","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" -"4605","4605","ammortamento macchine d'ufficio ","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" -"4608","4608","ammortamento imballaggi durevoli ","46","account_type_view","other","TRUE" -"47","47","SVALUTAZIONI ","4","account_type_view","view","TRUE" -"4701","4701","svalutazioni immobilizzazioni immateriali ","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" -"48","48","ACCANTONAMENTI ","4","account_type_view","view","TRUE" -"481","481","ACCANTONAMENTI PER RISCHI ","48","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" -"4821","4821","accantonamento per spese future ","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" -"4901","4901","oneri fiscali diversi ","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" -"4910","4910","arrotondamenti passivi ","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" -"4940","4940","insussistenze passive ordinarie diverse ","49","account_type_view","other","TRUE" -"5","5","PROVENTI E ONERI FINANZIARI ","0","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" -"5115","5115","interessi attivi bancari ","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" -"52","52","ONERI FINANZIARI ","5","account_type_view","view","TRUE" -"5201","5201","interessi passivi v/fornitori ","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" -"5210","5210","interessi passivi su mutui ","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" -"71","71","PROVENTI STRAORDINARI ","7","account_type_view","view","TRUE" -"7101","7101","plusvalenze 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" -"72","72","ONERI STRAORDINARI ","7","account_type_view","view","TRUE" -"7201","7201","minusvalenze 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" -"7204","7204","imposte esercizi precedenti ","72","account_type_view","other","TRUE" -"81","81","IMPOSTE DELL'ESERCIZIO ","7","account_type_view","view","TRUE" -"8101","8101","imposte dell'esercizio ","81","account_type_view","other","TRUE" -"91","91","CONTI DI RISULTATO ","7","account_type_view","view","TRUE" -"9101","9101","conto di risultato economico ","91","account_type_view","other","TRUE" +0,0,"Azienda",,"account_type_view","view",FALSE +1,1,"ATTIVO ",0,"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 +1106,1106,"software ",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 +1116,1116,"fondo ammortamento software ",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 +1201,1201,"fabbricati ",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 +1205,1205,"macchine d'ufficio ",12,"account_type_view","other",TRUE +1206,1206,"arredamento ",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 +1211,1211,"fondo ammortamento fabbricati ",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 +1215,1215,"fondo ammortamento macchine d'ufficio ",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 +1218,1218,"fondo ammortamento imballaggi durevoli ",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 +1301,1301,"mutui attivi ",13,"account_type_view","other",TRUE +14,14,"RIMANENZE ",1,"account_type_view","view",TRUE +1401,1401,"materie di consumo ",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 +15,15,"CREDITI COMMERCIALI ",1,"account_type_view","view",TRUE +1501,1501,"crediti v/clienti ",15,"account_type_receivable","receivable",TRUE +1502,1502,"crediti commerciali diversi ",15,"account_type_receivable","other",TRUE +1503,1503,"clienti c/spese anticipate ",15,"account_type_receivable","receivable",TRUE +1505,1505,"cambiali attive ",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 +1509,1509,"fatture da emettere ",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 +1531,1531,"crediti da liquidare ",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 +16,16,"CREDITI DIVERSI ",1,"account_type_view","view",TRUE +1601,1601,"IVA n/credito ",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 +1607,1607,"imposte c/acconto ",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 +1610,1610,"crediti per cauzioni ",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 +1640,1640,"debitori diversi ",16,"account_type_receivable","receivable",TRUE +18,18,"DISPONIBILITÀ LIQUIDE ",1,"account_type_view","view",TRUE +1801,1801,"banche c/c ",18,"account_type_bank","liquidity",TRUE +1810,1810,"c/c postali ",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 +1822,1822,"valori bollati ",18,"account_type_cash","liquidity",TRUE +19,19,"RATEI E RISCONTI ATTIVI ",1,"account_type_view","view",TRUE +1901,1901,"ratei 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 +20,20,"PATRIMONIO NETTO ",2,"account_type_view","view",TRUE +2101,2101,"patrimonio netto ",20,"account_type_view","other",TRUE +2102,2102,"utile d'esercizio ",20,"account_type_view","receivable",TRUE +2103,2103,"perdita d'esercizio ",20,"account_type_view","payable",TRUE +2104,2104,"prelevamenti extra gestione ",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 +2201,2201,"fondo per imposte ",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 +2211,2211,"fondo manutenzioni programmate ",22,"account_type_view","other",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 +24,24,"DEBITI FINANZIARI ",2,"account_type_view","view",TRUE +2410,2410,"mutui passivi ",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 +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 +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 +25,25,"DEBITI COMMERCIALI ",2,"account_type_view","view",TRUE +2501,2501,"debiti v/fornitori ",25,"account_type_payable","payable",TRUE +2503,2503,"cambiali passive ",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 +2530,2530,"clienti c/acconti ",25,"account_type_payable","payable",TRUE +26,26,"DEBITI DIVERSI ",2,"account_type_view","view",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 +2605,2605,"erario c/IVA ",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 +2620,2620,"personale c/retribuzioni ",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 +2630,2630,"debiti v/istituti previdenziali ",26,"account_type_payable","other",TRUE +2640,2640,"creditori diversi ",26,"account_type_payable","payable",TRUE +27,27,"RATEI E RISCONTI PASSIVI ",2,"account_type_view","view",TRUE +2701,2701,"ratei 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 +2801,2801,"bilancio di apertura ",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 +2811,2811,"istituti previdenziali ",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 +2822,2822,"banca ... c/c ",28,"account_type_view","other",TRUE +29,29,"CONTI DEI SISTEMI SUPPLEMENTARI ",2,"account_type_view","view",TRUE +2901,2901,"beni di terzi ",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 +2912,2912,"fornitori c/impegni ",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 +2916,2916,"clienti c/impegni ",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 +2922,2922,"banche c/effetti scontati ",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 +2931,2931,"rischi 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 +31,31,"VENDITE E PRESTAZIONI ",3,"account_type_view","view",TRUE +3101,3101,"merci c/vendite ",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 +3111,3111,"ribassi e abbuoni passivi ",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 +3201,3201,"fitti attivi ",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 +3220,3220,"plusvalenze 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 +4,4,"COSTI DELLA PRODUZIONE ",0,"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 +4102,4102,"materie di consumo c/acquisti ",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 +4111,4111,"ribassi e abbuoni attivi ",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 +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 +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 +4201,4201,"costi di trasporto ",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 +4204,4204,"costi di consulenze ",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 +4207,4207,"costi di assicurazione ",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 +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 +4212,4212,"provvigioni passive ",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 +4301,4301,"fitti passivi ",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 +4401,4401,"salari e stipendi ",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 +4404,4404,"altri costi per il personale ",44,"account_type_expense","other",TRUE +45,45,"AMMORTAMENTI IMMOBILIZZAZIONI IMMATERIALI ",4,"account_type_view","view",TRUE +4501,4501,"ammortamento costi di impianto ",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 +46,46,"AMMORTAMENTI IMMOBILIZZAZIONI MATERIALI ",4,"account_type_view","view",TRUE +4601,4601,"ammortamento fabbricati ",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 +4605,4605,"ammortamento macchine d'ufficio ",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 +4608,4608,"ammortamento imballaggi durevoli ",46,"account_type_view","other",TRUE +47,47,"SVALUTAZIONI ",4,"account_type_view","view",TRUE +4701,4701,"svalutazioni immobilizzazioni immateriali ",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 +48,48,"ACCANTONAMENTI ",4,"account_type_view","view",TRUE +481,481,"ACCANTONAMENTI PER RISCHI ",48,"account_type_view","view",TRUE +4814,4814,"accantonamento per responsabilità civile ",481,"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 +4823,4823,"accantonamento per manutenzioni programmate ",482,"account_type_view","other",TRUE +49,49,"ONERI DIVERSI ",4,"account_type_view","view",TRUE +4901,4901,"oneri fiscali diversi ",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 +4910,4910,"arrotondamenti passivi ",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 +4940,4940,"insussistenze passive ordinarie diverse ",49,"account_type_view","other",TRUE +5,5,"PROVENTI E ONERI FINANZIARI ",0,"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 +5115,5115,"interessi attivi bancari ",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 +52,52,"ONERI FINANZIARI ",5,"account_type_view","view",TRUE +5201,5201,"interessi passivi v/fornitori ",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 +5210,5210,"interessi passivi su mutui ",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 +71,71,"PROVENTI STRAORDINARI ",7,"account_type_view","view",TRUE +7101,7101,"plusvalenze 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 +72,72,"ONERI STRAORDINARI ",7,"account_type_view","view",TRUE +7201,7201,"minusvalenze 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 +7204,7204,"imposte esercizi precedenti ",72,"account_type_view","other",TRUE +81,81,"IMPOSTE DELL'ESERCIZIO ",7,"account_type_view","view",TRUE +8101,8101,"imposte dell'esercizio ",81,"account_type_view","other",TRUE +91,91,"CONTI DI RISULTATO ",7,"account_type_view","view",TRUE +9101,9101,"conto di risultato economico ",91,"account_type_view","other",TRUE diff --git a/addons/l10n_it/i18n/l10n_it.pot b/addons/l10n_it/i18n/l10n_it.pot new file mode 100644 index 00000000000..7f210e4cd75 --- /dev/null +++ b/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 "" + diff --git a/addons/l10n_it/libroIVA.py b/addons/l10n_it/libroIVA.py old mode 100755 new mode 100644 diff --git a/addons/l10n_it/libroIVA_menu.xml b/addons/l10n_it/libroIVA_menu.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_it/libroIVA_view.xml b/addons/l10n_it/libroIVA_view.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_it/report.xml b/addons/l10n_it/report.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_it/security/ir.model.access.csv b/addons/l10n_it/security/ir.model.access.csv old mode 100755 new mode 100644 diff --git a/addons/l10n_mx/account_chart.xml b/addons/l10n_mx/account_chart.xml index 68a36a4a7b4..ea7b534d503 100644 --- a/addons/l10n_mx/account_chart.xml +++ b/addons/l10n_mx/account_chart.xml @@ -80,7 +80,7 @@ 1050 - other + view Caja diff --git a/addons/l10n_mx/i18n/l10n_mx.pot b/addons/l10n_mx/i18n/l10n_mx.pot new file mode 100644 index 00000000000..d63d6da66b0 --- /dev/null +++ b/addons/l10n_mx/i18n/l10n_mx.pot @@ -0,0 +1,33 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_mx +# +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:07:58+0000\n" +"PO-Revision-Date: 2011-01-07 06:07:58+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_mx +#: model:ir.module.module,description:l10n_mx.module_meta_information +msgid "This is the module to manage the accounting chart for Mexico in Open ERP." +msgstr "" + +#. module: l10n_mx +#: model:ir.actions.todo,note:l10n_mx.config_call_account_template_mx_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 "" + +#. module: l10n_mx +#: model:ir.module.module,shortdesc:l10n_mx.module_meta_information +msgid "Mexico - Chart of Account" +msgstr "" + diff --git a/addons/l10n_nl/i18n/l10n_nl.pot b/addons/l10n_nl/i18n/l10n_nl.pot new file mode 100644 index 00000000000..6cfe2acf190 --- /dev/null +++ b/addons/l10n_nl/i18n/l10n_nl.pot @@ -0,0 +1,54 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_nl +# +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:11:30+0000\n" +"PO-Revision-Date: 2011-01-07 06:11: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_nl +#: model:ir.actions.todo,note:l10n_nl.config_call_account_template +msgid "Na installatie van deze module word de configuratie wizard voor \"Accounting\" aangeroepen.\n" +"* U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het Nederlandse grootboekschema bevind.\n" +"* Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency om Journalen te creeren.\n" +" \n" +"Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met \"nullen\"\n" +" \n" +"* Dit is dezelfe configuratie wizard welke aangeroepen kan worden via Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.\n" +"" +msgstr "" + +#. module: l10n_nl +#: model:ir.module.module,shortdesc:l10n_nl.module_meta_information +msgid "Netherlands - Grootboek en BTW rekeningen" +msgstr "" + +#. module: l10n_nl +#: model:ir.module.module,description:l10n_nl.module_meta_information +msgid "\n" +"Read changelog in file __terp__.py for version information. \n" +"Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor Nederlandse bedrijven te installeren in OpenERP versie 5.\n" +" De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te genereren, denk b.v. aan intracommunautaire verwervingen\n" +" waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als voorheffing weer mag aftrekken.\n" +" \n" +" Na installatie van deze module word de configuratie wizard voor \"Accounting\" aangeroepen.\n" +" * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het Nederlandse grootboekschema bevind.\n" +" \n" +" * Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency om Journalen te creeren.\n" +" \n" +" Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met \"nullen\"\n" +" \n" +" * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.\n" +"\n" +" " +msgstr "" + diff --git a/addons/l10n_pl/account_chart.xml b/addons/l10n_pl/account_chart.xml index 0e6c1342a74..a24e801673e 100644 --- a/addons/l10n_pl/account_chart.xml +++ b/addons/l10n_pl/account_chart.xml @@ -702,7 +702,7 @@ 113010000 - other + view Rachunek bieżący diff --git a/addons/l10n_pl/i18n/l10n_pl.pot b/addons/l10n_pl/i18n/l10n_pl.pot new file mode 100644 index 00000000000..c7427140ee4 --- /dev/null +++ b/addons/l10n_pl/i18n/l10n_pl.pot @@ -0,0 +1,39 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_pl +# +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:14:22+0000\n" +"PO-Revision-Date: 2011-01-07 06:14:22+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_pl +#: model:ir.module.module,description:l10n_pl.module_meta_information +msgid "\n" +" This is the module to manage the accounting chart and taxes for Poland in Open ERP.\n" +" \n" +" To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do podatków\n" +" VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów zakładając,\n" +" że wszystkie towary są w obrocie hurtowym.\n" +" " +msgstr "" + +#. module: l10n_pl +#: model:ir.module.module,shortdesc:l10n_pl.module_meta_information +msgid "Poland - Chart of Accounts" +msgstr "" + +#. module: l10n_pl +#: model:ir.actions.todo,note:l10n_pl.config_call_account_template_pl_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 "" + diff --git a/addons/l10n_ro/account_chart.xml b/addons/l10n_ro/account_chart.xml index 0c490ada590..f48cc0de7e4 100644 --- a/addons/l10n_ro/account_chart.xml +++ b/addons/l10n_ro/account_chart.xml @@ -2855,7 +2855,7 @@ Dobanzi 518 - other + view @@ -4203,7 +4203,7 @@ Angajamente acordate 801 - other + view @@ -4227,7 +4227,7 @@ Angajamente primite 802 - other + view @@ -4251,7 +4251,7 @@ Alte conturi in afara bilantului 803 - other + view @@ -4323,7 +4323,7 @@ Amortizarea aferenta gradului de neutilizare a mijloacelor fixe 804 - other + view @@ -4339,7 +4339,7 @@ Dobanzi aferente contractelor de leasing si altor contracte asimilate, neajunse la scadenta 805 - other + view diff --git a/addons/l10n_ro/i18n/l10n_ro.pot b/addons/l10n_ro/i18n/l10n_ro.pot new file mode 100644 index 00000000000..9aa3dee8a37 --- /dev/null +++ b/addons/l10n_ro/i18n/l10n_ro.pot @@ -0,0 +1,48 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_ro +# +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:16:44+0000\n" +"PO-Revision-Date: 2011-01-07 06:16:44+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_ro +#: help:res.partner,nrc:0 +msgid "Registration number at the Registry of Commerce" +msgstr "" + +#. module: l10n_ro +#: field:res.partner,nrc:0 +msgid "NRC" +msgstr "" + +#. module: l10n_ro +#: model:ir.actions.todo,note:l10n_ro.config_call_account_template_ro +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_ro +#: model:ir.module.module,shortdesc:l10n_ro.module_meta_information +msgid "Romania - Chart of Accounts" +msgstr "" + +#. module: l10n_ro +#: model:ir.model,name:l10n_ro.model_res_partner +msgid "Partner" +msgstr "" + +#. module: l10n_ro +#: model:ir.module.module,description:l10n_ro.module_meta_information +msgid "This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in Open ERP." +msgstr "" + diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml index a6689ed2bc2..11d9afe8948 100644 --- a/addons/l10n_th/account_data.xml +++ b/addons/l10n_th/account_data.xml @@ -46,7 +46,7 @@ 1100 Cash - other + view @@ -54,7 +54,7 @@ 1110 Cash at Bank - other + view @@ -96,7 +96,7 @@ 1410 Building - other + view @@ -112,7 +112,7 @@ 1420 Equipment - other + view diff --git a/addons/l10n_th/i18n/l10n_th.pot b/addons/l10n_th/i18n/l10n_th.pot new file mode 100644 index 00000000000..7e9e77236c8 --- /dev/null +++ b/addons/l10n_th/i18n/l10n_th.pot @@ -0,0 +1,35 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_th +# +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:19:17+0000\n" +"PO-Revision-Date: 2011-01-07 06:19:17+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_th +#: model:ir.actions.todo,note:l10n_th.config_call_account_template_th +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_th +#: model:ir.module.module,shortdesc:l10n_th.module_meta_information +msgid "Thailand - Thai Chart of Accounts" +msgstr "" + +#. module: l10n_th +#: model:ir.module.module,description:l10n_th.module_meta_information +msgid "\n" +"Chart of accounts for Thailand.\n" +" " +msgstr "" + diff --git a/addons/l10n_uk/l10n_uk_chart.xml b/addons/l10n_uk/l10n_uk_chart.xml index f367d8b5739..9dc51fd3ad9 100644 --- a/addons/l10n_uk/l10n_uk_chart.xml +++ b/addons/l10n_uk/l10n_uk_chart.xml @@ -132,7 +132,7 @@ 11004 Bank Current Account - liquidity + view diff --git a/addons/l10n_ve/account_chart.xml b/addons/l10n_ve/account_chart.xml index 035893e8a4a..b46ff29ef8a 100644 --- a/addons/l10n_ve/account_chart.xml +++ b/addons/l10n_ve/account_chart.xml @@ -80,7 +80,7 @@ 1050 - other + view Caja @@ -125,7 +125,7 @@ 1200 - other + view Cuentas por Cobrar diff --git a/addons/l10n_ve/i18n/l10n_ve.pot b/addons/l10n_ve/i18n/l10n_ve.pot new file mode 100644 index 00000000000..3fbd8e84c76 --- /dev/null +++ b/addons/l10n_ve/i18n/l10n_ve.pot @@ -0,0 +1,39 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_ve +# +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:21:09+0000\n" +"PO-Revision-Date: 2011-01-07 06:21:09+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_ve +#: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_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.\n" +"Genere el Plan de cuentas de una Plantilla de Carta. Le pedirán pasar el nombre de la compania, la plantilla de carta para seguir, el no. de digitos para generar el codigo para sus cuentas y cuenta Bancaria, dinero para crear Diarios. Asi, la copia pura de la carta la Plantilla es generada.\n" +"Esto es el mismo wizard que corre de la Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.\n" +" " +msgstr "" + +#. module: l10n_ve +#: model:ir.module.module,description:l10n_ve.module_meta_information +msgid "\n" +"This is the module to manage the accounting chart for Venezuela in Open ERP.\n" +"Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.\n" +"" +msgstr "" + +#. module: l10n_ve +#: model:ir.module.module,shortdesc:l10n_ve.module_meta_information +msgid "Venezuela -Chart of Account" +msgstr "" + diff --git a/addons/lunch/test/test_lunch.yml b/addons/lunch/test/test_lunch.yml index 3183764d927..0b5e756f8b3 100644 --- a/addons/lunch/test/test_lunch.yml +++ b/addons/lunch/test/test_lunch.yml @@ -27,7 +27,7 @@ When I select the product "club1", the price of 2.75 is automatically proposed - !record {model: lunch.order, id: lunch_order_0}: - date: '2010-04-19' + date: !eval time.strftime('%Y-%m-%d') product: 'lunch_product_club1' price: 2.75 user_id: base.user_root @@ -66,7 +66,7 @@ I create a new lunch order "LU002" for the "Club1" product, at another date. - !record {model: lunch.order, id: lunch_order_1}: - date: '2010-04-22' + date: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month,datetime.now().day+2)" product: 'lunch_product_club1' price: 2.75 user_id: base.user_root diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index 15b59d7365f..2b0869670e9 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -201,7 +201,6 @@ Members res.partner - {"search_default_old": 1} {"search_default_all_members": 1} diff --git a/addons/membership/test/test_membership.yml b/addons/membership/test/test_membership.yml index 63c0082a60f..195fbd15b01 100644 --- a/addons/membership/test/test_membership.yml +++ b/addons/membership/test/test_membership.yml @@ -1,22 +1,22 @@ -- | +- | In Order to test the Membership in OpenERP, which allows us to manage all operations for managing memberships. - | I'm creating "Golden Membership" which has Membership fee 80 EURO and It's started from 1st June to 31st Dec. -- +- !record {model: product.product, id: product_product_membershipproduct0}: categ_id: product.cat1 membership: 1 - membership_date_from: '2010-06-01' - membership_date_to: '2010-12-31' + membership_date_from: !eval datetime.today().strftime("%Y-%m-%d") + membership_date_to: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+6,datetime.now().day)" name: Golden Membership type: service list_price: 80.00 - + - | "Mark Johnson" want to join "Golden Membership". - | I'm creating new member "Mark Johnson". -- +- !record {model: res.partner, id: res_partner_markjohnson0}: address: - city: paris @@ -27,31 +27,31 @@ zip: '75016' name: Mark Johnson - | - I'm checking "Current Membership State" of "Mark Johnson". It is an "Non Member" or not. -- + I'm checking "Current Membership State" of "Mark Johnson". It is an "Non Member" or not. +- !assert {model: res.partner, id: res_partner_markjohnson0}: - membership_state == 'none', 'Member should be has "Current Membership State" in "Non Member".' - | I'm doing to make membership invoice for "Mark Johnson" on joining "Golden Membership". -- +- !python {model: res.partner}: | self.create_membership_invoice(cr, uid, [ref("res_partner_markjohnson0")], product_id=ref("product_product_membershipproduct0"), datas={"amount":80.00}) - | - I'm checking "Current Membership State" of "Mark Johnson". It is an "Waiting Member" or not. -- + I'm checking "Current Membership State" of "Mark Johnson". It is an "Waiting Member" or not. +- !assert {model: res.partner, id: res_partner_markjohnson0}: - membership_state == 'waiting', 'Member should be has "Current Membership State" in "Waiting Member".' - | I'm Opening that Invoice which is created for "Mark Johnson". - !python {model: res.partner}: | - import netsvc + import netsvc from tools.translate import _ invoice_pool = self.pool.get('account.invoice') partner_pool = self.pool.get('res.partner') membership_line_pool = self.pool.get('membership.membership_line') membership_pool = self.pool.get('product.product') - + membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('res_partner_markjohnson0'))]) membership_lines = membership_line_pool.browse(cr, uid, membership_line_ids) assert membership_lines, _('Membership is not registrated.') @@ -63,7 +63,7 @@ - !assert {model: res.partner, id: res_partner_markjohnson0}: - membership_state == 'invoiced', 'Member should be has "Current Membership State" in "Invoiced Member".' - + - | I'm creating free member "Ms. Johnson" of "Golden Membership". - @@ -80,19 +80,19 @@ - | I'm checking "Current membership state" of "Ms. Johnson". It is an "Free Member" or not. -- +- !assert {model: res.partner, id: res_partner_msjohnson0}: - membership_state == 'free', 'Member should be has "Current Membership State" in "Free Member".' - | I'm set "Mark Johnson" as a associated member of "Ms. Johnson" and also set Non free member. -- +- !python {model: res.partner}: | self.write(cr, uid, [ref("res_partner_msjohnson0")], {'free_member': False, 'associate_member': ref("res_partner_markjohnson0")}) - | I'm checking "Current membership state" of "Ms. Johnson". It is an "Paid Member" or not. -- +- !assert {model: res.partner, id: res_partner_msjohnson0}: - membership_state == 'paid', 'Member should be has "Current Membership State" in "Paid Member".' @@ -102,8 +102,8 @@ !record {model: product.product, id: product_product_membershipproduct1}: categ_id: product.cat1 membership: 1 - membership_date_from: '2010-06-01' - membership_date_to: '2010-12-31' + membership_date_from: !eval datetime.today().strftime("%Y-%m-%d") + membership_date_to: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+6,datetime.now().day)" name: Silver Membership type: service list_price: 50.00 @@ -127,16 +127,16 @@ membership_line_pool = self.pool.get('membership.membership_line') membership_pool = self.pool.get('product.product') invoice_refund_pool = self.pool.get('account.invoice.refund') - + membership_line_ids = membership_line_pool.search(cr, uid, [('membership_id','=',ref('product_product_membershipproduct0')),('partner','=',ref('res_partner_markjohnson0'))]) membership_lines = membership_line_pool.browse(cr, uid, membership_line_ids) assert membership_lines, _('Membership is not registrated.') membership_line = membership_lines[0] refund_id = invoice_refund_pool.create(cr, uid, {'description': 'Refund of Membership', 'filter_refund': 'refund'}, {'active_id': membership_line.account_invoice_id.id}) - invoice_refund_pool.invoice_refund(cr, uid, [refund_id], {'active_id': membership_line.account_invoice_id.id, 'active_ids': [membership_line.account_invoice_id.id]}) + invoice_refund_pool.invoice_refund(cr, uid, [refund_id], {'active_id': membership_line.account_invoice_id.id, 'active_ids': [membership_line.account_invoice_id.id]}) - | I'm checking "Current membership state" of "Mark Johnson". It is an "Cancelled Member" or not. - !assert {model: res.partner, id: res_partner_markjohnson0}: - membership_state == 'canceled', 'Member should be has "Current Membership State" in "Cancelled Member".' - + diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index a57b76bf2ce..39793316591 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -117,7 +117,7 @@ class mrp_routing_workcenter(osv.osv): help="Routing indicates all the workcenters used, for how long and/or cycles." \ "If Routing is indicated then,the third tab of a production order (workcenters) will be automatically pre-completed."), 'note': fields.text('Description'), - 'company_id': fields.related('routing_id', 'company_id', type='many2one', relation='res.company', string='Company'), + 'company_id': fields.related('routing_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } _defaults = { 'cycle_nbr': lambda *a: 1.0, diff --git a/addons/mrp/test/mrp_phantom_bom.yml b/addons/mrp/test/mrp_phantom_bom.yml index 6aa0d7cb17a..ac7e78637a4 100644 --- a/addons/mrp/test/mrp_phantom_bom.yml +++ b/addons/mrp/test/mrp_phantom_bom.yml @@ -1,5 +1,5 @@ - - In order to test the mrp phantom bom type in OpenERP, I will create products + In order to test the mrp phantom bom type in OpenERP, I will create products and then I will create Phantom bom structure for those products. - I create the products required to produce some orange juices with Oranges, Sugar and Water. @@ -8,10 +8,10 @@ category_id: product.product_uom_categ_kgm factor: 1.0 name: Litre - rounding: 0.01 + rounding: 0.01 - I create record for product Orange Juice. -- +- !record {model: product.product, id: product_product_orangejuice0}: categ_id: product.cat1 name: Orange Juice @@ -25,7 +25,7 @@ property_stock_production: stock.location_production - I create record for product Orange. -- +- !record {model: product.product, id: product_product_orange0}: categ_id: product.cat1 name: Orange @@ -44,7 +44,7 @@ property_stock_production: stock.location_production - I create record for product Sugar. -- +- !record {model: product.product, id: product_product_sugar0}: categ_id: product.cat1 name: Sugar @@ -63,7 +63,7 @@ property_stock_production: stock.location_production - I create record for product Water. -- +- !record {model: product.product, id: product_product_water0}: categ_id: product.cat1 name: Water @@ -82,7 +82,7 @@ property_stock_production: stock.location_production - I define the BoM to produce an orange juice. -- +- !record {model: mrp.bom, id: mrp_bom_orangejuice0}: company_id: base.main_company name: Orange Juice @@ -93,7 +93,7 @@ type: phantom - I create bom lines for BoM for Orange Juice. -- +- !record {model: mrp.bom, id: mrp_bom_orangejuice0}: bom_lines: - bom_id: mrp_bom_orangejuice0 @@ -122,7 +122,7 @@ type: normal - I define Minimum stock rules for my stockable product "Orange". -- +- !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}: company_id: base.main_company location_id: stock.stock_location_stock @@ -136,7 +136,7 @@ warehouse_id: stock.warehouse0 - I define Minimum stock rules for my stockable product "Sugar". -- +- !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op1}: company_id: base.main_company location_id: stock.stock_location_stock @@ -149,27 +149,27 @@ qty_multiple: 1 warehouse_id: stock.warehouse0 - - I want to produce 100 litres of Orange juice. I am creating a manufacturing order for this. - I want to see how much quantities of sub products I need, to produce the Orange juice. + I want to produce 100 litres of Orange juice. I am creating a manufacturing order for this. + I want to see how much quantities of sub products I need, to produce the Orange juice. - - I compute the data. I get the bill of material of Orange juice and list of + I compute the data. I get the bill of material of Orange juice and list of scheduled products according to my bom. -- +- !record {model: mrp.production, id: mrp_production_mo0}: company_id: base.main_company - date_planned: '2010-04-16 15:53:36' + date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_dest_id: stock.stock_location_output location_src_id: stock.stock_location_stock product_id: product_product_orangejuice0 product_qty: 100.0 product_uom: product_uom_litre0 -- +- Creating an mrp.production record. Computing Bills of materials. -- +- !record {model: mrp.production, id: mrp_production_mo0}: bom_id: mrp.mrp_bom_orangejuice0 company_id: base.main_company - date_planned: '2010-04-16 15:53:36' + date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_dest_id: stock.stock_location_output location_src_id: stock.stock_location_stock name: MO/00002 @@ -194,7 +194,7 @@ product_uom: mrp.product_uom_litre0 - I confirm the order. -- +- !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0} - I am checking Procurement orders. There are 3 orders generated for Oranges, Sugar and Water. @@ -210,7 +210,7 @@ - model: procurement.order search: "[]" - - I am checking Internal picking. I see one picking for Orange juice and its + I am checking Internal picking. I see one picking for Orange juice and its stock moves for Oranges, Sugar and Water made correctly. - !python {model: stock.picking}: | @@ -218,7 +218,7 @@ pick_ids = self.search(cr, uid, [('type','=','internal')]) assert pick_ids, _('No Internal Pickings!') - - According to minimum stock rules. I have 2 purchase orders for + According to minimum stock rules. I have 2 purchase orders for Sugar with 6 Kg from Axelor and Orange 60 Kg from ASUStek. - I confirm the purchase order of Sugar and Orange. @@ -244,7 +244,7 @@ I create record for the incoming picking wizard. - !record {model: stock.partial.picking, id: stock_partial_picking0}: - date: '2010-04-30 16:53:36' + date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") - I make my pickings done. - @@ -253,7 +253,7 @@ picking_ids = pick_obj.search(cr, uid, [('type','=','in'),('state','=','assigned')]) partial = self.browse(cr, uid, 1, context) partial_datas = { - 'delivery_date': partial.date + 'delivery_date': partial.date } for pick in pick_obj.browse(cr, uid, picking_ids): for m in pick.move_lines: @@ -262,8 +262,8 @@ 'product_qty': m.product_qty, 'product_uom': m.product_uom.id } - if (pick.type == 'in') and (m.product_id.cost_method == 'average'): - partial_datas['move%s'%(m.id)].update({ + if (pick.type == 'in') and (m.product_id.cost_method == 'average'): + partial_datas['move%s'%(m.id)].update({ 'product_price': m.product_price, 'product_currency': m.product_currency }) @@ -292,5 +292,5 @@ I start the production order. - !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0} - - + + diff --git a/addons/mrp/test/mrp_procurement.yml b/addons/mrp/test/mrp_procurement.yml index 47085904c35..568a5f0b0e8 100644 --- a/addons/mrp/test/mrp_procurement.yml +++ b/addons/mrp/test/mrp_procurement.yml @@ -202,7 +202,7 @@ I create record for partial picking. - !record {model: stock.partial.picking, id: stock_partial_picking0}: - date: '2010-04-30 16:53:36' + date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") - I make my picking done. @@ -238,7 +238,7 @@ I create record for partial picking. - !record {model: stock.partial.picking, id: stock_partial_picking0}: - date: '2010-04-30 16:53:36' + date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") - I make my picking done. diff --git a/addons/mrp/test/mrp_production_order.yml b/addons/mrp/test/mrp_production_order.yml index c32665f7258..6c1a2a4403e 100644 --- a/addons/mrp/test/mrp_production_order.yml +++ b/addons/mrp/test/mrp_production_order.yml @@ -1,13 +1,13 @@ - In order to test the manufacturing order working with procurements I will use - some products with different supply method and procurement method, also check + some products with different supply method and procurement method, also check the bills of material for the products. - I am creating one manufacturing order. -- +- !record {model: mrp.production, id: mrp_production_mo1}: company_id: base.main_company - date_planned: '2010-05-06 14:55:52' + date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_dest_id: stock.stock_location_stock location_src_id: stock.stock_location_stock product_id: product.product_product_pc1 @@ -24,10 +24,10 @@ }) - I confirm the order. -- +- !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo1} - - I am checking Procurement orders for components of PC1. + I am checking Procurement orders for components of PC1. - !python {model: procurement.order}: | from tools.translate import _ diff --git a/addons/mrp_jit/test/mrp_jit.yml b/addons/mrp_jit/test/mrp_jit.yml index 9d811d8b3e6..922dc3611bd 100644 --- a/addons/mrp_jit/test/mrp_jit.yml +++ b/addons/mrp_jit/test/mrp_jit.yml @@ -4,17 +4,17 @@ - !record {model: procurement.order, id: mrp_production_mo0}: company_id: base.main_company - date_planned: '2010-08-05 17:59:49' + date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_id: stock.stock_location_stock name: PROC/TEST/0001 product_id: product.product_product_pc2 product_qty: 10.0 product_uom: product.product_uom_unit product_uos_qty: 0.0 -- +- | I confirm the procurement order PROC/TEST/0001. -- +- !workflow {model: procurement.order, action: button_confirm, ref: mrp_production_mo0} - | diff --git a/addons/mrp_operations/test/mrp_operations.yml b/addons/mrp_operations/test/mrp_operations.yml index afa3fa55d74..4830da3a545 100644 --- a/addons/mrp_operations/test/mrp_operations.yml +++ b/addons/mrp_operations/test/mrp_operations.yml @@ -3,10 +3,10 @@ and check its effects on Work orders. - I create a production order. -- +- !record {model: mrp.production, id: mrp_production_mo0}: company_id: base.main_company - date_planned: '2010-05-25 11:17:34' + date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_dest_id: stock.stock_location_stock location_src_id: stock.stock_location_stock name: MO/00002 @@ -71,13 +71,13 @@ prod_order_ids = self.search(cr, uid, [('state','=','ready')]) for po in prod_order_ids: wf_service.trg_validate(uid, 'mrp.production', po, 'button_produce', cr) -- +- I am creating a mrp.product.produce record - !record {model: mrp.product.produce, id: mrp_product_produce_0}: mode: consume_produce product_qty: 5.0 -- +- I produce the product CPU_GEN. - !python {model: mrp.product.produce}: | @@ -106,17 +106,17 @@ I check that both internal pickings are done. - !python {model: stock.picking}: | - from tools.translate import _ + from tools.translate import _ pick_ids = self.search(cr, uid, [('state','=','done'),('type','=','internal')]) assert pick_ids, _('Internal pickings are not done!') - Now I start my first production order. - - !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0} + !workflow {model: mrp.production, action: button_produce, ref: mrp_production_mo0} - - I check that the related work order is in progress state. + I check that the related work order is in progress state. - - !python {model: mrp.production.workcenter.line}: | + !python {model: mrp.production.workcenter.line}: | from tools.translate import _ order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo0')),('state','=','startworking')]) assert order_id, _('Work order not started yet!') @@ -126,7 +126,7 @@ !record {model: mrp.product.produce, id: mrp_product_produce_0}: mode: consume_produce product_qty: 5.0 -- +- I produce the product PC1. - !python {model: mrp.product.produce}: | @@ -138,7 +138,7 @@ - I check the related work order is done. - - !python {model: mrp.production.workcenter.line}: | + !python {model: mrp.production.workcenter.line}: | from tools.translate import _ order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo0')),('state','=','done')]) - assert order_id, _('Work order not done yet!') + assert order_id, _('Work order not done yet!') diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml index 3d9e85aa3ac..881ef449405 100644 --- a/addons/mrp_repair/test/test_mrp_repair.yml +++ b/addons/mrp_repair/test/test_mrp_repair.yml @@ -3,11 +3,11 @@ - | Given that I have already stock move line created. -- +- !record {model: stock.move, id: stock_move_pcbasicpc0}: company_id: base.main_company - date: '2010-06-24 20:10:28' - date_expected: '2010-06-24 20:10:55' + date: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") + date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_dest_id: stock.stock_location_stock location_id: stock.stock_location_stock name: '[PC1] Basic PC' @@ -15,13 +15,13 @@ product_qty: 1.0 product_uom: product.product_uom_unit product_uos_qty: 1.0 - + - | I start by creating new Repair order for "Basic Pc" product. -- +- !record {model: mrp.repair, id: mrp_repair_rma0}: address_id: base.res_partner_address_1 - guarantee_limit: '2010-06-24' + guarantee_limit: !eval datetime.today().strftime("%Y-%m-%d") invoice_method: 'after_repair' partner_invoice_id: base.res_partner_address_1 location_dest_id: stock.stock_location_14 @@ -41,23 +41,23 @@ type: add partner_id: base.res_partner_9 product_id: product.product_product_pc1 - + - | I check that Repair order is in "Draft" state. -- +- !assert {model: mrp.repair, id: mrp_repair_rma0}: - state == 'draft' - | I confirm This Repair order. -- - !workflow {model: mrp.repair, action: repair_confirm, ref: mrp_repair_rma0} +- + !workflow {model: mrp.repair, action: repair_confirm, ref: mrp_repair_rma0} - | I start the repairing process by click on "Start Repair" Button. - !workflow {model: mrp.repair, action: repair_ready, ref: mrp_repair_rma0} - + - | I check that state is "Under Repair". - @@ -70,12 +70,12 @@ - | I select invoiced after repair option in this "RMA00004" Repair order. so I create Invoice by click on "Make Invoice" wizard. -- +- !record {model: mrp.repair.make_invoice, id: mrp_repair_make_invoice_0}: group: 1 - | I click on "Create Invoice" button of this wizard to make invoice. -- +- !python {model: mrp.repair.make_invoice}: | self.make_invoices(cr, uid, [ref("mrp_repair_make_invoice_0")], {"active_ids": [ref("mrp_repair.mrp_repair_rma0")]}) - | @@ -87,5 +87,5 @@ repair_id = self.browse(cr, uid, [ref('mrp_repair_rma0')], context=context)[0] invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', repair_id.partner_id.id)]) invoice_id = inv_obj.browse(cr, uid, invoice_ids)[0] - + assert repair_id.partner_id.id == invoice_id.partner_id.id, "No invoice existing for the same partner" diff --git a/addons/mrp_subproduct/test/mrp_subproduct.yml b/addons/mrp_subproduct/test/mrp_subproduct.yml index 56c62b94d09..43bb6e7247e 100644 --- a/addons/mrp_subproduct/test/mrp_subproduct.yml +++ b/addons/mrp_subproduct/test/mrp_subproduct.yml @@ -107,7 +107,7 @@ !record {model: mrp.production, id: mrp_production_mo0}: bom_id: mrp_bom_woodenchair0 company_id: base.main_company - date_planned: '2010-08-06 14:55:52' + date_planned: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S") location_dest_id: stock.stock_location_stock location_src_id: stock.stock_location_stock name: MO/00004 diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index c572b1864a2..d2fb9c54646 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -515,15 +515,19 @@ + + + + diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py old mode 100755 new mode 100644 diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml index 03d04d83f70..b022bd86693 100644 --- a/addons/point_of_sale/point_of_sale_demo.xml +++ b/addons/point_of_sale/point_of_sale_demo.xml @@ -26,7 +26,7 @@ / - 2010-10-07 + @@ -53,7 +53,7 @@ 2011-04-07 - 2010-10-07 16:53:11 + @@ -62,7 +62,7 @@ paid - 2010-10-07 + POS/019 tax_excluded @@ -76,7 +76,7 @@ - 2010-10-07 + @@ -87,7 +87,7 @@ Cash Journal - (test) - 2010-10-07 + @@ -98,18 +98,18 @@ POS/019 - 2010-10-07 16:53:46 + direct POS notes done out - 2010-10-07 16:53:46 - 2010-10-07 16:33:30 + + OUT/00019 none - 2010-10-07 16:53:46 + POS/019 @@ -123,12 +123,12 @@ done - 2010-10-07 16:33:30 - 2010-10-07 16:33:30 + + Stock move (POS 12) - 2010-10-07 16:53:46 + @@ -166,7 +166,7 @@ - 2010/09/15 + [PC3] Medium PC @@ -178,7 +178,7 @@ - 2010/09/15 + [PC2] Basic+ PC (assembly on order) @@ -190,7 +190,7 @@ - 2010/09/15 + [PC1] Basic PC diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py index 7bda5b04647..e49528441b9 100644 --- a/addons/point_of_sale/report/pos_sales_user.py +++ b/addons/point_of_sale/report/pos_sales_user.py @@ -43,8 +43,7 @@ class pos_sales_user(report_sxw.rml_parse): "and po.company_id=rc.id and po.user_id=ru.id and po.user_id IN %s " \ ,(dt1,dt2,tuple(form['user_id']))) - data = self.cr.dictfetchall() - return data + return self.cr.dictfetchall() report_sxw.report_sxw('report.pos.sales.user', 'pos.order', 'addons/point_of_sale/report/pos_sales_user.rml', parser=pos_sales_user,header='internal') diff --git a/addons/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py index 04693064257..87cf306990a 100644 --- a/addons/point_of_sale/report/pos_users_product.py +++ b/addons/point_of_sale/report/pos_users_product.py @@ -34,7 +34,7 @@ class pos_user_product(report_sxw.rml_parse): }) - def _get_data(self,o): + def _get_data(self, o): self.total = 0.0 data={} sql1=""" SELECT distinct(o.id) from account_bank_statement s, account_bank_statement_line l,pos_order o,pos_order_line i where i.order_id=o.id and o.state='paid' and l.statement_id=s.id and l.pos_statement_id=o.id and s.id=%d"""%(o.id) @@ -51,7 +51,7 @@ class pos_user_product(report_sxw.rml_parse): self.total += d['amt'] return data - def _get_user(self,object): + def _get_user(self, object): for o in object: sql = """select ru.name from account_bank_statement as abs,res_users ru where abs.user_id = ru.id diff --git a/addons/point_of_sale/test/point_of_sale_report.yml b/addons/point_of_sale/test/point_of_sale_report.yml index 1a77e8f30d4..323d227f7d2 100644 --- a/addons/point_of_sale/test/point_of_sale_report.yml +++ b/addons/point_of_sale/test/point_of_sale_report.yml @@ -89,11 +89,11 @@ !record {model: account.bank.statement, id: account_bank_statement_st0}: name: St.05/19 balance_end_real: 0.0 - date: '2010-05-19' + date: !eval time.strftime('%Y-%m-%d') journal_id: account_journal_cash0 line_ids: - name: statement - date: "2010-10-13" + date: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+5,datetime.now().day)" type: customer account_id: account_pos_account_sales amount: 100 diff --git a/addons/point_of_sale/test/point_of_sale_test.yml b/addons/point_of_sale/test/point_of_sale_test.yml index 347ea961c8f..c8ed72e386f 100644 --- a/addons/point_of_sale/test/point_of_sale_test.yml +++ b/addons/point_of_sale/test/point_of_sale_test.yml @@ -289,8 +289,8 @@ - !record {model: pos.order, id: pos_order_pos0}: company_id: base.main_company - date_order: '2010-05-13 15:02:48' - date_validity: '2010-11-13' + date_order: !eval time.strftime('%Y-%m-%d %H:%M:%S') + date_validity: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+6,datetime.now().day)" lines: - company_id: base.main_company name: Order Line/01 @@ -327,16 +327,24 @@ I open the statement. - !python {model: pos.open.statement}: | - self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model": - "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz": - False, "active_id": ref("point_of_sale.menu_open_statement"), }) + jou_obj = self.pool.get('account.journal') + statement_obj = self.pool.get('account.bank.statement') + cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users " + "WHERE user_id = %s ORDER BY journal_id"% (uid, )) + jou_ids = map(lambda x1: x1[0], cr.fetchall()) + journal_ids = jou_obj.search(cr, uid, [('auto_cash', '=', True), ('type', '=', 'cash'), ('id', 'in', jou_ids)], context=context) + ids = statement_obj.search(cr, uid, [('state', '=', 'open'), ('user_id', '=', uid), ('journal_id', 'in', journal_ids)], context=context) + if not ids: + self.open_statement(cr, uid, [ref("pos_open_statement_0")], {"lang": "en_US", "active_model": + "ir.ui.menu", "active_ids": [ref("point_of_sale.menu_open_statement")], "tz": + False, "active_id": ref("point_of_sale.menu_open_statement"), }) - I click on the "Make Payment" wizard. - !record {model: pos.make.payment, id: pos_make_payment_0}: amount: 1615.0 journal: 7 - payment_date: "2010-05-13" + payment_date: !eval time.strftime("%Y-%m-%d") payment_name: Payment product_id: product_product_hppaviliondesktoppcs0 pricelist_id: product.list0 @@ -398,7 +406,7 @@ !record {model: pos.make.payment, id: pos_make_payment_1}: amount: 680.0 journal: 7 - payment_date: "2010-05-13" + payment_date: !eval time.strftime("%Y-%m-%d") payment_name: Payment product_id: product_product_hppaviliondesktoppcs0 pricelist_id: product.list0 diff --git a/addons/project/project.py b/addons/project/project.py index b6664f9869b..4016a2f45bb 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -699,7 +699,7 @@ class project_work(osv.osv): 'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True), 'hours': fields.float('Time Spent'), 'user_id': fields.many2one('res.users', 'Done by', required=True), - 'company_id': fields.related('task_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True) + 'company_id': fields.related('task_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True) } _defaults = { diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml index bca3bcbff41..f79c2a34224 100644 --- a/addons/project/test/test_project.yml +++ b/addons/project/test/test_project.yml @@ -10,7 +10,7 @@ Create task 'Technical Training' for this project - !record {model: project.task, id: project_task_technicaltraining0}: - date_start: '2010-05-31 11:48:38' + date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S') name: Technical Training planned_hours: 30.0 project_id: project_project_openerptrainingprogramme0 @@ -20,7 +20,7 @@ Create task 'Functional Training' for this project - !record {model: project.task, id: project_task_functionaltraining0}: - date_start: '2010-05-31 11:49:11' + date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S') name: Functional Training planned_hours: 30.0 project_id: project_project_openerptrainingprogramme0 @@ -136,7 +136,7 @@ - !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}: work_ids: - - date: '2010-05-31 15:04:22' + - date: !eval time.strftime('%Y-%m-%d %H:%M:%S') hours: 10.0 name: Training on OpenERP modules, models and classes user_id: base.user_root @@ -151,7 +151,7 @@ - !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}: work_ids: - - date: '2010-06-01 15:04:46' + - date: !eval time.strftime('%Y-%m-%d %H:%M:%S') hours: 10.0 name: Training on OpenERP xml views user_id: base.user_root @@ -166,7 +166,7 @@ - !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}: work_ids: - - date: '2010-06-02 15:05:24' + - date: !eval time.strftime('%Y-%m-%d %H:%M:%S') hours: 10.0 name: Training on workflows user_id: base.user_root @@ -202,7 +202,7 @@ - !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}: work_ids: - - date: '2010-05-31 15:08:40' + - date: !eval time.strftime('%Y-%m-%d %H:%M:%S') hours: 10.0 name: Training on reports and wizards user_id: base.user_root @@ -253,7 +253,7 @@ - !record {model: project.task, id: project_task_technicaltraining0, context:{'no_analytic_entry':True}}: work_ids: - - date: '2010-05-31 16:55:27' + - date: !eval time.strftime('%Y-%m-%d %H:%M:%S') hours: 5.0 name: Training on yml user_id: base.user_root diff --git a/addons/project_long_term/test/schedule_phase_tasks.yml b/addons/project_long_term/test/schedule_phase_tasks.yml index 1526d04f933..9265c4cd7e2 100644 --- a/addons/project_long_term/test/schedule_phase_tasks.yml +++ b/addons/project_long_term/test/schedule_phase_tasks.yml @@ -15,7 +15,7 @@ Create phase 'Develop GUI' in Outlook - !record {model: project.phase, id: project_phase_phase0}: - date_start: '2010-06-02' + date_start: !eval time.strftime("%Y-%m-%d") duration: 200.0 name: Develop GUI in Outlook product_uom: product.uom_day diff --git a/addons/project_long_term/test/schedule_project_phases.yml b/addons/project_long_term/test/schedule_project_phases.yml index 829258eefc8..4bc6549bf35 100644 --- a/addons/project_long_term/test/schedule_project_phases.yml +++ b/addons/project_long_term/test/schedule_project_phases.yml @@ -1,6 +1,6 @@ -- +- Create a project 'World Bank's Project' -- +- !record {model: project.project, id: project_project_worldbanksproject0}: name: "World Bank's Project" priority: 4 @@ -12,26 +12,26 @@ - project.res_users_designer - project.res_users_tester -- +- Create a project phase 'Defining Client's Basic Idea of Project' -- +- !record {model: project.phase, id: project_phase_definingclientsbasicideaofproject0}: - date_start: '2010-06-02' + date_start: !eval time.strftime('%Y-%m-%d') duration: 15.0 name: "Defining Client's Basic Idea of Project" product_uom: product.uom_day project_id: project_project_worldbanksproject0 -- +- Create project phase 'Establishing Project Feasibility' -- +- !record {model: project.phase, id: project_phase_establishingprojectfeasibility0}: - date_start: '2010-06-02' + date_start: !eval time.strftime('%Y-%m-%d') duration: 30.0 name: Establishing Project Feasibility product_uom: product.uom_day project_id: project_project_worldbanksproject0 - + - Resource1 - @@ -45,7 +45,7 @@ !record {model: project.resource.allocation, id: res_phase2}: resource_id: project_long_term.resource_analyst phase_id: project_phase_definingclientsbasicideaofproject0 - + - Resource3 - @@ -53,9 +53,9 @@ resource_id: project_long_term.resource_technical_leader phase_id: project_phase_definingclientsbasicideaofproject0 -- +- Create the phase task 'Develop GUI for Server Configuration' -- +- !record {model: project.task, id: project_task_t0}: name: Develop GUI for Server Configuration planned_hours: 20.0 @@ -63,9 +63,9 @@ phase_id: project_phase_definingclientsbasicideaofproject0 project_id: project_project_worldbanksproject0 -- +- Create the phase task 'Develop GUI for Modules Configuration' -- +- !record {model: project.task, id: project_task_t1}: name: Develop GUI for Modules Configuration planned_hours: 25.0 @@ -73,17 +73,17 @@ state: draft phase_id: project_phase_definingclientsbasicideaofproject0 project_id: project_project_worldbanksproject0 - -- + +- Create project phase 'Preparation of Engineering Designs' -- +- !record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}: - date_start: '2010-06-02' + date_start: !eval time.strftime('%Y-%m-%d') duration: 100.0 name: Preparation of Engineering Designs product_uom: product.uom_hour project_id: project_project_worldbanksproject0 - + - Resource4 - @@ -98,9 +98,9 @@ resource_id: project_long_term.resource_designer phase_id: project_phase_preparationofengineeringdesigns0 -- +- Create the phase task 'Develop GUI for Client Configuration' -- +- !record {model: project.task, id: project_task_t2}: name: Develop GUI for Server Configuration planned_hours: 20.0 @@ -109,9 +109,9 @@ phase_id: project_phase_preparationofengineeringdesigns0 project_id: project_project_worldbanksproject0 -- +- Create the phase task 'Develop GUI for Client Module Configuration' -- +- !record {model: project.task, id: project_task_t3}: name: Develop GUI for Modules Configuration planned_hours: 25.0 @@ -121,89 +121,89 @@ project_id: project_project_worldbanksproject0 -- +- Create project phase 'Procurement of Works and Goods' -- +- !record {model: project.phase, id: project_phase_procurementofworksandgoods0}: - date_start: '2010-06-02' + date_start: !eval time.strftime('%Y-%m-%d') duration: 24.0 name: Procurement of Works and Goods product_uom: product.uom_hour project_id: project_project_worldbanksproject0 - -- + +- Create project phase 'Project Construction' -- +- !record {model: project.phase, id: project_phase_projectconstruction0}: - date_start: '2010-06-02' - duration: 20.0 + date_start: !eval time.strftime('%Y-%m-%d') + duration: 4320.0 name: Project Construction product_uom: product.uom_hour project_id: project_project_worldbanksproject0 - - -- + + +- Create project phase 'Project Completion' -- +- !record {model: project.phase, id: project_phase_projectcompletion0}: - date_start: '2010-06-02' + date_start: !eval time.strftime('%Y-%m-%d') duration: 240.0 name: Project Completion product_uom: product.uom_hour project_id: project_project_worldbanksproject0 -- +- Set previous phase for phase 'Establishing Project Feasibility' -- +- !record {model: project.phase, id: project_phase_establishingprojectfeasibility0}: previous_phase_ids: - project_phase_definingclientsbasicideaofproject0 - - -- + + +- Set previous phase for phase 'Preparation of Engineering Designs' -- +- !record {model: project.phase, id: project_phase_preparationofengineeringdesigns0}: previous_phase_ids: - project_phase_establishingprojectfeasibility0 - -- + +- Set previous phase for phase 'Procurement of Works and Goods' -- +- !record {model: project.phase, id: project_phase_procurementofworksandgoods0}: previous_phase_ids: - project_phase_preparationofengineeringdesigns0 - -- + +- Set previous phase for phase 'Project Construction' -- +- !record {model: project.phase, id: project_phase_projectconstruction0}: previous_phase_ids: - project_phase_procurementofworksandgoods0 - - -- + + +- Set previous phase for phase 'Project Completion' -- +- !record {model: project.phase, id: project_phase_projectcompletion0}: previous_phase_ids: - project_phase_projectconstruction0 -- +- Get the project to schedule phases -- +- !record {model: project.compute.phases, id: project_compute_phases_0}: project_id: project_project_worldbanksproject0 target_project: one - - -- + + +- Schedule project phases -- +- !python {model: project.project}: | self.schedule_phases(cr, uid, ref("project_project_worldbanksproject0")) - + - Check if phases scheduled, check that either of phase's start_date, end_date and user_id is not null - @@ -211,6 +211,6 @@ prj=self.browse(cr, uid, [ref("project_project_worldbanksproject0")])[0] for phase in prj.phase_ids: if (not phase.responsible_id) or (not phase.date_start) or (not phase.date_end): - raise AssertionError("Tasks not scheduled") - - + raise AssertionError("Tasks not scheduled") + + diff --git a/addons/project_long_term/test/schedule_project_tasks.yml b/addons/project_long_term/test/schedule_project_tasks.yml index 04a05437487..825b7c404d9 100644 --- a/addons/project_long_term/test/schedule_project_tasks.yml +++ b/addons/project_long_term/test/schedule_project_tasks.yml @@ -16,7 +16,7 @@ Create phase 'Develop GUI' in thunderbird - !record {model: project.phase, id: project_phase_phase1}: - date_start: '2010-06-02' + date_start: !eval time.strftime('%Y-%m-%d') duration: 200.0 name: Develop GUI in thunderbird product_uom: product.uom_day diff --git a/addons/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml index a997f09fd04..caea7d70e0a 100644 --- a/addons/project_mrp/test/project_task_procurement.yml +++ b/addons/project_mrp/test/project_task_procurement.yml @@ -19,7 +19,7 @@ I create a sale order for product Partners Training which has type 'Service'. - !record {model: sale.order, id: sale_order_so0}: - date_order: '2010-05-21' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: SO006 order_policy: manual diff --git a/addons/project_planning/test/planning_states.yml b/addons/project_planning/test/planning_states.yml index 12dd38c8247..5d40a199280 100644 --- a/addons/project_planning/test/planning_states.yml +++ b/addons/project_planning/test/planning_states.yml @@ -3,8 +3,8 @@ - !record {model: report_account_analytic.planning, id: report_account_analytic_planning_projectplanning0}: business_days: 20 - date_from: '2010-06-01' - date_to: '2010-06-30' + date_from: !eval time.strftime('%Y-%m-%d') + date_to: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month+1,datetime.now().day)" name: Project Planning state: draft user_id: base.user_demo diff --git a/addons/project_retro_planning/test/deadline_change.yml b/addons/project_retro_planning/test/deadline_change.yml index 3e778916792..39dec6bf42a 100644 --- a/addons/project_retro_planning/test/deadline_change.yml +++ b/addons/project_retro_planning/test/deadline_change.yml @@ -10,9 +10,9 @@ Create task 'Plan all projects' - !record {model: project.task, id: project_task_planallprojects0}: - date_deadline: '2010-06-07' - date_end: '2010-06-04 14:00:00' - date_start: '2010-06-01 17:25:32' + date_deadline: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month,datetime.now().day+6)" + date_end: !eval "'%s-%s-%s %s:%s:%s' %(datetime.now().year,datetime.now().month,datetime.now().day+3,datetime.now().hour,datetime.now().minute,datetime.now().second)" + date_start: !eval time.strftime('%Y-%m-%d %H:%M:%S') name: Plan all projects planned_hours: 24.0 project_id: project_project_retroplanning0 diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml index 7b69627a00a..4cf790c4e2b 100644 --- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml +++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml @@ -1,6 +1,6 @@ -- +- Create a user 'HR Manager' -- +- !record {model: res.users, id: res_users_hrmanager0}: company_id: base.main_company context_lang: en_US @@ -8,11 +8,11 @@ name: HR Manager password: hr groups_id: - - base.group_hr_manager - -- + - base.group_hr_manager + +- Create a product with type service used to specify employees designation -- +- !record {model: product.product, id: product_product_hrmanger0}: categ_id: product.product_category_services cost_method: standard @@ -29,15 +29,15 @@ weight: 0.0 weight_net: 0.0 -- +- Create an analytic journal for employees timesheet -- +- !record {model: account.analytic.journal, id: account_analytic_journal_hrtimesheet0}: company_id: base.main_company name: HR Timesheet type: general -- +- Create an employee 'HR Manager' for user 'HR Manager' - !record {model: hr.employee, id: hr_employee_hrmanager0}: @@ -45,60 +45,60 @@ user_id: res_users_hrmanager0 product_id: product_product_hrmanger0 journal_id: account_analytic_journal_hrtimesheet0 - -- + +- Create a timesheet sheet for HR manager -- +- !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0}: - date_current: '2010-06-03' - date_from: '2010-06-01' - date_to: '2010-06-30' + date_current: !eval time.strftime('%Y-06-%d') + date_from: !eval "'%s-06-01' %(datetime.now().year)" + date_to: !eval "'%s-06-30' %(datetime.now().year)" name: Sheet for hr manager state: new user_id: res_users_hrmanager0 employee_id : 'hr_employee_hrmanager0' -- +- Create a project 'Timesheet Management' -- +- !record {model: project.project, id: project_project_timesheetmanagement0}: company_id: base.main_company name: Timesheet Management - - -- + + +- Create a task 'Get all timesheet records' -- +- !record {model: project.task, id: project_task_getalltimesheetrecords0}: - date_start: '2010-06-03 14:54:55' + date_start: !eval time.strftime('%Y-06-%d %H:%M:%S') name: Get all timesheet records planned_hours: 20.0 project_id: project_project_timesheetmanagement0 remaining_hours: 20.0 state: draft user_id: res_users_hrmanager0 - -- + +- Open the task -- +- !python {model: project.task}: | self.do_open(cr, uid, [ref("project_task_getalltimesheetrecords0")], {"lang": "en_US", "active_ids": [ref("project_project_timesheetmanagement0")], "tz": False, "active_model": "project.project", "department_id": False, "project_id": False, "active_id": ref("project_project_timesheetmanagement0"), }) -- - Make a work task entry 'Get work calendar of all employees' of 10 hours done by HR manager -- +- + Make a work task entry 'Get work calendar of all employees' of 10 hours done by HR manager +- !record {model: project.task, id: project_task_getalltimesheetrecords0}: work_ids: - - date: '2010-06-03 15:04:47' + - date: !eval time.strftime('%Y-06-%d %H:%M:%S') hours: 10.0 - name: Get work calendar of all employees + name: Get work calendar of all employees user_id: res_users_hrmanager0 - Check for timesheet_ids in HR manager's timesheet - !assert {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0, string: After hr manager's work task, length of timesheet line of current timesheet must be greater then 1}: - - len(timesheet_ids) > 0 + - len(timesheet_ids) > 0 diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index b3c3549b952..b0e8b9a6c62 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -615,7 +615,7 @@ class purchase_order_line(osv.osv): 'notes': fields.text('Notes'), 'order_id': fields.many2one('purchase.order', 'Order Reference', select=True, required=True, ondelete='cascade'), 'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',), - 'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',store=True,string='Company'), + 'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True), 'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', required=True, readonly=True, help=' * The \'Draft\' state is set automatically when purchase order in draft state. \ \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \ @@ -672,7 +672,7 @@ class purchase_order_line(osv.osv): seller_delay = 0 prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1] - res = {} + res = {} for s in prod.seller_ids: if s.name.id == partner_id: seller_delay = s.delay diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml index 053c6f17b14..57c06eab346 100644 --- a/addons/purchase/purchase_demo.xml +++ b/addons/purchase/purchase_demo.xml @@ -26,7 +26,7 @@ - 2010/09/15 + New server config + material @@ -36,7 +36,7 @@ - 2010/09/15 + [PC1] Basic PC @@ -46,7 +46,7 @@ - 2010/09/15 + [PC3] Medium PC diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml index 2afd6c2fb62..83eec43594b 100644 --- a/addons/purchase/test/procurement_buy.yml +++ b/addons/purchase/test/procurement_buy.yml @@ -1,9 +1,9 @@ - - In order to test the procurement with product type buy in OpenERP, I will create product + In order to test the procurement with product type buy in OpenERP, I will create product and then I will create procurement for this product. -- +- I create product. -- +- !record {model: product.product, id: product_product_cddrive0}: categ_id: product.product_category_3 cost_method: standard @@ -27,12 +27,12 @@ name: base.res_partner_asus min_qty: 2.0 qty: 5.0 -- +- I create procurement order. -- +- !record {model: procurement.order, id: procurement_order_testcase0}: company_id: base.main_company - date_planned: '2010-07-07 15:38:53' + date_planned: !eval time.strftime('%Y-%m-%d %H:%M:%S') location_id: stock.stock_location_stock name: Test Case priority: '1' @@ -43,13 +43,13 @@ product_uos: product.product_uom_unit product_uos_qty: 0.0 state: draft -- +- I confirm on procurement order. -- +- !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_testcase0} -- +- I run the scheduler. -- +- !function {model: procurement.order, name: run_scheduler}: - model: procurement.order search: "[]" @@ -66,19 +66,19 @@ !python {model: procurement.order}: | from tools.translate import _ proc_ids = self.browse(cr, uid, [ref('procurement_order_testcase0')])[0] - assert(proc_ids.state == 'running'), _('Exception') -- + assert(proc_ids.state == 'running'), _('Exception') +- I confirm and Approve the purchase order. -- +- !python {model: purchase.order}: | procurement_obj = self.pool.get('procurement.order') proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0] import netsvc wf_service = netsvc.LocalService("workflow") - wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_confirm', cr) -- + wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_confirm', cr) +- I receive the order of the supplier ASUStek from the Incoming Shipments menu. -- +- !python {model: stock.picking }: | import time procurement_obj = self.pool.get('procurement.order') @@ -96,7 +96,7 @@ 'product_id': move.product_id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } + } self.do_partial(cr, uid, [picking.id], partial_datas) - I confirm the Reservation. @@ -111,4 +111,4 @@ !python {model: procurement.order}: | from tools.translate import _ proc_ids = self.browse(cr, uid, [ref('procurement_order_testcase0')])[0] - assert(proc_ids.state == 'done'), _('Order is not in done state') + assert(proc_ids.state == 'done'), _('Order is not in done state') diff --git a/addons/purchase/test/purchase_from_manual.yml b/addons/purchase/test/purchase_from_manual.yml index 6b95748bc4d..2739d74110e 100644 --- a/addons/purchase/test/purchase_from_manual.yml +++ b/addons/purchase/test/purchase_from_manual.yml @@ -28,11 +28,11 @@ - !record {model: purchase.order, id: purchase_order_po1}: company_id: base.main_company - date_order: '2010-05-11' + date_order: !eval time.strftime('%Y-%m-%d') invoice_method: manual location_id: stock.stock_location_stock order_line: - - date_planned: '2010-05-13' + - date_planned: !eval time.strftime('%Y-%m-%d') name: iPod price_unit: 100.0 product_id: 'product_product_ipod0' diff --git a/addons/purchase/test/purchase_from_order.yml b/addons/purchase/test/purchase_from_order.yml index ca089db7821..3acc68cb51b 100644 --- a/addons/purchase/test/purchase_from_order.yml +++ b/addons/purchase/test/purchase_from_order.yml @@ -23,16 +23,16 @@ weight_net: 0.0 - In order to test the purchase flow,I create a new record where "invoice_method" is From Order. -- +- I create purchase order for iPod. -- +- !record {model: purchase.order, id: purchase_order_po0}: company_id: base.main_company - date_order: '2010-05-11' + date_order: !eval time.strftime('%Y-%m-%d') invoice_method: order location_id: stock.stock_location_stock order_line: - - date_planned: '2010-05-13' + - date_planned: !eval time.strftime('%Y-%m-%d') name: iPod price_unit: 100.0 product_id: 'product_product_ipod0' @@ -42,20 +42,20 @@ partner_address_id: base.res_partner_address_7 partner_id: base.res_partner_4 pricelist_id: purchase.list0 -- +- Initially purchase order is in the draft state. - !assert {model: purchase.order, id: purchase_order_po0}: - - state == 'draft' + - state == 'draft' - I confirm the purchase order for iPod. - !workflow {model: purchase.order, action: purchase_confirm, ref: purchase_order_po0} -- +- I check that the order which was initially in the draft state has transit to confirm state. - !assert {model: purchase.order, id: purchase_order_po0}: - - state == 'approved' + - state == 'approved' - I check that an entry gets created in the "Lines to Invoice" of Invoice Control on the basis of purchase order line. - @@ -76,7 +76,7 @@ I create invoice for products in the purchase order. - !python {model: purchase.order.line_invoice}: | - pur_obj=self.pool.get('purchase.order') + pur_obj=self.pool.get('purchase.order') ids = [] pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po0")) for line in pur_id1.order_line: @@ -104,7 +104,7 @@ I check that the order which was initially in the confirmed state has transit to approved state. - !assert {model: purchase.order, id: purchase_order_po0}: - - state == 'approved' + - state == 'approved' - I check that date_approve field of Delivery&Invoices gets bind with the date on which it has been approved. - @@ -112,7 +112,7 @@ pur_id=self.browse(cr, uid, ref("purchase_order_po0")) assert(pur_id.date_approve) - - I check that an entry gets created in the pickings. + I check that an entry gets created in the pickings. - !python {model: purchase.order}: | pur_id=self.browse(cr, uid, ref("purchase_order_po0")) @@ -132,7 +132,7 @@ - I check that Traceability moves are created. - - I check that an invoice_ids field of Delivery&Invoices gets bind with the value. + I check that an invoice_ids field of Delivery&Invoices gets bind with the value. - !python {model: purchase.order}: | pur_id2=self.browse(cr, uid, ref("purchase_order_po0")) diff --git a/addons/purchase/test/purchase_from_picking.yml b/addons/purchase/test/purchase_from_picking.yml index 357d865b9c9..94239ba28c4 100644 --- a/addons/purchase/test/purchase_from_picking.yml +++ b/addons/purchase/test/purchase_from_picking.yml @@ -28,11 +28,11 @@ - !record {model: purchase.order, id: purchase_order_po2}: company_id: base.main_company - date_order: '2010-05-11' + date_order: !eval time.strftime('%Y-%m-%d') invoice_method: picking location_id: stock.stock_location_stock order_line: - - date_planned: '2010-05-13' + - date_planned: !eval time.strftime('%Y-%m-%d') name: iPod price_unit: 100.0 product_id: 'product_product_ipod0' @@ -132,10 +132,11 @@ Then I create an invoice from picking by clicking on "Create Invoice" wizard - !python {model: stock.invoice.onshipping}: | + import time pur_obj=self.pool.get('purchase.order') pur_id1=pur_obj.browse(cr, uid, ref("purchase_order_po2")) pick_ids = [x.id for x in pur_id1.picking_ids] - id = self.create(cr, uid, {'invoice_date': '2010-05-11', 'journal_id': ref('account.expenses_journal')}, + id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.expenses_journal')}, {'active_ids': pick_ids}) self.create_invoice(cr, uid, [id], {"active_ids": pick_ids, "active_id": pick_ids[0]}) - diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml index a0b4d7f217b..deb25fe9e14 100644 --- a/addons/purchase_requisition/purchase_requisition_demo.xml +++ b/addons/purchase_requisition/purchase_requisition_demo.xml @@ -11,7 +11,7 @@ multiple - 2010/09/16 15:56:14 + diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml index c61a83a9b39..fb5fa774fc3 100644 --- a/addons/purchase_requisition/test/purchase_requisition.yml +++ b/addons/purchase_requisition/test/purchase_requisition.yml @@ -2,10 +2,10 @@ - In order to test the purchase requisition module, I will do a sale order -> purchase_requisition -> purchase flow and I will buy the required products at two different suppliers. -- +- I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO, with the generation of purchase requisitions. -- +- !record {model: product.product, id: product_product_laptopacer0}: categ_id: product.product_category_3 cost_method: standard @@ -26,12 +26,12 @@ warranty: 0.0 weight: 0.0 weight_net: 0.0 - list_price: 100.0 -- + list_price: 100.0 +- Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0001. -- +- !record {model: sale.order, id: sale_order_testtender0}: - date_order: '2010-05-10' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: TEST/TENDER/0001 order_line: @@ -53,43 +53,43 @@ picking_policy: direct pricelist_id: product.list0 shop_id: sale.shop -- +- I confirm the sale order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender0} -- +- I launch the scheduler to compute all procurements, and specify all requisitions orders. -- +- !python {model: procurement.order.compute.all}: | proc_obj = self.pool.get('procurement.order') proc_obj._procure_confirm(cr,uid) - On the purchase requisition, I create a new purchase order for the supplier 'DistriPC' by clicking on - the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC . -- + the button 'New RfQ'. This opens a window to ask me the supplier and I set DistriPC . +- !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}: partner_address_id: base.res_partner_address_7 partner_id: base.res_partner_4 -- +- I create a new purchase order. -- +- !python {model: purchase.requisition.partner}: | req_obj = self.pool.get('purchase.requisition') ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER')]) self.create_order(cr, uid, [ref("purchase_requisition_partner_0")], {"lang": 'en_US', "active_model": "purchase.requisition", "tz": False, "record_id": 1, "active_ids": ids, "active_id": ids[0], }) - + - - I check that I have two purchase orders on the purchase requisition. + I check that I have two purchase orders on the purchase requisition. - !python {model: purchase.order}: | - from tools.translate import _ + from tools.translate import _ order_ids =self.search(cr, uid, [('origin','=','TEST/TENDER/0001')]) ids=len(order_ids) - assert(ids == 2), _('Purchase Order not Created') + assert(ids == 2), _('Purchase Order not Created') -- +- I set the purchase requisition as 'Not Exclusive'. - !python {model: purchase.requisition}: | @@ -98,49 +98,49 @@ - I change the quantities so that the purchase order for DistriPC includes 3 pieces and the purchase order for Asustek includes 2 pieces. -- +- !python {model: purchase.order}: | - line_obj=self.pool.get('purchase.order.line') - partner_obj=self.pool.get('res.partner') + line_obj=self.pool.get('purchase.order.line') + partner_obj=self.pool.get('res.partner') requistion_obj=self.pool.get('purchase.requisition') - requistion_ids =requistion_obj.search(cr, uid, [('origin','=','Laptop ACER')]) - partner_id1=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0] - partner_id2=partner_obj.search(cr,uid,[('name','=','Distrib PC')])[0] + requistion_ids =requistion_obj.search(cr, uid, [('origin','=','Laptop ACER')]) + partner_id1=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0] + partner_id2=partner_obj.search(cr,uid,[('name','=','Distrib PC')])[0] purchase_id1= self.search(cr, uid, [('partner_id','=',partner_id1),('requisition_id','in',requistion_ids)]) purchase_id2= self.search(cr, uid, [('partner_id','=',partner_id2),('requisition_id','in',requistion_ids)]) order_line1=self.browse(cr, uid, purchase_id1, context)[0].order_line[0].id order_line2=self.browse(cr, uid, purchase_id2, context)[0].order_line[0].id line_obj.write(cr, uid, order_line1, {'product_qty':2}) - line_obj.write(cr, uid, order_line2, {'product_qty':3}) + line_obj.write(cr, uid, order_line2, {'product_qty':3}) - I confirm and validate both purchase orders. - !python {model: purchase.order}: | order_ids= self.search(cr, uid, []) import netsvc - wf_service = netsvc.LocalService("workflow") - for id in order_ids: - wf_service.trg_validate(uid, 'purchase.order',id,'purchase_confirm', cr) - wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr) + wf_service = netsvc.LocalService("workflow") + for id in order_ids: + wf_service.trg_validate(uid, 'purchase.order',id,'purchase_confirm', cr) + wf_service.trg_validate(uid, 'purchase.order',id,'purchase_approve', cr) - I check that the delivery order of the customer is in state 'Waiting Goods'. - !python {model: stock.picking }: | - from tools.translate import _ + from tools.translate import _ picking_id = self.search(cr, uid, [('origin','=','TEST/TENDER/0001')]) if picking_id: pick=self.browse(cr,uid,picking_id[0]) assert (pick.state =='confirmed'),_('Picking is not in confirm state.') - assert (pick.move_lines[0].state == 'waiting'), _('Stock Move is not Waiting state.') - + assert (pick.move_lines[0].state == 'waiting'), _('Stock Move is not Waiting state.') + - I receive the order of the supplier Asustek from the Incoming Products menu. - !python {model: stock.picking }: | import time - partner_obj=self.pool.get('res.partner') + partner_obj=self.pool.get('res.partner') order_obj=self.pool.get('purchase.order') - partner_id=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0] + partner_id=partner_obj.search(cr,uid,[('name','=','ASUStek')])[0] picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')]) if picking_id: pick=self.browse(cr,uid,picking_id[0]) @@ -154,14 +154,14 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } + } self.do_partial(cr, uid, picking_id,partial_datas) - I receive the order of the supplier DistriPC from the Incoming Shipments menu. -- +- !python {model: stock.picking }: | import time - partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0] + partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0] picking_id = self.search(cr, uid, [('address_id.partner_id','=',partner_id),('type','=','in')]) if picking_id: pick=self.browse(cr,uid,picking_id[0]) @@ -175,7 +175,7 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } + } self.do_partial(cr, uid, picking_id,partial_datas) - I check that the delivery order of the customer is in the state Available. diff --git a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml index 7e798e59b35..1ab9bca9493 100644 --- a/addons/purchase_requisition/test/purchase_requisition_exclusive.yml +++ b/addons/purchase_requisition/test/purchase_requisition_exclusive.yml @@ -3,7 +3,7 @@ purchase flow and I will buy the required products at two different suppliers. - I start by creating a new product 'Laptop ACER', which is purchased at Asustek, in MTO, - with the generation of purchase requisitions. + with the generation of purchase requisitions. - !record {model: product.product, id: product_product_laptopacer1}: categ_id: product.product_category_3 @@ -17,16 +17,16 @@ - delay: 1 name: base.res_partner_asus qty: 5.0 - min_qty: 1.0 + min_qty: 1.0 supply_method: buy type: product uom_id: product.product_uom_unit - uom_po_id: product.product_uom_unit -- + uom_po_id: product.product_uom_unit +- Then I sell 5 Laptop ACER to the customer Agrolait, sale order TEST/TENDER/0002 -- +- !record {model: sale.order, id: sale_order_testtender1}: - date_order: '2010-04-20' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: TEST/TENDER/0002 order_line: @@ -45,21 +45,21 @@ partner_shipping_id: base.res_partner_address_8 picking_policy: direct pricelist_id: product.list0 - shop_id: sale.shop -- + shop_id: sale.shop +- I confirm sale order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_testtender1} -- +- I launch the scheduler to compute all procurements, and planify all requisitions orders. -- +- !python {model: procurement.order.compute.all}: | proc_obj = self.pool.get('procurement.order') proc_obj._procure_confirm(cr,uid) - I should find a purchase requisition with the origin 'TEST/TENDER/0002', that includes a request for 5 Laptop ACER, and a purchase order on the default supplier for this product. -- +- !python {model: purchase.requisition}: | requisition_ids =self.search(cr, uid, [('origin','=','Laptop ACER1')]) ids=len(requisition_ids) @@ -67,15 +67,15 @@ - On the purchase requisition, I create a new purchase order for the supplier 'DistriPC' by clicking on the button 'New Request for Quotation'. This opens a window to ask me the supplier and I set DistriPC . -- +- I Create purchase.requisition.partner . -- +- !record {model: purchase.requisition.partner, id: purchase_requisition_partner_0}: partner_address_id: base.res_partner_address_7 partner_id: base.res_partner_4 -- +- I create a new purchase order for the supplier 'DistriPC'. -- +- !python {model: purchase.requisition.partner}: | req_obj = self.pool.get('purchase.requisition') ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')]) @@ -83,31 +83,31 @@ 'en_US', "active_model": "purchase.requisition", "tz": False, "record_id": 1, "active_ids": ids, "active_id": ids[0], }) - - I set the purchase requisition as 'Exclusive' -- + I set the purchase requisition as 'Exclusive' +- !python {model: purchase.requisition}: | ids =self.search(cr, uid, [('origin','=','Laptop ACER1')]) self.write(cr,uid,ids[0],{'exclusive': 'exclusive' }) - - I confirm and validate the Request for Quotation of ASUStek. + I confirm and validate the Request for Quotation of ASUStek. - !python {model: purchase.order}: | partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','ASUStek')])[0] req_obj = self.pool.get('purchase.requisition') - ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')]) + ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')]) purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0] import netsvc - wf_service = netsvc.LocalService("workflow") + wf_service = netsvc.LocalService("workflow") if purchase_id: wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_confirm', cr) - wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr) + wf_service.trg_validate(uid, 'purchase.order',purchase_id,'purchase_approve', cr) - I check that Request for Quotation of DistriPC is cancelled. -- +- !python {model: purchase.order}: | partner_id=self.pool.get('res.partner').search(cr,uid,[('name','=','Distrib PC')])[0] req_obj = self.pool.get('purchase.requisition') - ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')]) + ids =req_obj.search(cr, uid, [('origin','=','Laptop ACER1')]) purchase_id= self.search(cr, uid, [('partner_id','=',partner_id),('requisition_id','in',ids)])[0] state=self.browse(cr,uid,purchase_id).state assert (state=='cancel') diff --git a/addons/resource/resource.py b/addons/resource/resource.py index 9e3eb62f0ba..4bdc0caf22a 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -369,7 +369,7 @@ class resource_calendar_leaves(osv.osv): _description = "Leave Detail" _columns = { 'name' : fields.char("Name", size=64), - 'company_id' : fields.related('calendar_id','company_id',type='many2one',relation='res.company',string="Company",readonly=True), + 'company_id' : fields.related('calendar_id','company_id',type='many2one',relation='res.company',string="Company", store=True, readonly=True), 'calendar_id' : fields.many2one("resource.calendar", "Working time"), 'date_from' : fields.datetime('Start Date', required=True), 'date_to' : fields.datetime('End Date', required=True), diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml index b4a985ec4e8..d582a7c3e37 100644 --- a/addons/sale/test/advance_invoice.yml +++ b/addons/sale/test/advance_invoice.yml @@ -1,9 +1,9 @@ - In order to test the Deposit wizard of sale module in the Open-ERP, I create a Sale Order for LG Viewty Smart for qty 100 having order_policy manual. -- +- !record {model: sale.order, id: sale_order_so5}: - date_order: '2010-07-17' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order order_line: - name: LG Viewty Smart @@ -26,14 +26,14 @@ shop_id: sale.shop - I use the Advance Payment wizard. -- +- !record {model: sale.advance.payment.inv, id: sale_advance_payment_inv_0}: amount: 1000.0 product_id: product.product_product_pc3 qtty: 3.0 -- +- Then I click on the "Create Partial Invoice" button -- +- !python {model: sale.advance.payment.inv}: | self.create_invoices(cr, uid, [ref("sale_advance_payment_inv_0")], {"lang": 'en_US', "active_model": 'sale.order', "active_ids": [ref("sale_order_so5")], "tz": @@ -43,8 +43,8 @@ - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so5")) - assert so.invoice_ids, "Invoices has not been generated for sale_order_so5" -- + assert so.invoice_ids, "Invoices has not been generated for sale_order_so5" +- I open the Invoice for the SO. - !python {model: account.invoice}: | @@ -91,18 +91,18 @@ assert(sale_id.invoiced == True), "Paid has not been set to true" - I confirm the Sale Order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_so5} - I click on "Create Invoice" button of Sales order to create the invoice. -- +- !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so5} - I verify whether the invoice has been generated for SO - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so5")) - assert so.invoice_ids[1], "Invoices has not been generated for sale_order_so5" + assert so.invoice_ids[1], "Invoices has not been generated for sale_order_so5" - I open the Invoice for the SO. - @@ -124,7 +124,7 @@ assert invoice_id, "Invoice is not in the open state" - I assign an analytic journal to the bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - diff --git a/addons/sale/test/invoice_on_ordered_qty.yml b/addons/sale/test/invoice_on_ordered_qty.yml index 96154f3cac8..785b2d8835e 100644 --- a/addons/sale/test/invoice_on_ordered_qty.yml +++ b/addons/sale/test/invoice_on_ordered_qty.yml @@ -1,10 +1,10 @@ - In order to test the Sale module in OpenERP, - I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice' and Invoice on 'Ordered quantities' + I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice' and Invoice on 'Ordered quantities' in order to create an invoice based on the ordered quantity - !record {model: sale.order, id: sale_order_so9}: - date_order: '2010-07-17' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO006 order_line: @@ -26,13 +26,13 @@ picking_policy: direct pricelist_id: product.list0 shop_id: sale.shop -- +- I confirm the Sale Order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_so9} - I verify that the picking has been generated for the sale order -- +- !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so9")) assert so.picking_ids,"Picking has not been generated for sale_order_so9" @@ -40,10 +40,10 @@ Then I confirm the picking - !record {model: stock.partial.picking, id: stock_partial_picking_0}: - date: '2010-07-17 17:52:09' + date: !eval time.strftime('%Y-%m-%d %H:%M:%S') - Then I done the picking -- +- !python {model: stock.picking }: | import time sale_order_obj = self.pool.get('sale.order') @@ -62,11 +62,11 @@ 'product_id': move.product_id.id, 'product_qty': '100', 'product_uom': move.product_uom.id, - } + } self.do_partial(cr, uid, [pick.id],partial_datas) - I click on Create Invoice button to create the invoice. -- +- !workflow {model: sale.order, action: manual_invoice, ref: sale_order_so9} - I verify whether the invoice has been generated for SO @@ -87,7 +87,7 @@ for inv_lines in inv_brw.invoice_line: qty1 = inv_lines.quantity assert qty1==qty, "Quantities are not same" -- +- I open the Invoice for the SO. - !python {model: account.invoice}: | @@ -100,7 +100,7 @@ wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) - Assign analytic journal into bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -116,7 +116,7 @@ ref('account.period_8'), ref('sale.account_journal_bankjournal0'), name='test') - - I verify the invoice are in paid state or not. + I verify the invoice are in paid state or not. - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml index fb217302ce4..bf2795e0f5b 100644 --- a/addons/sale/test/invoice_on_shipped_qty.yml +++ b/addons/sale/test/invoice_on_shipped_qty.yml @@ -3,7 +3,7 @@ I create a Sale Order for Slider Mobile for 200 quantity having Shipping Policy 'Invoice from Picking' and Invoice on 'Shipped quantities' - !record {model: sale.order, id: sale_order_so6}: - date_order: '2010-07-17' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO006BIS order_line: @@ -25,13 +25,13 @@ picking_policy: direct pricelist_id: product.list0 shop_id: sale.shop -- +- I confirm the Sale Order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_so6} - I verify that the picking has been generated for the sale order -- +- !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so6")) assert so.picking_ids,"Picking has not been generated for sale_order_so6" @@ -39,10 +39,10 @@ Then I click on the "Product Sent" button of Outgoing Shipments - !record {model: stock.partial.picking, id: stock_partial_picking_0}: - date: '2010-07-17 17:52:09' -- + date: !eval time.strftime('%Y-%m-%d %H:%M:%S') +- I change the quantity on the picking to 199, and confirm partially 100 PCE. -- +- !python {model: stock.picking }: | import time sale_order_obj = self.pool.get('sale.order') @@ -69,10 +69,11 @@ Then I click on 'Create Invoices' button - !python {model: stock.invoice.onshipping}: | - sale_obj = self.pool.get('sale.order') + import time + sale_obj = self.pool.get('sale.order') sale_id = sale_obj.browse(cr, uid, ref("sale_order_so6")) ids = [x.id for x in sale_id.picking_ids] - wiz_id = self.create(cr, uid, {'invoice_date': '2010-07-17', 'journal_id': ref('account.sales_journal')}, + wiz_id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.sales_journal')}, {'active_ids': ids}) self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids, "active_id": ids[0]}) - @@ -98,7 +99,7 @@ for inv_lines in inv_brw.invoice_line: qty1=inv_lines.quantity assert (qty1 == qty), "Quantities are not the same" -- +- I open the Invoice for the SO. - !python {model: account.invoice}: | @@ -111,7 +112,7 @@ wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) - Assign analytic journal into bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -127,7 +128,7 @@ ref('account.period_8'), ref('sale.account_journal_bankjournal0'), name='test') - - I verify the invoice are in paid state or not. + I verify the invoice are in paid state or not. - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml index 74fb95b19f7..c1535402f9b 100644 --- a/addons/sale/test/manual_order_policy.yml +++ b/addons/sale/test/manual_order_policy.yml @@ -3,7 +3,7 @@ I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Shipping & Manual Invoice' - !record {model: sale.order, id: sale_order_so0}: - date_order: '2010-07-17' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO002 order_line: @@ -208,7 +208,7 @@ Then I click on the "Products Received" button of Incoming Shipments - !record {model: stock.partial.picking, id: stock_partial_picking_0}: - date: '2010-07-17 17:52:09' + date: !eval time.strftime('%Y-%m-%d %H:%M:%S') - I click on the "Validate" button - diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml index de18c1c4426..4381c78f010 100644 --- a/addons/sale/test/picking_order_policy.yml +++ b/addons/sale/test/picking_order_policy.yml @@ -3,7 +3,7 @@ I create a Sale Order for Slider Mobile for qty 500 having Shipping Policy is 'Invoice from Picking' - !record {model: sale.order, id: sale_order_so7}: - date_order: '2010-07-15' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO007 order_line: @@ -31,7 +31,7 @@ !workflow {model: sale.order, action: order_confirm, ref: sale_order_so7} - I verify that picking has been generated for the sale order. -- +- !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so7")) assert so.picking_ids,"Picking has not been generated for sale_order_so7" @@ -62,10 +62,11 @@ Then I click on 'Create Invoices' button - !python {model: stock.invoice.onshipping}: | - sale_obj=self.pool.get('sale.order') + import time + sale_obj=self.pool.get('sale.order') sale_id=sale_obj.browse(cr, uid, ref("sale_order_so7")) ids = [x.id for x in sale_id.picking_ids] - wiz_id = self.create(cr, uid, {'invoice_date': '2010-07-15', 'journal_id': ref('account.sales_journal')}, + wiz_id = self.create(cr, uid, {'invoice_date': time.strftime('%Y-%m-%d'), 'journal_id': ref('account.sales_journal')}, {'active_ids': ids}) self.create_invoice(cr, uid, [wiz_id], {"active_ids": ids, "active_id": ids[0]}) - @@ -87,7 +88,7 @@ wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) - Assign analytic journal into bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -179,7 +180,7 @@ pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)]) for pur in pur_ids: wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr) -- +- I click on the "Approved by supplier" button to approve the purchase order - !python {model: sale.order}: | @@ -196,7 +197,7 @@ for pur in pur_ids: wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr) - - I verify that a picking related to purchase order has been generated. + I verify that a picking related to purchase order has been generated. - !python {model: sale.order}: | modules = self.pool.get('ir.module.module') @@ -208,11 +209,11 @@ pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)]) po = pur_obj.browse(cr, uid, pur_id)[0] assert(po.picking_ids),"Picking for purchase order has not been generated" -- +- Then I click on the "Products Received" button of Incoming Shipments - !record {model: stock.partial.picking, id: stock_partial_picking_0}: - date: '2010-07-15 17:52:09' + date: !eval time.strftime('%Y-%m-%d %H:%M:%S') - I click on the "Validate" button - @@ -276,8 +277,8 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } - self.do_partial(cr, uid, [pick.id],partial_datas) + } + self.do_partial(cr, uid, [pick.id],partial_datas) - I verify that delivery state is done - @@ -289,12 +290,12 @@ pick = self.browse(cr,uid,picking_id[0]) assert (pick.state) =='done', "Picking for SO is not in done state." - - I verify that a "Picked" has been set to true + I verify that a "Picked" has been set to true - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so7")) assert (so.shipped == True), "Picked has not been set to True" -- +- I verify that a sale order is in done state - !python {model: sale.order}: | diff --git a/addons/sale/test/postpaid_order_policy.yml b/addons/sale/test/postpaid_order_policy.yml index bbd015d726b..330c6d17308 100644 --- a/addons/sale/test/postpaid_order_policy.yml +++ b/addons/sale/test/postpaid_order_policy.yml @@ -3,7 +3,7 @@ I create a Sale Order for Slider Mobile for qty 500 having Shipping Policy is 'Invoice on order after Delivery' - !record {model: sale.order, id: sale_order_so8}: - date_order: '2010-07-15' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO008 order_line: @@ -24,19 +24,19 @@ picking_policy: direct pricelist_id: product.list0 shop_id: sale.shop -- +- I confirm the Sale Order. -- - !workflow {model: sale.order, action: order_confirm, ref: sale_order_so8} +- + !workflow {model: sale.order, action: order_confirm, ref: sale_order_so8} - I verify that the picking has been generated for the sale order -- +- !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so8")) assert so.picking_ids,"Picking has not been generated for sale_order_so8" - Then I done the picking -- +- !python {model: stock.picking }: | import time sale_order_obj = self.pool.get('sale.order') @@ -55,7 +55,7 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } + } self.do_partial(cr, uid, [pick.id],partial_datas) - I verify that picking order is in done state. @@ -66,7 +66,7 @@ picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')]) if picking_id: pick = self.browse(cr,uid,picking_id[0]) - assert (pick.state == 'done'), "Picking for SO is not in done state." + assert (pick.state == 'done'), "Picking for SO is not in done state." - I verify that delivery order has been generated for sale order - @@ -96,8 +96,8 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } - self.do_partial(cr, uid, [pick.id],partial_datas) + } + self.do_partial(cr, uid, [pick.id],partial_datas) - I verify that delivery state is done - @@ -170,7 +170,7 @@ pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)]) for pur in pur_ids: wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr) -- +- I click on the "Approved by supplier" button to approve the purchase order - !python {model: sale.order}: | @@ -187,7 +187,7 @@ for pur in pur_ids: wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr) - - I verify that a picking related to purchase order has been generated. + I verify that a picking related to purchase order has been generated. - !python {model: sale.order}: | modules = self.pool.get('ir.module.module') @@ -199,11 +199,11 @@ pur_id = pur_obj.search(cr, uid, [('origin','=',so.name)]) po = pur_obj.browse(cr, uid, pur_id)[0] assert(po.picking_ids),"Picking for purchase order has not been generated" -- +- Then I click on the "Products Received" button of Incoming Shipments - !record {model: stock.partial.picking, id: stock_partial_picking_0}: - date: '2010-07-15 17:52:09' + date: !eval time.strftime('%Y-%m-%d %H:%M:%S') - I click on the "Validate" button - @@ -239,7 +239,7 @@ ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')]) assert ids, _('Picking is not in the done state!') - - I verify that a "Picked" has been set to true + I verify that a "Picked" has been set to true - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so8")) @@ -250,20 +250,20 @@ !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so8")) assert so.invoice_ids, "Invoice has not been generated" -- +- I open the Invoice for the SO. -- +- !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so8")) import netsvc - wf_service = netsvc.LocalService("workflow") + wf_service = netsvc.LocalService("workflow") invoice_ids = so.invoice_ids for invoice in invoice_ids: - wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) + wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) - Assign analytic journal into bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -279,7 +279,7 @@ ref('account.period_8'), ref('sale.account_journal_bankjournal0'), name='test') - - I verify the invoice are in paid state or not. + I verify the invoice are in paid state or not. - !python {model: account.invoice}: | modules = self.pool.get('ir.module.module') @@ -291,13 +291,13 @@ invoice_ids = so.invoice_ids for invoice in invoice_ids: assert (invoice.state) =='paid', "Invoice for SO is not in done state." -- +- I verify that Paid has been set to true. - !python {model: sale.order}: | sale_id=self.browse(cr, uid, ref("sale_order_so8")) assert(sale_id.invoiced == True), "Paid has not been set to true" -- +- I verify that sale order is in done state - !python {model: sale.order}: | diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml index 5df007d1465..4bf132e5bee 100644 --- a/addons/sale/test/prepaid_order_policy.yml +++ b/addons/sale/test/prepaid_order_policy.yml @@ -1,8 +1,8 @@ -- +- I create a Sale Order for LG Viewty Smart for qty 500 having Shipping Policy is 'Payment Before Delivery' - !record {model: sale.order, id: sale_order_so1}: - date_order: '2010-07-20' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO001 order_line: @@ -55,7 +55,7 @@ wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr) - I assign an analytic journal to the Bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -71,7 +71,7 @@ ref('account.period_5'), ref('sale.account_journal_bankjournal0'), name='test002') - - I verify the invoice is in done state or not. + I verify the invoice is in done state or not. - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') @@ -133,7 +133,7 @@ assert proc_ids, _('No Procurements!') - Then I click on the "Run Procurement" button -- +- !python {model: procurement.order}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so1")) @@ -168,7 +168,7 @@ pur_obj=self.pool.get('purchase.order') pur_id=pur_obj.search(cr, uid, [('origin','=',so.name)]) assert pur_id, _('Purchase order has not been generated') -- +- I click on the "Confirm" button to confirm the purchase order - !python {model: sale.order}: | @@ -184,7 +184,7 @@ pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)]) for pur in pur_ids: wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_confirm', cr) -- +- I click on the "Approved by supplier" button to approve the purchase order - !python {model: sale.order}: | @@ -199,9 +199,9 @@ wf_service = netsvc.LocalService("workflow") pur_ids = pur_obj.search(cr, uid, [('origin','=',so.name)]) for pur in pur_ids: - wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr) + wf_service.trg_validate(uid, 'purchase.order',pur,'purchase_approve', cr) - - I verify that a picking related to purchase order has been generated. + I verify that a picking related to purchase order has been generated. - !python {model: sale.order}: | modules = self.pool.get('ir.module.module') @@ -217,7 +217,7 @@ Then I click on the "Products Received" button of Incoming Shipments - !record {model: stock.partial.picking, id: stock_partial_picking_0}: - date: '2010-07-20 17:52:09' + date: !eval time.strftime('%Y-%m-%d %H:%M:%S') - I click on the "Validate" button - @@ -253,7 +253,7 @@ ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')]) assert ids, _('Picking is not in the done state!') - - I verify that a "Picked" has been set to true + I verify that a "Picked" has been set to true - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so1")) diff --git a/addons/sale/test/sale_procurement.yml b/addons/sale/test/sale_procurement.yml index f7753948339..923860ebfd3 100644 --- a/addons/sale/test/sale_procurement.yml +++ b/addons/sale/test/sale_procurement.yml @@ -25,7 +25,7 @@ uom_po_id: product.product_uom_kgm - I define Minimum stock rule for my stockable product Wood (qty between 10 and 15) -- +- !record {model: stock.warehouse.orderpoint, id: stock_warehouse_orderpoint_op0}: company_id: base.main_company location_id: stock.stock_location_stock @@ -38,11 +38,11 @@ warehouse_id: stock.warehouse0 - Now I make a sale order for table. -- +- !record {model: sale.order, id: sale_order_so3}: amount_total: 5.0 amount_untaxed: 5.0 - date_order: '2010-04-30' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order order_line: - company_id: base.main_company @@ -65,7 +65,7 @@ shop_id: sale.shop - I confirm the order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3} - I check that procurement is generated. @@ -76,7 +76,7 @@ so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) proc_ids = self.search(cr, uid, [('origin','=',so.name)]) assert proc_ids, _('No Procurements!') -- +- I run the scheduler. - !function {model: procurement.order, name: run_scheduler}: diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml index 053521208bf..727731b4745 100644 --- a/addons/sale/test/so_make_invoice.yml +++ b/addons/sale/test/so_make_invoice.yml @@ -5,7 +5,7 @@ I create a Sale Order for Slider Mobile for qty 100 having order_policy manual. - !record {model: sale.order, id: sale_order_so3}: - date_order: '2010-08-02' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO003 order_line: @@ -34,7 +34,7 @@ I create a Sale Order for products Slider Mobile and LG Viewty Smart for qty 100 having order_policy manual. - !record {model: sale.order, id: sale_order_so4}: - date_order: '2010-08-02' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO004 order_line: @@ -74,7 +74,7 @@ - !record {model: sale.make.invoice, id: sale_make_invoice_1}: grouped: 1 - invoice_date: '2010-08-02' + invoice_date: !eval time.strftime('%Y-%m-%d') - Then I click on the "Create Invoices" button of wizard - diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml index d5e81c9e96c..14d405b0083 100644 --- a/addons/sale/test/so_make_line_invoice.yml +++ b/addons/sale/test/so_make_line_invoice.yml @@ -3,7 +3,7 @@ I create a Sale Order for two products LG Viewty Smart and Slider mobile for qty 100 having order_policy manual. - !record {model: sale.order, id: sale_order_so3}: - date_order: '2010-07-12' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO003 order_line: @@ -27,7 +27,7 @@ product_id: sale.product_product_lgviewtysmart0 product_uos_qty: 100.0 th_weight: 0.0 - type: make_to_order + type: make_to_order order_policy: manual partner_id: sale.res_partner_cleartrail0 partner_invoice_id: sale.res_partner_address_2 @@ -36,9 +36,9 @@ picking_policy: direct pricelist_id: product.list0 shop_id: sale.shop -- +- I confirm the Sale Order. -- +- !workflow {model: sale.order, action: order_confirm, ref: sale_order_so3} - I click on the "Make Invoice" button of sale order line @@ -47,11 +47,11 @@ {} - I click on the "Create Invoice" button of wizard -- +- !python {model: sale.order.line.make.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - sol = so.order_line[0] + sol = so.order_line[0] self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_0")], {"lang": "en_US", "tz": False, "active_model": "sale.order.line", "active_ids": [sol.id], "search_default_uninvoiced": 1, "active_id": sol.id, @@ -61,7 +61,7 @@ - !python {model: sale.order}: | sale_id=self.browse(cr, uid, ref("sale_order_so3")) - sol = sale_id.order_line[0] + sol = sale_id.order_line[0] assert(sol.invoiced == True), "Invoiced has not been set to true" - I verify that an invoice for sale order line has been created. @@ -90,7 +90,7 @@ assert invoice_id, "Invoice is not in the open state" - I assign an analytic journal to the bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -106,7 +106,7 @@ ref('account.period_8'), ref('sale.account_journal_bankjournal0'), name='test') - - I verify that an invoice is in done state. + I verify that an invoice is in done state. - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') @@ -123,14 +123,14 @@ I create an invoice for another sale order line. I click on the "Make Invoice" button of sale order line - !record {model: sale.order.line.make.invoice, id: sale_order_line_make_invoice_1}: - {} + {} - I click on the "Create Invoice" button of wizard - !python {model: sale.order.line.make.invoice}: | sale_order_obj = self.pool.get('sale.order') so = sale_order_obj.browse(cr, uid, ref("sale_order_so3")) - sol = so.order_line[1] + sol = so.order_line[1] self.make_invoices(cr, uid, [ref("sale_order_line_make_invoice_1")], {"lang": "en_US", "tz": False, "active_model": "sale.order.line", "active_ids": [sol.id], "search_default_uninvoiced": 1, "active_id": sol.id, @@ -146,7 +146,7 @@ - !python {model: sale.order}: | sale_id=self.browse(cr, uid, ref("sale_order_so3")) - sol = sale_id.order_line[1] + sol = sale_id.order_line[1] assert(sol.invoiced == True), "Invoiced has not been set to true" - I verify that "Paid" has been set to False. @@ -175,7 +175,7 @@ assert invoice_id, "Invoice is not in the open state" - Assign analytic journal into bank journal -- +- !record {model: account.journal, id: sale.account_journal_bankjournal0}: analytic_journal_id: account.cose_journal_sale - @@ -191,7 +191,7 @@ ref('account.period_8'), ref('sale.account_journal_bankjournal0'), name='test') - - I verify the invoice is in done state. + I verify the invoice is in done state. - !python {model: account.invoice}: | sale_order_obj = self.pool.get('sale.order') diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py old mode 100755 new mode 100644 diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml index c15ea3c2135..75eabce03b1 100644 --- a/addons/sale_margin/test/sale_margin.yml +++ b/addons/sale_margin/test/sale_margin.yml @@ -5,7 +5,7 @@ I place a sale order for product keyboard, quantity 50 - !record {model: sale.order, id: sale_order_so11}: - date_order: '2010-08-04' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO011 order_line: @@ -36,4 +36,4 @@ - !python {model: sale.order}: | so = self.browse(cr, uid, ref("sale_order_so11")) - assert so.margin, "No margin !" + assert so.margin, "No margin !" diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml index 081b65e4611..739eea0d99d 100644 --- a/addons/sale_mrp/test/sale_mrp.yml +++ b/addons/sale_mrp/test/sale_mrp.yml @@ -5,9 +5,9 @@ - !record {model: product.category, id: product_category_allproductssellable0}: name: Mobile Products Sellable -- - I define product category Mobile Services. -- +- + I define product category Mobile Services. +- !record {model: product.category, id: product_category_services0}: name: Mobile Services - @@ -64,7 +64,7 @@ - !record {model: sale.order, id: sale_order_so0}: client_order_ref: ref1 - date_order: '2010-08-4' + date_order: !eval time.strftime('%Y-%m-%d') invoice_quantity: order name: Test_SO001 order_line: diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 97d5f9a0270..109c7c5024b 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1438,7 +1438,7 @@ class stock_production_lot_revision(osv.osv): 'indice': fields.char('Revision Number', size=16), 'author_id': fields.many2one('res.users', 'Author'), 'lot_id': fields.many2one('stock.production.lot', 'Production lot', select=True, ondelete='cascade'), - 'company_id': fields.related('lot_id','company_id',type='many2one',relation='res.company',string='Company',store=True), + 'company_id': fields.related('lot_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True), } _defaults = { @@ -2588,7 +2588,7 @@ class stock_inventory_line(osv.osv): 'product_id': fields.many2one('product.product', 'Product', required=True, select=True), 'product_uom': fields.many2one('product.uom', 'Product UOM', required=True), 'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product UoM')), - 'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True), + 'company_id': fields.related('inventory_id','company_id',type='many2one',relation='res.company',string='Company',store=True, select=True, readonly=True), 'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', domain="[('product_id','=',product_id)]"), 'state': fields.related('inventory_id','state',type='char',string='State',readonly=True), } diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml index 696dd0900c6..762908e6b0c 100644 --- a/addons/stock/test/stock_test.yml +++ b/addons/stock/test/stock_test.yml @@ -2,56 +2,56 @@ - In order to test the stock module, I will create product, create physical inventory ,fill inventory lines from location,split inventory line into production lot - -- + +- I create Asset Account Type. -- +- !record {model: account.account.type, id: account_account_type_asset0}: close_method: balance code: asset name: Asset sign: 1 - -- + +- I create Income Account Type. -- +- !record {model: account.account.type, id: account_account_type_income0}: close_method: unreconciled code: income name: Income sign: 1 - - -- + + +- I create Expense Account Type. -- +- !record {model: account.account.type, id: account_account_type_expense0}: close_method: unreconciled code: expense name: Expense - sign: 1 -- + sign: 1 +- I create Cash Account Type. -- +- !record {model: account.account.type, id: account_account_type_cash0}: close_method: balance code: cash name: Cash sign: 1 - - -- + + +- I create Receivable Account Type. -- +- !record {model: account.account.type, id: account_account_type_receivable0}: close_method: balance code: receivable name: Receivable sign: 1 - - + I create Receivable Account . -- +- !record {model: account.account, id: account_account_receivable0}: code: '40000-stock-test' company_id: base.main_company @@ -61,9 +61,9 @@ parent_right: 2 type: receivable user_type: account_account_type_receivable0 -- +- I create Payable Account. -- +- !record {model: account.account, id: account_account_payable0}: code: '440000-stock-test' company_id: base.main_company @@ -72,10 +72,10 @@ parent_left: 3 parent_right: 4 type: payable - user_type: account_account_type_expense0 -- + user_type: account_account_type_expense0 +- I create Purchase Journal. -- +- !record {model: account.journal, id: account_journal_purchasejournal0}: code: pur company_id: base.main_company @@ -83,10 +83,10 @@ sequence_id: account.sequence_purchase_journal type: purchase view_id: account.account_journal_bank_view - -- + +- I create Sale Journal. -- +- !record {model: account.journal, id: account_journal_salejouran0}: code: sal company_id: base.main_company @@ -94,10 +94,10 @@ sequence_id: account.sequence_sale_journal type: sale view_id: account.account_journal_view - -- + +- I create Expense Account. -- +- !record {model: account.account, id: account_account_expenseaccount0}: code: Expe company_id: base.main_company @@ -107,9 +107,9 @@ parent_right: 6 type: consolidation user_type: account_account_type_asset0 -- +- I create Product Sale Account. -- +- !record {model: account.account, id: account_account_productsale0}: code: '001-stock-test' company_id: base.main_company @@ -117,11 +117,11 @@ name: Product Sale type: other user_type: stock.account_account_type_income0 - - -- + + +- I create Product Purchase Account. -- +- !record {model: account.account, id: account_account_productpurchase0}: code: '0002-stock-test' company_id: base.main_company @@ -129,64 +129,64 @@ name: Product Purchase type: other user_type: account_account_type_expense0 - -- + +- I create partner. -- +- !record {model: res.partner, id: res_partner_shawtrust0}: address: - - country_id: base.in + - country_id: base.in - street: St James House, Vicar Lane, Sheffield lang: en_US name: 'Shaw Trust ' property_account_payable: account_account_payable0 property_account_receivable: account_account_receivable0 -- +- I create partner. -- +- !record {model: res.partner, id: res_partner_diasorinltd0}: address: - country_id: base.in street: Ash House, Ash Road name: DiaSorin Ltd supplier: true - - + + - I create partner. -- +- !record {model: res.partner, id: res_partner_microlinktechnologies0}: address: - street: Kailash Vaibhav, Parksite name: Micro Link Technologies property_account_payable: account_account_payable0 - property_account_receivable: account_account_receivable0 - supplier: true - + property_account_receivable: account_account_receivable0 + supplier: true + - I create partner address. -- +- !record {model: res.partner.address, id: res_partner_address_0}: country_id: base.in partner_id: stock.res_partner_diasorinltd0 street: Ash House, Ash Road title: base.res_partner_title_miss - - -- + + +- I create product.category . -- +- !record {model: product.category, id: product_category_computer0}: name: Computer -- +- I create product HP Pavilion Desktop PCs . -- +- !record {model: product.product, id: product_product_hppaviliondesktoppcs0}: categ_id: stock.product_category_computer0 cost_method: standard mes_type: fixed - list_price: 1000.0 + list_price: 1000.0 name: HP Pavilion Desktop PCs procure_method: make_to_stock seller_ids: @@ -198,11 +198,11 @@ uom_id: product.product_uom_unit uom_po_id: product.product_uom_unit property_account_expense: account_account_productsale0 - property_account_income: account_account_productsale0 - -- + property_account_income: account_account_productsale0 + +- I create product HP CD writers. -- +- !record {model: product.product, id: product_product_hpcdwriters0}: categ_id: stock.product_category_computer0 cost_method: standard @@ -220,14 +220,14 @@ uom_po_id: product.product_uom_unit property_account_expense: account_account_productpurchase0 property_account_income: account_account_productsale0 - -- + +- I create Physical Inventory for the products. -- - !record {model: stock.inventory, id: stock_inventory_physicalinventoy0}: +- + !record {model: stock.inventory, id: stock_inventory_physicalinventoy0}: company_id: base.main_company - date: '2010-05-10 18:19:13' - date_done: '2010-05-10 18:19:59' + date: !eval time.strftime('%Y-%m-%d %H:%M:%S') + date_done: !eval time.strftime('%Y-%m-%d %H:%M:%S') inventory_line_id: - company_id: base.main_company location_id: stock.stock_location_stock @@ -241,40 +241,40 @@ product_uom: product.product_uom_unit name: Physical inventory state: draft - -- + +- I confirm the Inventory for HP CD writers. -- +- !python {model: stock.inventory}: | self.action_confirm(cr,uid,[ref('stock_inventory_physicalinventoy0')]) self.action_done(cr,uid,[ref('stock_inventory_physicalinventoy0')]) -- +- I create stock.fill.inventory . -- +- !record {model: stock.fill.inventory, id: stock_fill_inventory_0}: location_id: stock.stock_location_stock - -- + +- I fill inventory for HP CD writers. -- +- !python {model: stock.fill.inventory}: | self.fill_inventory(cr, uid, [ref("stock_fill_inventory_0")], {"lang": 'en_US', "full": "1", "tz": False, "active_model": "stock.inventory", "active_ids": [ref("stock_inventory_physicalinventoy0")], "active_id": ref("stock_inventory_physicalinventoy0"), }) -- +- I create stock.move.split record. -- +- !record {model: stock.move.split, id: stock_move_split_0}: line_ids: - name: '00001-stock-test' - quantity: 5 + quantity: 5 product_id: stock.product_product_hpcdwriters0 - -- + +- I Split into production line. -- +- !python {model: stock.move.split}: | move_obj=self.pool.get('stock.move') product_obj=self.pool.get('product.product') @@ -284,52 +284,52 @@ "stock.move", "active_ids": move_ids, "tz": False, "active_id":move_ids[0] }) - - + In Order to test the picking I create picking with move lines. -- +- !record {model: stock.picking, id: stock_picking_0}: name: test_picking 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: internal - - -- + + +- I click on draft_force_assign on picking. -- +- !python {model: stock.picking}: | self.draft_force_assign(cr, uid, [ref("stock_picking_0")], {"lang": "en_US", "active_model": "ir.ui.menu", "tz": False, "search_default_confirmed": 1, "contact_display": "partner", "active_ids": [ref("stock.menu_action_picking_tree6")], "active_id": ref("stock.menu_action_picking_tree6"), }) - - -- + + +- I click on force_assign on picking. -- +- !python {model: stock.picking}: | self.force_assign(cr, uid, [ref("stock_picking_0")], {"lang": "en_US", "active_model": "ir.ui.menu", "tz": False, "search_default_confirmed": 1, "contact_display": "partner", "active_ids": [ref("stock.menu_action_picking_tree6")], "active_id": ref("stock.menu_action_picking_tree6"), }) - + - I confirm the picking. -- +- !python {model: stock.picking }: | import time pick=self.browse(cr,uid,ref('stock_picking_0')) @@ -343,5 +343,5 @@ 'product_id': move.product_id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } + } self.do_partial(cr, uid, [ref('stock_picking_0')],partial_datas) diff --git a/addons/stock_invoice_directly/test/stock_invoice_directly.yml b/addons/stock_invoice_directly/test/stock_invoice_directly.yml index b5ecb83caf2..6d70540b4d5 100644 --- a/addons/stock_invoice_directly/test/stock_invoice_directly.yml +++ b/addons/stock_invoice_directly/test/stock_invoice_directly.yml @@ -10,8 +10,8 @@ invoice_state: 2binvoiced move_lines: - company_id: base.main_company - date_expected: '2010-08-03 11:05:47' - date: '2010-08-03 11:05:47' + date_expected: !eval time.strftime('%Y-%m-%d %H:%M:%S') + date: !eval time.strftime('%Y-%m-%d %H:%M:%S') location_id: stock.stock_location_stock product_id: product.product_product_pc1 product_qty: 3.0 @@ -37,19 +37,19 @@ 1, "tz": False, "active_model": "ir.ui.menu", "contact_display": "partner", "active_ids": [ref("stock.menu_action_picking_tree")], "active_id": ref("stock.menu_action_picking_tree"), }) -- +- I create a record for partial picking. -- +- !record {model: stock.partial.picking, id: stock_partial_picking_0}: - date: '2010-08-03 11:25:58' + date: !eval time.strftime('%Y-%m-%d %H:%M:%S') - I make picking order Done. -- +- !python {model: stock.partial.picking}: | pick_obj = self.pool.get('stock.picking') partial = self.browse(cr, uid, ref('stock_partial_picking_0'), context) partial_datas = { - 'delivery_date' : partial.date + 'delivery_date' : partial.date } for pick in pick_obj.browse(cr, uid, [ref('stock_picking_out0')]): for m in pick.move_lines: @@ -59,13 +59,13 @@ 'product_uom' : m.product_uom.id } pick_obj.do_partial(cr, uid, [ref('stock_picking_out0')], partial_datas, context=context) -- +- As the Invoice state of the picking order is To be invoiced. I create invoice for my outgoing picking order. -- +- !python {model: stock.invoice.onshipping}: | wiz_id = self.create(cr, uid, {'invoice_date': '2010-08-04', 'journal_id': ref('account.bank_journal')}, {'active_ids': [ref("stock_picking_out0")]}) - self.create_invoice(cr, uid, [wiz_id], {"lang": "en_US", + self.create_invoice(cr, uid, [wiz_id], {"lang": "en_US", "search_default_available": 1, "tz": False, "active_model": "stock.picking", "contact_display": "partner", "active_ids": [ref("stock_picking_out0")], "active_id": ref("stock_picking_out0")}) - @@ -77,4 +77,4 @@ partner = picking[0].address_id.partner_id.id inv_ids = self.search(cr, uid, [('type','=','out_invoice'),('partner_id','=',partner)]) assert inv_ids, 'No Invoice is generated!' - + diff --git a/addons/stock_location/test/stock_location_pull_flow.yml b/addons/stock_location/test/stock_location_pull_flow.yml index f38cb7cdaa6..557162c725d 100644 --- a/addons/stock_location/test/stock_location_pull_flow.yml +++ b/addons/stock_location/test/stock_location_pull_flow.yml @@ -1,41 +1,41 @@ - - In order to test the product pulled flow , I create ,partner,product,procurement -- + In order to test the product pulled flow , I create ,partner,product,procurement +- I create a account type Asset. -- +- !record {model: account.account.type, id: account_account_type_asset0}: close_method: balance code: asset_test name: Asset For Tests sign: 1 -- +- I create a account type income. -- +- !record {model: account.account.type, id: account_account_type_income0}: close_method: unreconciled code: income_test name: Income For Tests sign: 1 -- +- I create a account type Expense. -- +- !record {model: account.account.type, id: account_account_type_expense0}: close_method: unreconciled code: expense_test name: Expense For Tests - sign: 1 -- + sign: 1 +- I create a account type Receivable. -- +- !record {model: account.account.type, id: account_account_type_receivable0}: close_method: balance code: receivable_test name: Receivable For Tests sign: 1 - - + I create a account Receivable. -- +- !record {model: account.account, id: account_account_receivable0}: code: 40000_test company_id: base.main_company @@ -43,19 +43,19 @@ name: Receivable For Tests type: receivable user_type: account_account_type_receivable0 -- +- I create a account Payable. -- +- !record {model: account.account, id: account_account_payable0}: code: 440000_test company_id: base.main_company currency_mode: current name: Payable For Tests type: payable - user_type: account_account_type_expense0 -- + user_type: account_account_type_expense0 +- I create a Purchase Journal. -- +- !record {model: account.journal, id: account_journal_purchasejournal0}: code: pur_test company_id: base.main_company @@ -63,10 +63,10 @@ sequence_id: account.sequence_purchase_journal type: purchase view_id: account.account_journal_bank_view - -- + +- I create a Sale Journal. -- +- !record {model: account.journal, id: account_journal_salejouran0}: code: sal_test company_id: base.main_company @@ -74,10 +74,10 @@ sequence_id: account.sequence_sale_journal type: sale view_id: account.account_journal_view - -- + +- I create an Expense Account -- +- !record {model: account.account, id: account_account_expenseaccount0}: code: Expe_test company_id: base.main_company @@ -85,9 +85,9 @@ name: Expense Account For Tests type: consolidation user_type: account_account_type_asset0 -- +- I create Product Sale account. -- +- !record {model: account.account, id: account_account_productsale0}: code: 001_test company_id: base.main_company @@ -96,9 +96,9 @@ type: other user_type: account_account_type_income0 -- +- I create Product Product Purchase. -- +- !record {model: account.account, id: account_account_productpurchase0}: code: 0002_test company_id: base.main_company @@ -106,9 +106,9 @@ name: Product Purchase For Tests type: other user_type: account_account_type_expense0 -- +- I create a Supplier. -- +- !record {model: res.partner, id: res_partner_shawtrust0}: address: - country_id: base.in @@ -116,16 +116,16 @@ lang: en_US name: 'Shaw Trust ' property_account_payable: account_account_payable0 - property_account_receivable: account_account_receivable0 -- + property_account_receivable: account_account_receivable0 +- I create a product category. -- +- !record {model: product.category, id: product_category_computer0}: name: Computer - I create a product and define the pulled flow condition for stock move. I set shipping type Sending Goods. and set Procurement type to move. -- +- !record {model: product.product, id: product_product_hpcdwriters0}: categ_id: product_category_computer0 cost_method: standard @@ -169,12 +169,12 @@ property_stock_procurement: stock.location_procurement property_stock_production: stock.location_production qty_available: 15 -- +- I create a procurement order. -- +- !record {model: procurement.order, id: procurement_order_test0}: company_id: base.main_company - date_planned: '2010-10-07 18:24:24' + date_planned: !eval time.strftime('%Y-%m-%d %H:%M:%S') location_id: stock.stock_location_shop0 name: Testing pulled flow priority: '1' @@ -184,21 +184,21 @@ product_uom: product.product_uom_unit product_uos: product.product_uom_unit product_uos_qty: 0.0 -- +- I confirm the procurement order. -- +- !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_test0} -- +- I launch the scheduler to compute procurement. -- +- !python {model: procurement.order.compute.all}: | proc_obj = self.pool.get('procurement.order') proc_obj._procure_confirm(cr,uid) - - I check the state of procurement order is cancel and stock move is cancel. -- - !python {model: procurement.order }: | - from tools.translate import _ + I check the state of procurement order is cancel and stock move is cancel. +- + !python {model: procurement.order }: | + from tools.translate import _ procurement_ids=self.search(cr, uid, [('id', '=', ref('procurement_order_test0'))]) if procurement_ids: order=self.browse(cr,uid,procurement_ids)[0] @@ -206,14 +206,14 @@ - I check the new procurement order has been created . - - !python {model: procurement.order }: | - from tools.translate import _ + !python {model: procurement.order }: | + from tools.translate import _ procurement_ids=self.search(cr, uid, [('name','=','E001')]) assert len(procurement_ids), "Procurement order hasn't Created." - I check the Outgoing Picking is created for source location Shop 2 and destination shop1. - !python {model: stock.picking }: | - from tools.translate import _ + from tools.translate import _ picking_id = self.search(cr, uid, [('origin','=','Testing pulled flow:E001'),('type','=','out')]) assert len(picking_id), "Picking hasn't Created." diff --git a/addons/stock_location/test/stock_location_push_flow.yml b/addons/stock_location/test/stock_location_push_flow.yml index 1e974682b67..db2ae388317 100644 --- a/addons/stock_location/test/stock_location_push_flow.yml +++ b/addons/stock_location/test/stock_location_push_flow.yml @@ -3,36 +3,36 @@ Push flow specification indicates which location is chained with which location. - I create product category. -- +- !record {model: product.category, id: product_category_computer0}: name: Computer - + - I create Supplier. -- +- !record {model: res.partner, id: res_partner_microlinktechnologies0}: address: - street: Kailash Vaibhav, Parksite name: Micro Link Technologies property_account_payable: account_account_payable0 - property_account_receivable: account_account_receivable0 - supplier: true - + property_account_receivable: account_account_receivable0 + supplier: true + - I create Supplier address. -- +- !record {model: res.partner.address, id: res_partner_address_0}: country_id: base.in partner_id: res_partner_microlinktechnologies0 street: Ash House, Ash Road title: base.res_partner_title_miss - + - I create product and define the pushed flow . - I set the chain location Supplier to stock Input - Stock Input to Quality test and Quality test -Stock . -- + Stock Input to Quality test and Quality test -Stock . +- !record {model: product.product, id: product_product_hpcdwriters0}: categ_id: product_category_computer0 cost_method: standard @@ -62,13 +62,13 @@ property_stock_production: stock.location_production - In order to test pushed flow .I buy the product from Micro Link Technologies supplier. I create a Picking. -- +- !record {model: stock.picking , id: stock_picking_in0}: address_id: res_partner_address_0 company_id: base.main_company invoice_state: none move_lines: - - date_expected: '2010-10-08 15:36:53' + - date_expected: !eval time.strftime('%Y-%m-%d %H:%M:%S') location_dest_id: stock.stock_location_stock location_id: stock.stock_location_suppliers name: 'HP CD writers' @@ -79,7 +79,7 @@ name: Pushed Flow Test type: in - - I confirm picking. + I confirm picking. - !python {model: stock.picking }: | self.draft_force_assign(cr, uid, [ref("stock_picking_in0")], {"lang": "en_US", @@ -91,7 +91,7 @@ Stock/Input To Quality test and Quality test To Stock. - I check the move is in waiting state. -- +- !python {model: stock.picking }: | from tools.translate import _ picking_id = self.search(cr, uid, [('origin','=','Pushed Flow Test'),('type','=','out')]) @@ -117,11 +117,11 @@ 'product_id': move.product_id.id, 'product_qty': move.product_qty, 'product_uom': move.product_uom.id, - } - self.do_partial(cr, uid, picking_id,partial_datas) + } + self.do_partial(cr, uid, picking_id,partial_datas) - I check the Outgoing Orders is automatically done. -- +- !python {model: stock.picking }: | from tools.translate import _ picking_id = self.search(cr, uid, [('origin','=','Pushed Flow Test'),('type','=','out')]) diff --git a/addons/stock_no_autopicking/test/stock_no_autopicking.yml b/addons/stock_no_autopicking/test/stock_no_autopicking.yml index 34e20eeb6c4..f5e27220e62 100644 --- a/addons/stock_no_autopicking/test/stock_no_autopicking.yml +++ b/addons/stock_no_autopicking/test/stock_no_autopicking.yml @@ -1,5 +1,5 @@ - - In order to test the module with OpenERP, I will make products with No auto-picking + In order to test the module with OpenERP, I will make products with No auto-picking to allow an intermediate picking process to provide raw materials to production orders. - I create product category for measuring the liquid products. Say Litre. @@ -138,7 +138,7 @@ bom_id: mrp_bom_cupoftea0 routing_id: mrp_routing_productionrouting0 company_id: base.main_company - date_planned: '2010-08-03 15:12:32' + date_planned: !eval time.strftime('%Y-%m-%d %H:%M:%S') location_dest_id: stock.stock_location_stock location_src_id: stock.stock_location_stock name: MO/00002 diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml index 23cfc43c821..562edb94b03 100644 --- a/addons/stock_planning/test/stock_planning.yml +++ b/addons/stock_planning/test/stock_planning.yml @@ -5,39 +5,39 @@ I create weekly stock periods for the month of July. - I create stock period for the first week of July. -- +- !record {model: stock.period, id: stock_period_01}: - date_start: '2010-07-01 00:00:00' - date_stop: '2010-07-06 23:59:00' - name: 2010, week 27 + date_start: !eval "'%s-07-01 00:00:00' %(datetime.now().year)" + date_stop: !eval "'%s-07-06 23:59:00' %(datetime.now().year)" + name: !eval "'%s, week 27' %(datetime.now().year)" - I create stock period for the second week of July. -- +- !record {model: stock.period, id: stock_period_02}: - date_start: '2010-07-07 00:00:00' - date_stop: '2010-07-12 23:59:00' - name: 2010, week 28 + date_start: !eval "'%s-07-07 00:00:00' %(datetime.now().year)" + date_stop: !eval "'%s-07-12 23:59:00' %(datetime.now().year)" + name: !eval "'%s, week 28' %(datetime.now().year)" - I create stock period for the third week of July. -- +- !record {model: stock.period, id: stock_period_03}: - date_start: '2010-07-15 00:00:00' - date_stop: '2010-07-20 23:59:00' - name: 2010, week 29 + date_start: !eval "'%s-07-15 00:00:00' %(datetime.now().year)" + date_stop: !eval "'%s-07-20 23:59:00' %(datetime.now().year)" + name: !eval "'%s, week 29' %(datetime.now().year)" - I create stock period for the fourth week of July. -- +- !record {model: stock.period, id: stock_period_04}: - date_start: '2010-07-22 00:00:00' - date_stop: '2010-07-27 23:59:00' - name: 2010, week 30 + date_start: !eval "'%s-07-22 00:00:00' %(datetime.now().year)" + date_stop: !eval "'%s-07-27 23:59:00' %(datetime.now().year)" + name: !eval "'%s, week 30' %(datetime.now().year)" - I create stock period for the fifth week of July. -- +- !record {model: stock.period, id: stock_period_05}: - date_start: '2010-07-29 00:00:00' - date_stop: '2010-07-31 23:59:00' - name: 2010, week 31 + date_start: !eval "'%s-07-29 00:00:00' %(datetime.now().year)" + date_stop: !eval "'%s-07-31 23:59:00' %(datetime.now().year)" + name: !eval "'%s, week 31' %(datetime.now().year)" - Now I create the forecast for this period for all PCs. - @@ -46,7 +46,7 @@ period_id: stock_period_03 product_categ_id: product.product_category_pc warehouse_id: stock.warehouse0 -- +- Performing an osv_memory action create_forecast on module stock.sale.forecast.createlines - !python {model: stock.sale.forecast.createlines}: | @@ -56,9 +56,9 @@ }) - I create a sale order for PC1-Basic PC and PC3-Medium PC. -- +- !record {model: sale.order, id: sale_order_so0}: - date_order: '2010-07-20' + date_order: !eval time.strftime('%Y-07-20') invoice_quantity: order name: SO006 order_line: @@ -105,17 +105,17 @@ False, "search_default_create_uid": 1, "active_model": "ir.ui.menu", "department_id": False, "active_ids": [ref("stock_planning.menu_stock_sale_forecast_all")], "active_id": ref("stock_planning.menu_stock_sale_forecast_all"), }) -- +- I create Master procurement schedule for the third week of July. -- +- !record {model: stock.planning.createlines, id: stock_planning_createlines_0}: company_id: base.main_company period_id: stock_period_03 product_categ_id: product.product_category_pc warehouse_id: stock.warehouse0 -- +- Performing an osv_memory action create_planning on module stock.planning.createlines -- +- !python {model: stock.planning.createlines}: | self.create_planning(cr, uid, [ref("stock_planning_createlines_0")], {"lang": "en_US", "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_planning_createlines")], @@ -146,5 +146,5 @@ I check whether the procurement orders are created or not. - !python {model: procurement.order}: | - proc_ids = self.search(cr, uid, [('origin','=','MPS(admin) 2010, week 29'),('product_id','=',ref("product.product_product_pc1"))]) + proc_ids = self.search(cr, uid, [('origin','=','MPS(admin) 2011, week 29'),('product_id','=',ref("product.product_product_pc1"))]) assert proc_ids,'No Procurements!' diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot index f85fe08c6a4..4167463e960 100644 --- a/addons/survey/i18n/survey.pot +++ b/addons/survey/i18n/survey.pot @@ -450,7 +450,7 @@ msgstr "" #. module: survey #: selection:survey.request,state:0 -msgid "Wating Answer" +msgid "Waiting Answer" msgstr "" #. module: survey diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 47a0a50f821..c06d274f20d 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -714,7 +714,7 @@ class survey_request(osv.osv): 'email': fields.char("E-mail", size=64), 'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'), 'response': fields.many2one('survey.response', 'Answer'), - 'state': fields.selection([('draft','Draft'),('waiting_answer', 'Wating Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1) + 'state': fields.selection([('draft','Draft'),('waiting_answer', 'Waiting Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1) } _defaults = { 'state': lambda * a: 'draft', diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml index 9f0ba5f5326..2b9b00e64db 100644 --- a/addons/survey/survey_demo.xml +++ b/addons/survey/survey_demo.xml @@ -29,7 +29,7 @@ 1 1 5 - 2010-03-03 14:25:03 + @@ -505,7 +505,7 @@ 1 1 5 - 2010-03-03 14:25:03 + @@ -2827,21 +2827,21 @@ - 2010-03-03 14:25:03 + - 2010-03-03 14:29:36 + - 2010-03-03 14:25:03.603599 + done @@ -2850,7 +2850,7 @@ - 2010-03-03 14:29:36.247905 + done @@ -2859,7 +2859,7 @@ - 2010-03-03 14:25:03.631622 + done @@ -2867,7 +2867,7 @@ - 2010-03-03 14:25:03.653849 + done @@ -2875,7 +2875,7 @@ - 2010-03-03 14:25:03.671836 + done @@ -2883,7 +2883,7 @@ - 2010-03-03 14:25:03.689999 + done @@ -2891,7 +2891,7 @@ - 2010-03-03 14:25:03.706175 + done OpenERP SA @@ -2900,7 +2900,7 @@ - 2010-03-03 14:25:29.087116 + done @@ -2908,7 +2908,7 @@ - 2010-03-03 14:25:29.107571 + done @@ -2916,7 +2916,7 @@ - 2010-03-03 14:25:29.126023 + done @@ -2924,7 +2924,7 @@ - 2010-03-03 14:26:14.844451 + done @@ -2932,7 +2932,7 @@ - 2010-03-03 14:26:14.872224 + done @@ -2940,7 +2940,7 @@ - 2010-03-03 14:26:14.897764 + skip @@ -2948,7 +2948,7 @@ - 2010-03-03 14:26:14.918989 + done @@ -2956,7 +2956,7 @@ - 2010-03-03 14:29:36.27459 + done @@ -2964,7 +2964,7 @@ - 2010-03-03 14:29:36.301461 + done @@ -2972,7 +2972,7 @@ - 2010-03-03 14:29:36.33203 + done OpenERP SA @@ -2981,7 +2981,7 @@ - 2010-03-03 14:29:36.35911 + done @@ -2989,7 +2989,7 @@ - 2010-03-03 14:30:11.376172 + done @@ -2997,7 +2997,7 @@ - 2010-03-03 14:30:11.397675 + done @@ -3005,7 +3005,7 @@ - 2010-03-03 14:30:11.414119 + done @@ -3013,7 +3013,7 @@ - 2010-03-03 14:31:18.637519 + done @@ -3021,7 +3021,7 @@ - 2010-03-03 14:31:18.653091 + done survey @@ -3030,7 +3030,7 @@ - 2010-03-03 14:31:18.669619 + done @@ -3038,7 +3038,7 @@ - 2010-03-03 14:31:18.691933 + done @@ -3046,7 +3046,7 @@ - 2010-03-03 14:32:08.47899 + done @@ -3054,7 +3054,7 @@ - 2010-03-03 14:32:08.501274 + done @@ -3062,7 +3062,7 @@ - 2010-03-03 14:32:08.523878 + skip @@ -3070,7 +3070,7 @@ - 2010-03-03 14:32:08.538988 + done @@ -3078,7 +3078,7 @@ - 2010-03-03 14:32:08.555196 + done