Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning-project-kjo
into lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-project-kjo/+merge/98145
remove the res.partner.address
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-project-kjo/+merge/98145
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
=== modified file 'project/project.py'
--- project/project.py 2012-02-15 14:51:12 +0000
+++ project/project.py 2012-03-19 05:25:41 +0000
@@ -75,9 +75,8 @@
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
=== modified file 'project/project_view.xml'
--- project/project_view.xml 2012-01-31 13:36:57 +0000
+++ project/project_view.xml 2012-03-19 05:25:41 +0000
@@ -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/>
=== modified file 'project/security/ir.model.access.csv'
--- project/security/ir.model.access.csv 2012-01-31 13:36:57 +0000
+++ project/security/ir.model.access.csv 2012-03-19 05:25:41 +0000
@@ -8,7 +8,6 @@
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
=== modified file 'project/wizard/mail_compose_message.py'
--- project/wizard/mail_compose_message.py 2011-09-09 13:10:45 +0000
+++ project/wizard/mail_compose_message.py 2012-03-19 05:25:41 +0000
@@ -41,7 +41,7 @@
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 @@
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,
=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py 2011-12-21 22:15:04 +0000
+++ project_issue/project_issue.py 2012-03-19 05:25:41 +0000
@@ -204,8 +204,6 @@
select=True, help='Sales team to which Case belongs to.\
Define Responsible user and Email account for mail gateway.'),
'partner_id': fields.many2one('res.partner', 'Partner', select=1),
- 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
- domain="[('partner_id','=',partner_id)]"),
'company_id': fields.many2one('res.company', 'Company'),
'description': fields.text('Description'),
'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True,
@@ -264,7 +262,6 @@
_defaults = {
'active': 1,
'partner_id': crm.crm_case._get_default_partner,
- 'partner_address_id': crm.crm_case._get_default_partner_address,
'email_from': crm.crm_case._get_default_email,
'state': 'draft',
'section_id': crm.crm_case._get_section,
=== modified file 'project_issue/project_issue_demo.xml'
--- project_issue/project_issue_demo.xml 2011-12-19 16:54:40 +0000
+++ project_issue/project_issue_demo.xml 2012-03-19 05:25:41 +0000
@@ -3,7 +3,6 @@
<data noupdate="1">
<record id="crm_case_buginaccountsmodule0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_8"/>
<field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
<field eval=""5"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -20,7 +19,6 @@
</record>
<record id="crm_case_programnotgivingproperoutput0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_tang"/>
<field eval="time.strftime('%Y-%m-15 12:50:00')" name="date"/>
<field eval=""3"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -36,7 +34,6 @@
</record>
<record id="crm_case_outputincorrect0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_9"/>
<field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
<field eval=""4"" name="priority"/>
<field name="user_id" ref="base.user_demo"/>
@@ -51,7 +48,6 @@
</record>
<record id="crm_case_problemloadingpage0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_13"/>
<field eval="time.strftime('%Y-%m-20 15:25:05')" name="date"/>
<field eval=""3"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -82,7 +78,6 @@
</record>
<record id="crm_case_programmingerror0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_10"/>
<field eval="time.strftime('%Y-%m-24 09:45:00')" name="date"/>
<field eval=""3"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -98,7 +93,6 @@
</record>
<record id="crm_case_logicalerrorinprogram0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_6"/>
<field eval="time.strftime('%Y-%m-26 11:10:00')" name="date"/>
<field eval=""2"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -114,7 +108,6 @@
</record>
<record id="crm_case_constrainterror0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_6"/>
<field eval="time.strftime('%Y-%m-25 13:35:00')" name="date"/>
<field eval=""2"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -130,7 +123,6 @@
</record>
<record id="crm_case_errorinprogram0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_10"/>
<field eval="time.strftime('%Y-%m-28 15:40:00')" name="date"/>
<field eval=""2"" name="priority"/>
<field name="user_id" ref="base.user_demo"/>
@@ -145,7 +137,6 @@
</record>
<record id="crm_case_patcheserrorinprogram0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_9"/>
<field eval="time.strftime('%Y-%m-28 16:30:00')" name="date"/>
<field eval=""2"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -161,7 +152,6 @@
</record>
<record id="crm_case_newfeaturestobeadded0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_wong"/>
<field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
<field eval=""4"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -177,7 +167,6 @@
</record>
<record id="crm_case_addmenustothemodule0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_1"/>
<field eval="time.strftime('%Y-%m-05 18:00:00')" name="date"/>
<field eval=""1"" name="priority"/>
<field name="user_id" ref="base.user_demo"/>
@@ -194,7 +183,6 @@
</record>
<record id="crm_case_includeattendancesheetinproject0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_2"/>
<field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
<field eval=""3"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -211,7 +199,6 @@
</record>
<record id="crm_case_createnewobject0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_6"/>
<field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
<field eval=""3"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -227,7 +214,6 @@
</record>
<record id="crm_case_improvereportsinhrms0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_15"/>
<field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
<field eval=""4"" name="priority"/>
<field name="user_id" ref="base.user_root"/>
@@ -243,7 +229,6 @@
</record>
<record id="crm_case_improvereportsinpms0" model="project.issue">
- <field name="partner_address_id" ref="base.res_partner_address_15"/>
<field eval="time.strftime('%Y-%m-21 14:30:00')" name="date"/>
<field eval=""2"" name="priority"/>
<field name="user_id" ref="base.user_demo"/>
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2011-12-19 16:54:40 +0000
+++ project_issue/project_issue_view.xml 2012-03-19 05:25:41 +0000
@@ -68,7 +68,6 @@
<group col="2" colspan="2">
<separator colspan="2" string="Contact Information"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
- <field name="partner_address_id" string="Contact" on_change="onchange_partner_address_id(partner_address_id, email_from)"/>
<field name="email_from"/>
</group>
<group col="3" colspan="2">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
