Dear Stuart, Thanks a lot for fixing the branch. Please remove the security/base_contact_security.xml. This is a leftover of 6.0.x and added by mistake. The .po came in from updates from the branch but you did well to ommit them.
I had a quick look at crm_lead.py and saw that _lead_create_partner_address would have to be overwritten to fix the break. However, we are not using this functionality and I guess this fix is to be added into a separate module for correct dependency of modules. Have you seen other breaks in the CRM? P.S. Besides that new opportunities start as leads ;) Best Regards Etienne On 05.03.2012 08:16, Stuart Longland wrote: > Not sure if it's just me, but I could not get either the patches from this > branch, or the branch itself to merge cleanly. > > As an interim solution, I have hand-merged the contributions of this branch > into > https://code.launchpad.net/~vrt-openerp/openobject-addons/6.1-trunk-bug-923440. > > The one thing I have ditched, is the updates to .po files, as they look like > they were committed by mistake (some were branch conflicts). I haven't > submitted the branch for merging officially, however as it lacks the full > version history, but I place it here for people's interest. > > Worth noting, that base_contact as it stands now (including after these > changes), breaks crm; converting leads to opportunities for example, breaks > with the current code base. -- https://code.launchpad.net/~openerp-community/openobject-addons/trunk-bug-923440-base_contact_finalise6.1/+merge/95777 Your team OpenERP Community is subscribed to branch lp:~openerp-community/openobject-addons/trunk-bug-923440-base_contact_finalise6.1. _______________________________________________ Mailing list: https://launchpad.net/~openerp-community Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-community More help : https://help.launchpad.net/ListHelp
