Michael (OpenERP) has proposed merging
lp:~openerp-dev/openerp-int/mck_change_fields into
lp:~openerp-dev/openerp-int/mck_addons.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-int/mck_change_fields/+merge/127786
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_change_fields/+merge/127786
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-int/mck_change_fields into
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_contact/company.py'
--- mck_contact/company.py 2012-10-02 12:50:06 +0000
+++ mck_contact/company.py 2012-10-03 14:47:46 +0000
@@ -147,6 +147,7 @@
'street' : fields.char(size=256, string="Street 1"),
'street2' : fields.char(size=256, string="Street 2"),
"partner_id": fields.many2one("res.partner", "Company", required=True, ondelete="cascade"),
+ 'mck_partner_id': fields.many2one("res.partner", "Company", required=True, ondelete="cascade"),
"hq" : fields.boolean("HQ"),
}
=== modified file 'mck_contact/view/location.xml'
--- mck_contact/view/location.xml 2012-10-02 07:38:46 +0000
+++ mck_contact/view/location.xml 2012-10-03 14:47:46 +0000
@@ -13,7 +13,7 @@
<field name="priority">15</field>
<field name="arch" type="xml">
<search string="Company Address">
- <field name="partner_id" />
+ <field name="mck_partner_id" />
<field name="country_id" />
<field name="city" />
<field name="zip" string="Postal Code"/>
@@ -29,7 +29,7 @@
<field name="priority">15</field>
<field name="arch" type="xml">
<tree string="Company Address">
- <field name="partner_id" />
+ <field name="mck_partner_id" />
<field name="street" />
<field name="street2" />
<field name="city" />
@@ -49,7 +49,7 @@
<form string="Company Address">
<group colspan="4" col="8">
<label string="" colspan="8"/>
- <field name="partner_id" colspan="4" />
+ <field name="mck_partner_id" colspan="4" />
<field name="hq" colspan="4" />
<label string="" colspan="8"/>
<field name="street" colspan="4" />
_______________________________________________
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
