Fix issue 1465, Supplier Category grouping is Incorrect

Author: kittiu

Diff for: res_partner_ext/__openerp__.py

@@ -17,7 +17,6 @@
 * vat: Tax ID, 13 digits
 * taxbranch: Tax Branc, 5 digits
 * create_date: Make create date callable
-* single_category_id: Display only 1 partner tag is allowed in this system
 * require_taxid: whether Tax ID is required, based on Partner Tag
 * require_taxbranch: Whether Tax Branch is required, based on Partner Tag
 * is_government: Whether this partner is government, based on Partner Tag

Diff for: res_partner_ext/models/partner.py

@@ -26,12 +26,6 @@ class ResPartner(models.Model):
         compute='_get_search_key',
         store=True,
     )
-    # For group by only,
-    single_category_id = fields.Many2one(
-        'res.partner.category',
-        compute='_get_single_category_id',
-        store=True,
-    )
     require_taxid = fields.Boolean(
         string='Require Tax ID',
         compute='_get_require_taxbranch',
@@ -173,21 +167,15 @@ def onchange_address(self, cr, uid, ids,
                     {'value': {'category_id': category_id}})
         return result
 
-    @api.one
-    @api.depends('category_id')
-    def _get_single_category_id(self):
-        if self.category_id:
-            self.single_category_id = self.category_id.id
-
     @api.one
     @api.depends('category_id', 'parent_id')
     def _get_require_taxbranch(self):
         if self.parent_id:  # If a contact, never set as required.
             self.require_taxid = False
             self.require_taxbranch = False
-        elif self.single_category_id:
-            self.require_taxid = self.single_category_id.require_taxid
-            self.require_taxbranch = self.single_category_id.require_taxbranch
+        elif self.category_id:
+            self.require_taxid = self.category_id.require_taxid
+            self.require_taxbranch = self.category_id.require_taxbranch
 
     @api.one
     @api.depends('category_id')

Diff for: res_partner_ext/views/partner_view.xml

@@ -25,11 +25,11 @@
             		</attribute>
             	</field>
             	<group position="inside">
-                       <filter string="Category" context="{'group_by': 'single_category_id'}"/>
+                       <filter string="Category" context="{'group_by': 'category_id'}"/>
 		        </group>
             </field>
         </record>
-        
+
     	<record id="view_partner_tree_ext" model="ir.ui.view">
             <field name="name">view.partner.tree.ext</field>
             <field name="model">res.partner</field>
@@ -88,7 +88,7 @@
 				</field>
 				<field name="name" position="before">
 	            	<field name="title" style="width: 50%%"  options='{"no_open": True}' placeholder="Title"/>
-				</field>			
+				</field>
 	            <field name="name" position="after">
 	            	<field name="id" invisible="1"/>
                 	<field name="search_key"/>
@@ -152,7 +152,7 @@
 				            <field name="taxbranch" string="Tax Branch ID"/>
                             <field name="user_ids" invisible="1"/>
                             <field name="website" widget="url" placeholder="e.g. www.odoo.com"/>
-                        </group>               	
+                        </group>
                		</group>
                 </xpath>
                 <xpath expr="/form/sheet/notebook/page/field//form[@string='Contact']//field[@name='type']" position="attributes">
@@ -163,7 +163,7 @@
 	            </field>
             </field>
         </record>
-        
+
         <!-- Partner Category -->
         <record id="view_partner_category_form_ext" model="ir.ui.view">
             <field name="name">view.partner.category.form.ext</field>
@@ -180,18 +180,18 @@
                         <field name="receivable_account_id" />
                         <field name="payable_account_id" />
                         <field name="fiscal_position_id" />
-                    </group>				
-                </group>	
+                    </group>
+                </group>
                 <field name="active" position="after">require_tax_branch_unique
                 </field>
             </field>
         </record>
-        
+
         <record id="view_partner_category_list_ext" model="ir.ui.view">
             <field name="name">view.partner.category.list.ext</field>
             <field name="model">res.partner.category</field>
             <field name="inherit_id" ref="base.view_partner_category_list"/>
-            <field name="arch" type="xml">	
+            <field name="arch" type="xml">
             	<field name="complete_name" position="after" >
             		<field name="receivable_account_id" />
             	</field>
@@ -257,4 +257,4 @@
             parent="purchase.menu_purchase_partner_cat"
             groups="base.group_no_one"/>
     </data>
-</openerp>
+</openerp>