[MERGE] forward port of branch saas-4 up to 5087612

[odoo/odoo.git] / addons / account_analytic_analysis / account_analytic_analysis.py

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index f1dc842..9550f77 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -759,10 +759,10 @@ class account_analytic_account(osv.osv):
                             new_date = next_date+relativedelta(days=+interval)
                         elif contract.recurring_rule_type == 'weekly':
                             new_date = next_date+relativedelta(weeks=+interval)
-                        elif contract.recurring_rule_type == 'yearly':
-                            new_date = next_date+relativedelta(years=+interval)
-                        else:
+                        elif contract.recurring_rule_type == 'monthly':
                             new_date = next_date+relativedelta(months=+interval)
+                        else:
+                            new_date = next_date+relativedelta(years=+interval)
                         self.write(cr, uid, [contract.id], {'recurring_next_date': new_date.strftime('%Y-%m-%d')}, context=context)
                         if automatic:
                             cr.commit()