From 0ea7f73f70cc70c0594faa55c8ff01a4f5055eea Mon Sep 17 00:00:00 2001
From: "rpa (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 25 Nov 2009 15:18:14 +0530
Subject: [PATCH] [IMP]: Remaining changes in merge

bzr revid: rpa@tinyerp.com-20091125094814-grz0uqpz9dp5qq0a
---
 addons/account/account.py | 1 +
 addons/project/project.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/account/account.py b/addons/account/account.py
index 7954e678574..7c9405c2d70 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -593,6 +593,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)
     }
     _defaults = {
         'state': lambda *a: 'draft',
diff --git a/addons/project/project.py b/addons/project/project.py
index def0bf75b92..b0eb8a67a02 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -118,6 +118,7 @@ class project(osv.osv):
         'state': fields.selection([('template', 'Template'), ('open', 'Running'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True,
                                   help='The project can be in either if the states \'Template\' and \'Running\'. If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\
                                   If it is to be reviewed then the state is \'Pending\'. When the project is completed the state is set to \'Done\'.'),
+        'company_id': fields.many2one('res.company', 'Company'),
      }
 
     _defaults = {