From 61ea9443731b3dba3f8eb325af3520452fab86bf Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Mon, 14 Jun 2010 12:57:45 +0200 Subject: [PATCH] [IMP] account: small multi company improvments bzr revid: qdp-launchpad@tinyerp.com-20100614105745-03u06s8codi5npgj --- addons/account/account.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 61319f7f973..85acd6e3792 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -626,8 +626,7 @@ class account_fiscalyear(osv.osv): _columns = { 'name': fields.char('Fiscal Year', size=64, required=True), 'code': fields.char('Code', size=6, required=True), - 'company_id': fields.many2one('res.company', 'Company', - help="Keep empty if the fiscal year belongs to several companies.", required=True), + 'company_id': fields.many2one('res.company', 'Company', required=True), 'date_start': fields.date('Start Date', required=True), 'date_stop': fields.date('End Date', required=True), 'period_ids': fields.one2many('account.period', 'fiscalyear_id', 'Periods'), @@ -711,7 +710,7 @@ class account_period(osv.osv): 'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True), 'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True, help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'), - 'company_id': fields.many2one('res.company', 'Company', required=True) + 'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company'), } _defaults = { 'state': lambda *a: 'draft',