Merge PR #634 into 12.0

Signed-off-by pedrobaeza
This commit is contained in:
OCA-git-bot
2021-02-16 14:23:37 +00:00

View File

@@ -21,10 +21,14 @@ class ResPartner(models.Model):
string="Contracts", string="Contracts",
) )
def _get_partner_contract_domain(self):
self.ensure_one()
return [("partner_id", "child_of", self.ids)]
def _compute_contract_count(self): def _compute_contract_count(self):
contract_model = self.env['contract.contract'] contract_model = self.env['contract.contract']
fetch_data = contract_model.read_group([ fetch_data = contract_model.read_group(
('partner_id', 'child_of', self.ids)], self._get_partner_contract_domain(),
['partner_id', 'contract_type'], ['partner_id', 'contract_type'], ['partner_id', 'contract_type'], ['partner_id', 'contract_type'],
lazy=False) lazy=False)
result = [[data['partner_id'][0], data['contract_type'], result = [[data['partner_id'][0], data['contract_type'],
@@ -47,7 +51,7 @@ class ResPartner(models.Model):
res = self._get_act_window_contract_xml(contract_type) res = self._get_act_window_contract_xml(contract_type)
action_context = {k: v for k, v in self.env.context.items() if k != "group_by"} action_context = {k: v for k, v in self.env.context.items() if k != "group_by"}
action_context["search_default_partner_id"] = self.id action_context["domain"] = self._get_partner_contract_domain()
action_context["default_partner_id"] = self.id action_context["default_partner_id"] = self.id
action_context["default_pricelist_id"] = self.property_product_pricelist.id action_context["default_pricelist_id"] = self.property_product_pricelist.id
res["context"] = action_context res["context"] = action_context