Merge lp:~cci-team/openobject-addons/cci_crm_fix-invoice_id-redundacy into lp:~cci-team/openobject-addons/addons-cci

Proposed by qdp (OpenERP)
Status: Needs review
Proposed branch: lp:~cci-team/openobject-addons/cci_crm_fix-invoice_id-redundacy
Merge into: lp:~cci-team/openobject-addons/addons-cci
Diff against target: 27 lines (+4/-2)
2 files modified
cci_crm/ (+3/-1)
cci_crm/cci_crm_view.xml (+1/-1)
To merge this branch: bzr merge lp:~cci-team/openobject-addons/cci_crm_fix-invoice_id-redundacy
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email:

This proposal supersedes a proposal from 2012-06-28.

Description of the change

Fix an ambiguous name on

n cci_crm, we add an 'invoice_id'. Or in 'event', the object 'event.registration' inherits from but had already an 'invoice_id' name. This 'event.registration' has two fields 'invoice_id' : one on and one on 'event.registration'. This ambuguity causes some problems to show or use this field.

To correct this, I've changed the 'invoice_id' on cci_crm to 'sponsor_invoice_id' because this is the real usage of this field : to link a case to the invoice of a sponsor and only for this (on screen it appears in 'sponsor' part of view).

To post a comment you must log in.
Revision history for this message
qdp (OpenERP) (qdp) wrote : Posted in a previous version of this proposal

Hello Philmer,

mmh i think you wrongly choose the branch aimed by your proposal: this is for addons trunk. Let me choose the right target.

See you soon,

Revision history for this message
qdp (OpenERP) (qdp) wrote :

to the reviewer: i just changed the target from addons/trunk to this branch.

Unmerged revisions

150. By Philippe Vandermeer <philmer@philmer-laptop2>

[FIX] ambiguous invoice_id name with module cci_event renamed to sponsor_invoice_id

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cci_crm/'
2--- cci_crm/ 2011-07-14 13:37:12 +0000
3+++ cci_crm/ 2012-08-21 14:06:20 +0000
4@@ -65,7 +65,9 @@
5 _columns = {
6 # 'meeting_id' : fields.many2one('','Meeting confidential'),
7 'group_id' : fields.many2one('res.groups','Group'),
8- 'invoice_id' : fields.many2one('account.invoice','Invoice'),
9+ # from 'invoice_id' to 'sponsor_invoice_id' to eliminate ambiguity with object 'cci_event.registration'
10+ # using same name and inheriting from (inherits)
11+ 'sponsor_invoice_id' : fields.many2one('account.invoice','Invoice'),
12 'event_ids' : fields.many2many('event.event','case_event_rel','case_id','event_id','Events'),
13 }
16=== modified file 'cci_crm/cci_crm_view.xml'
17--- cci_crm/cci_crm_view.xml 2011-07-14 13:37:12 +0000
18+++ cci_crm/cci_crm_view.xml 2012-08-21 14:06:20 +0000
19@@ -39,7 +39,7 @@
20 <page string="Sponsoring">
21 <separator string="Events" colspan="4"/>
22 <field name="event_ids" colspan="4" nolabel="1"/>
23- <field name="invoice_id" invisible="1"/>
24+ <field name="sponsor_invoice_id" invisible="1"/>
25 </page>
26 </notebook>
27 </field>


People subscribed via source and target branches

to all changes: