Merged for improve partner category

bzr revid: hda@tinyerp.com-20091103125528-tgbkv68bgxs41ray

diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py
index 82acd80..b2bc3f7 100644 (file)
--- a/bin/addons/base/res/partner/partner.py
+++ b/bin/addons/base/res/partner/partner.py
@@ -124,8 +124,6 @@ def _lang_get(self, cr, uid, context={}):
     return [(r['code'], r['name']) for r in res] + [('','')]
 
 
-
-
 class res_partner(osv.osv):
     _description='Partner'
     _name = "res.partner"
@@ -451,7 +449,13 @@ class res_partner_bank(osv.osv):
 
 res_partner_bank()
 
-
+class res_partner_category(osv.osv):
+    _inherit = 'res.partner.category'
+    _columns = {
+        'partner_ids': fields.many2many('res.partner', 'res_partner_category_rel', 'category_id', 'partner_id', 'Partners'),
+    }
+   
+res_partner_category()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index 6a3c791..d96e168 100644 (file)
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -518,6 +518,8 @@
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
                     <field name="parent_id"/>
+                    <separator colspan="4" string="Partners"/>
+                    <field colspan="4" name="partner_ids" nolabel="1" select="2"/>                    
                 </form>
             </field>
         </record>