From 449af5cb996c1654c3f1f1f8b13cce197ebeca1b Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Thu, 21 Oct 2010 11:20:17 +0530 Subject: [PATCH] [REF] account bzr revid: psi@tinyerp.co.in-20101021055017-yrmgb3pzunpxlg0u --- addons/account/wizard/account_validate_account_move.py | 4 ++-- addons/account/wizard/account_vat.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py index 0fac7387db9..0f963b44fa6 100644 --- a/addons/account/wizard/account_validate_account_move.py +++ b/addons/account/wizard/account_validate_account_move.py @@ -25,8 +25,8 @@ class validate_account_move(osv.osv_memory): _name = "validate.account.move" _description = "Validate Account Move" _columns = { - 'journal_id': fields.many2one('account.journal', 'Journal', required=True), - 'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]), + 'journal_id': fields.many2one('account.journal', 'Journal', required=True), + 'period_id': fields.many2one('account.period', 'Period', required=True, domain=[('state','<>','done')]), } def validate_move(self, cr, uid, ids, context=None): diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py index 8c4751d79e5..96c6efb9a93 100644 --- a/addons/account/wizard/account_vat.py +++ b/addons/account/wizard/account_vat.py @@ -26,15 +26,15 @@ class account_vat_declaration(osv.osv_memory): _description = 'Account Vat Declaration' _inherit = "account.common.report" _columns = { - 'based_on': fields.selection([('invoices', 'Invoices'), + 'based_on': fields.selection([('invoices', 'Invoices'), ('payments', 'Payments'),], 'Based On', required=True), # 'company_id': fields.many2one('res.company', 'Company', required=True), - 'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=',False)]), + 'chart_tax_id': fields.many2one('account.tax.code', 'Chart of Tax', help='Select Charts of Taxes', required=True, domain = [('parent_id','=', False)]), } def _get_tax(self, cr, uid, context=None): - taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id','=',False)], limit=1) + taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id', '=', False)], limit=1) return taxes and taxes[0] or False # def _get_company(self, cr, uid, context={}):