Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning-report-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-report-kjo/+merge/98146
remove the res.partner.address from report_intrastat,crm_partner_assign and
base_contact
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-partner-address-cleaning-report-kjo/+merge/98146
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-partner-address-cleaning.
=== modified file 'base_contact/base_contact.py'
--- base_contact/base_contact.py 2012-02-15 13:22:13 +0000
+++ base_contact/base_contact.py 2012-03-19 05:26:35 +0000
@@ -42,12 +42,12 @@
'title': fields.many2one('res.partner.title','Title', domain=[('domain','=','contact')]),
'website': fields.char('Website', size=120),
'lang_id': fields.many2one('res.lang', 'Language'),
- 'job_ids': fields.one2many('res.partner.address', 'contact_id', 'Functions and Addresses'),
+ 'job_ids': fields.one2many('res.partner', 'contact_id', 'Functions and Addresses'),
'country_id': fields.many2one('res.country','Nationality'),
'birthdate': fields.char('Birthdate', size=64),
'active': fields.boolean('Active', help="If the active field is set to False,\
it will allow you to hide the partner contact without removing it."),
- 'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
+ 'partner_id': fields.related('job_ids', 'parent_id', type='many2one',\
relation='res.partner', string='Main Employer'),
'function': fields.related('job_ids', 'function', type='char', \
string='Main Function'),
@@ -103,9 +103,9 @@
SELECT
id,COALESCE(name, '/'),COALESCE(name, '/'),title,true,email,mobile,birthdate
FROM
- res_partner_address""")
- cr.execute("alter table res_partner_address add contact_id int references res_partner_contact")
- cr.execute("update res_partner_address set contact_id=id")
+ res_partner""")
+ cr.execute("alter table res_partner add contact_id int references res_partner_contact")
+ cr.execute("update res_partner set contact_id=id")
cr.execute("select setval('res_partner_contact_id_seq', (select max(id)+1 from res_partner_contact))")
res_partner_contact()
@@ -121,8 +121,8 @@
'state_id': fields.many2one("res.country.state", 'Fed. State', domain="[('country_id','=',country_id)]"),
'country_id': fields.many2one('res.country', 'Country'),
'company_id': fields.many2one('res.company', 'Company',select=1),
- 'job_ids': fields.one2many('res.partner.address', 'location_id', 'Contacts'),
- 'partner_id': fields.related('job_ids', 'partner_id', type='many2one',\
+ 'job_ids': fields.one2many('res.partner', 'location_id', 'Contacts'),
+ 'partner_id': fields.related('job_ids', 'parent_id', type='many2one',\
relation='res.partner', string='Main Partner'),
}
_defaults = {
@@ -147,10 +147,10 @@
id,street,street2,zip,city,
state_id,country_id,company_id
FROM
- res_partner_address""")
- cr.execute("alter table res_partner_address add location_id int references res_partner_location")
- cr.execute("update res_partner_address set location_id=id")
- cr.execute("select setval('res_partner_location_id_seq', (select max(id)+1 from res_partner_address))")
+ res_partner""")
+ cr.execute("alter table res_partner add location_id int references res_partner_location")
+ cr.execute("update res_partner set location_id=id")
+ cr.execute("select setval('res_partner_location_id_seq', (select max(id)+1 from res_partner))")
def name_get(self, cr, uid, ids, context=None):
result = {}
@@ -170,9 +170,9 @@
def _default_location_id(self, cr, uid, context=None):
if context is None:
context = {}
- if not context.get('default_partner_id',False):
+ if not context.get('default_parent_id',False):
return False
- ids = self.pool.get('res.partner.location').search(cr, uid, [('partner_id','=',context['default_partner_id'])], context=context)
+ ids = self.pool.get('res.partner.location').search(cr, uid, [('parent_id','=',context['default_parent_id'])], context=context)
return ids and ids[0] or False
def onchange_location_id(self,cr, uid, ids, location_id=False, context={}):
@@ -227,8 +227,8 @@
result = {}
for rec in self.browse(cr,uid, ids, context=context):
res = []
- if rec.partner_id:
- res.append(rec.partner_id.name_get()[0][1])
+ if rec.parent_id:
+ res.append(rec.parent_id.name_get()[0][1])
if rec.contact_id and rec.contact_id.name:
res.append(rec.contact_id.name)
if rec.location_id:
=== modified file 'base_contact/base_contact_view.xml'
--- base_contact/base_contact_view.xml 2012-01-31 13:36:57 +0000
+++ base_contact/base_contact_view.xml 2012-03-19 05:26:35 +0000
@@ -50,8 +50,8 @@
</group>
<field name="job_ids" colspan="4" nolabel="1" mode="tree,form">
<form string="Functions and Addresses">
- <field name="partner_id" />
- <field name="location_id" domain="[('partner_id', '=', partner_id)]"/>
+ <field name="parent_id" />
+ <field name="location_id" domain="[('partner_id', '=', parent_id)]"/>
<field name="function" />
<separator string="Professional Info" colspan="4"/>
<field name="phone"/>
@@ -135,10 +135,10 @@
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="type">form</field>
<field name="arch" type="xml">
- <separator string="Postal Address" position="after">
+ <separator string="Address" position="after">
<field name="location_id" on_change="onchange_location_id(location_id)" domain="[('partner_id', '=', parent.id)]"/>
</separator>
- <xpath expr="//field[@string='Contact Name']" position="replace">
+ <xpath expr="//field[@name='name']" position="replace">
<field name="contact_id"/>
</xpath>
<field name="title" position="replace"/>
=== modified file 'base_contact/security/ir.model.access.csv'
--- base_contact/security/ir.model.access.csv 2012-01-31 13:36:57 +0000
+++ base_contact/security/ir.model.access.csv 2012-03-19 05:26:35 +0000
@@ -3,5 +3,5 @@
"access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact","base.group_user",1,0,0,0
"access_res_partner_location","res.partner.location","model_res_partner_location","base.group_user",1,0,0,0
"access_res_partner_location_sale_salesman","res.partner.location","model_res_partner_location","base.group_sale_salesman",1,1,1,0
-"access_res_partner_address_sale_salesman","res.partner.address.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
+"access_res_partner_sale_salesman","res.partner.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
"access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact","base.group_sale_salesman",1,1,1,0
=== modified file 'crm_partner_assign/report/crm_partner_report.py'
--- crm_partner_assign/report/crm_partner_report.py 2012-03-06 13:48:46 +0000
+++ crm_partner_assign/report/crm_partner_report.py 2012-03-19 05:26:35 +0000
@@ -51,7 +51,7 @@
SELECT
coalesce(i.id, p.id - 1000000000) as id,
p.id as partner_id,
- (SELECT country_id FROM res_partner a WHERE a.partner_id=p.id AND country_id is not null limit 1) as country_id,
+ (SELECT country_id FROM res_partner a WHERE a.parent_id=p.id AND country_id is not null limit 1) as country_id,
p.grade_id,
p.activation,
p.date_review,
=== modified file 'report_intrastat/report_intrastat.py'
--- report_intrastat/report_intrastat.py 2011-12-19 16:54:40 +0000
+++ report_intrastat/report_intrastat.py 2012-03-19 05:26:35 +0000
@@ -112,9 +112,9 @@
left join product_uom uom on uom.id=inv_line.uos_id
left join product_uom puom on puom.id = pt.uom_id
left join report_intrastat_code intrastat on pt.intrastat_id = intrastat.id
- left join (res_partner_address inv_address
+ left join (res_partner inv_address
left join res_country inv_country on (inv_country.id = inv_address.country_id))
- on (inv_address.id = inv.address_invoice_id)
+ on (inv_address.id = inv.partner_id)
where
inv.state in ('open','paid')
_______________________________________________
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
