Dhruti Shastri has proposed merging
lp:~openerp-dev/openobject-addons/6.1-opw-575218-dhs into
lp:openobject-addons/6.1.
Requested reviews:
Naresh(OpenERP) (nch-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575218-dhs/+merge/109101
I have made the changes as per suggestion.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575218-dhs/+merge/109101
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/6.1-opw-575218-dhs.
=== modified file 'marketing_campaign/marketing_campaign.py'
--- marketing_campaign/marketing_campaign.py 2012-01-31 13:36:57 +0000
+++ marketing_campaign/marketing_campaign.py 2012-06-07 10:38:53 +0000
@@ -404,7 +404,7 @@
_columns = {
'name': fields.char('Name', size=128, required=True),
'campaign_id': fields.many2one('marketing.campaign', 'Campaign',
- required = True, ondelete='cascade', select=1),
+ ondelete='cascade', select=1),
'object_id': fields.related('campaign_id','object_id',
type='many2one', relation='ir.model',
string='Object', readonly=True),
=== modified file 'marketing_campaign/marketing_campaign_view.xml'
--- marketing_campaign/marketing_campaign_view.xml 2012-03-09 01:13:12 +0000
+++ marketing_campaign/marketing_campaign_view.xml 2012-06-07 10:38:53 +0000
@@ -249,7 +249,7 @@
<field name="signal" groups="base.group_extended"/>
<field name="start"/>
<field name="object_id" invisible="1"/>
- <field name="campaign_id" invisible="1"/>
+ <field name="campaign_id" invisible="1" />
</group>
<group colspan="2" col="2">
<separator string="Cost / Revenue" 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
