diff --git a/intervention_compassion/data/account.analytic.group.csv b/intervention_compassion/data/account.analytic.group.csv index 2e60925db..75c4b9d2a 100644 --- a/intervention_compassion/data/account.analytic.group.csv +++ b/intervention_compassion/data/account.analytic.group.csv @@ -31,4 +31,4 @@ analytic_group_unrestricted,unrestricted fund,analytic_group_fund analytic_group_christmas,christmas fund,analytic_group_fund analytic_group_local,local fund,analytic_group_fund analytic_group_ldp,ldp fund,analytic_group_fund -analytic_group_usp,unsponsored fund,analytic_group_fund \ No newline at end of file +analytic_group_usp,unsponsored fund,analytic_group_fund diff --git a/sponsorship_compassion/models/contracts.py b/sponsorship_compassion/models/contracts.py index d2730b84f..e6c882f64 100644 --- a/sponsorship_compassion/models/contracts.py +++ b/sponsorship_compassion/models/contracts.py @@ -802,7 +802,6 @@ def contract_active(self): not_active = self.filtered(lambda c: not c.is_active) if not_active: not_active.write({"activation_date": fields.Datetime.now()}) - self.write({"state": "active"}) last_line_id = self.search( [("sponsorship_line_id", "!=", False)], order="sponsorship_line_id desc", @@ -816,6 +815,13 @@ def contract_active(self): last_line_id += 1 contract.sponsorship_line_id = last_line_id + # Flush env so db reflects payment mode + self.mapped("partner_id").flush() + self.flush() + + # trigger auto comm job after payment info is written to the db + self.write({"state": "active"}) + # Cancel the old invoices if a contract is activated delay = datetime.now() + relativedelta(seconds=30) self.with_delay(