[FIX] res.partner.category: merge the 2 classes bearing the same name
[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.
gisce/openobject-server,vnc-biz/openerp-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,ovnicraft/openerp-server,vnc-biz/openerp-server,MarkusTeufelberger/openobject-server,ovnicraft/openerp-server,splbio/openobject-server,MarkusTeufelberger/openobject-server,splbio/openobject-server,gisce/openobject-server,gisce/openobject-server