Pointing to revision 4786 because that is what the MP said that it was merged at before I changed its status. Looks like someone merged the branch but then made manual changes. The effect is that if you try to merge the branch now, bzr says 'Nothing to do'. But the faulty line is still there: http://bazaar.launchpad.net/~openerp/openobject-server/7.0/view/4786/openerp/addons/base/res/res_partner.py#L466
-- https://code.launchpad.net/~openerp-community/openobject-server/fix-1094212-multicompany-res_partner/+merge/141936 Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-server/fix-1094212-multicompany-res_partner. _______________________________________________ Mailing list: https://launchpad.net/~openerp-community Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp

