[IMP]project: remove res.partner.address

bzr revid: kjo@tinyerp.com-20120307070225-h95rszb7idselhfj

4 files changed, 5 insertions, 8 deletions

diff --git a/addons/project/project.py b/addons/project/project.py
index 9966ad02ee8..af21e679f30 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -75,9 +75,8 @@ class project(osv.osv):
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         partner_obj = self.pool.get('res.partner')
         if not part:
-            return {'value':{'contact_id': False}}
-        addr = partner_obj.address_get(cr, uid, [part], ['contact'])
-        val = {'contact_id': addr['contact']}
+            return {'value':{}}
+        val = {}
         if 'pricelist_id' in self.fields_get(cr, uid, context=context):
             pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context)
             pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 26abe86fe99..241c466b10a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -69,7 +69,6 @@
                         </page>
                         <page string="Billing" groups="account.group_account_invoice">
                             <field colspan="4" name="partner_id" on_change="onchange_partner_id(partner_id)" select="1" string="Customer"/>
-                            <field domain="[('partner_id','=',partner_id)]" name="contact_id" string="Contact Address"/>
                             <field name="warn_customer"/>
                             <field name="currency_id" select="1" groups="base.group_multi_company" required="1"/>
                             <newline/>
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index 3dc9cdbab46..5b51dc85e7c 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -8,7 +8,6 @@ access_report_project_task_user,report.project.task.user,model_report_project_ta
 access_project_vs_hours,project.vs.hours,model_project_vs_hours,project.group_project_user,1,1,1,1

 access_task_by_days,task.by.days,model_task_by_days,project.group_project_user,1,1,1,1

 access_partner_task user,base.res.partner user,base.model_res_partner,project.group_project_user,1,0,0,0

-access_partner_address_task user,base.res.partner.address user,base.model_res_partner_address,project.group_project_user,1,0,0,0

 access_task_on_partner,project.task on partners,model_project_task,base.group_user,1,0,0,0

 access_project_on_partner,project.project on partners,model_project_project,base.group_user,1,0,0,0

 access_project_task_sale_user,project.task salesman,model_project_task,base.group_sale_salesman,1,0,0,0

diff --git a/addons/project/wizard/mail_compose_message.py b/addons/project/wizard/mail_compose_message.py
index 82d67ea9b92..1609cc04c1c 100644
--- a/addons/project/wizard/mail_compose_message.py
+++ b/addons/project/wizard/mail_compose_message.py
@@ -41,7 +41,7 @@ class mail_compose_message(osv.osv_memory):
             partner = task_data.partner_id or task_data.project_id.partner_id
             if task_data.project_id.warn_manager and (not task_data.project_id.user_id or task_data.project_id.user_id and not task_data.project_id.user_id.user_email) :
                 raise osv.except_osv(_('Error'), _("Please specify the Project Manager or email address of Project Manager."))
-            elif task_data.project_id.warn_customer and (not partner or not len(partner.address) or (partner and len(partner.address) and not partner.address[0].email)):
+            elif task_data.project_id.warn_customer and (not partner or (partner and not partner.email)):
                 raise osv.except_osv(_('Error'), _("Please specify the Customer or email address of Customer."))
 
             result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False})
@@ -56,8 +56,8 @@ class mail_compose_message(osv.osv_memory):
             header = (task_data.project_id.warn_header or '') % val
             footer = (task_data.project_id.warn_footer or '') % val
             description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature)
-            if partner and len(partner.address):
-                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].email})
+            if partner :
+                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.email})
             result.update({
                        'body_text': description or False,
                        'email_to':   task_data.project_id.user_id and task_data.project_id.user_id.user_email or False,