[FIX] res.partner.category: merge the 2 classes bearing the same name
authorOlivier Dony <odo@openerp.com>
Thu, 12 Jan 2012 10:50:43 +0000 (11:50 +0100)
committerOlivier Dony <odo@openerp.com>
Thu, 12 Jan 2012 10:50:43 +0000 (11:50 +0100)
commite216218f443951d172f92f7015e2406ef253dca9
treed80d26d9e501a12d79ff7cc72749dc74a89142b3
parentf4efb938e2abe2fa3300e64a9ec117c56b5afd59
[FIX] res.partner.category: merge the 2 classes bearing the same name

The name conflict causes the second class to
shadow the first one, thus breaking future
references to the first one, including any
super() call inside it!
6.1 has 2-pass loading of models so we can
simply merge the two classes now, and get
rid of the issue.

bzr revid: odo@openerp.com-20120112105043-ij740gptzu4gv6tw
openerp/addons/base/res/res_partner.py