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

[qdp (OpenERP)]

Fix an ambiguous name on crm.case.

n cci_crm, we add an 'invoice_id'. Or in 'event', the object 'event.registration' inherits from crm.case but had already an 'invoice_id' name. This 'event.registration' has two fields 'invoice_id' : one on crm.case 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).

[qdp (OpenERP) (qdp)]

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,
Quentin

[qdp (OpenERP) (qdp)]

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

Unmerged revisions

150. By Philippe Vandermeer <philmer@philmer-laptop2> on 2012-06-28

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

=== modified file 'cci_crm/cci_crm.py'
--- cci_crm/cci_crm.py	2011-07-14 13:37:12 +0000
+++ cci_crm/cci_crm.py	2012-08-21 14:06:20 +0000
@@ -65,7 +65,9 @@
     _columns = {
        # 'meeting_id' : fields.many2one('meeting.confidential.info','Meeting confidential'),
         'group_id' : fields.many2one('res.groups','Group'),
-        'invoice_id' : fields.many2one('account.invoice','Invoice'),
+        # from 'invoice_id' to 'sponsor_invoice_id' to eliminate ambiguity with object 'cci_event.registration'
+        # using same name and inheriting from crm.case (inherits)
+        'sponsor_invoice_id' : fields.many2one('account.invoice','Invoice'),
         'event_ids' : fields.many2many('event.event','case_event_rel','case_id','event_id','Events'),
     }
 
 
=== modified file 'cci_crm/cci_crm_view.xml'
--- cci_crm/cci_crm_view.xml	2011-07-14 13:37:12 +0000
+++ cci_crm/cci_crm_view.xml	2012-08-21 14:06:20 +0000
@@ -39,7 +39,7 @@
                     <page string="Sponsoring">
                         <separator string="Events" colspan="4"/>
                         <field name="event_ids" colspan="4" nolabel="1"/>
-                        <field name="invoice_id" invisible="1"/>
+                        <field name="sponsor_invoice_id" invisible="1"/>
                     </page>
                 </notebook>
             </field>