Ila Rana(Open ERP) has proposed merging
lp:~openerp-dev/openobject-server/5.0-opw-6198-ira into
lp:openobject-server/5.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/5.0-opw-6198-ira/+merge/67657
For the deactivate and reactivate partner's addressees. I have made changes in
partner.py as well as partner_view.xml.
--
https://code.launchpad.net/~openerp-dev/openobject-server/5.0-opw-6198-ira/+merge/67657
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/5.0-opw-6198-ira.
=== modified file 'bin/addons/base/res/partner/partner_view.xml'
--- bin/addons/base/res/partner/partner_view.xml 2011-07-01 07:29:24 +0000
+++ bin/addons/base/res/partner/partner_view.xml 2011-07-12 06:17:44 +0000
@@ -95,7 +95,11 @@
<newline/>
<field name="mobile" select="2"/>
<field name="email" select="2" widget="email"/>
+<<<<<<< TREE
<field name="active" select="2"/>
+=======
+ <field name="active" select="1"/>
+>>>>>>> MERGE-SOURCE
</form>
</field>
</record>
_______________________________________________
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
