Merge lp:~julie-w/unifield-server/US-5216 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/account.py'
--- bin/addons/account/account.py	2020-03-11 13:40:27 +0000
+++ bin/addons/account/account.py	2020-08-07 12:54:52 +0000
@@ -2354,6 +2354,29 @@
                     break
         return res
 
+    def _is_frozen_model(self, cr, uid, ids, name, arg, context=None):
+        """
+        Returns True for the Recurring Plans for which the model field should be frozen, i.e. readonly:
+        - if journal entries have been generated, posted or not
+        - if the model already selected is in Done state (note that Done models aren't selectable, so the model would
+          have been selected BEFORE it becomes Done).
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = {}
+        for plan in self.browse(cr, uid, ids, fields_to_fetch=['model_id', 'lines_id'], context=context):
+            res[plan.id] = False
+            if plan.model_id.state == 'done':
+                res[plan.id] = True
+            else:
+                for line in plan.lines_id:
+                    if line.move_id:
+                        res[plan.id] = True
+                        break
+        return res
+
     _columns = {
         'name': fields.char('Name', size=64, required=True),
         'ref': fields.char('Reference', size=16),
@@ -2361,45 +2384,142 @@
 
         'date_start': fields.date('Start Date', required=True),
         'period_total': fields.integer('Number of Periods', required=True),
-        'period_nbr': fields.integer('Period', required=True),
+        'period_nbr': fields.integer('Repeat', required=True,
+                                     help="This field will determine how often entries will be generated: if the period type is 'month' and the repeat '2' then entries will be generated every 2 months"),
         'period_type': fields.selection([('day','days'),('month','month'),('year','year')], 'Period Type', required=True),
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State', required=True, readonly=True),
 
         'lines_id': fields.one2many('account.subscription.line', 'subscription_id', 'Subscription Lines'),
         'has_unposted_entries': fields.function(_get_has_unposted_entries, method=True, type='boolean',
                                                 store=False, string='Has unposted entries'),
+        'frozen_model': fields.function(_is_frozen_model, method=True, type='boolean', store=False, string='Frozen model'),
     }
     _defaults = {
         'date_start': lambda *a: time.strftime('%Y-%m-%d'),
         'period_type': 'month',
-        'period_total': 12,
+        'period_total': 0,
         'period_nbr': 1,
         'state': 'draft',
     }
 
-    def check(self, cr, uid, ids, context=None):
-        todone = []
-        for sub in self.browse(cr, uid, ids, context=context):
-            ok = True
-            for line in sub.lines_id:
-                if not line.move_id.id:
-                    ok = False
+    _order = 'date_start desc, id desc'
+
+    def _check_repeat_value(self, cr, uid, ids, context=None):
+        """
+        Prevents negative frequency
+        """
+        for plan in self.read(cr, uid, ids, ['period_nbr']):
+            if plan['period_nbr'] < 1:
+                return False
+        return True
+
+    def _check_plan_name_unicity(self, cr, uid, ids, context=None):
+        """
+        Prevents having 2 rec. plans using the same name
+        """
+        for plan in self.read(cr, uid, ids, ['name']):
+            if self.search_exist(cr, uid, [('name', '=', plan['name']), ('id', '!=', plan['id'])]):
+                raise osv.except_osv(_('Error'),
+                                     _('It is not possible to have several Recurring Plans with the same name: %s.') % plan['name'])
+        return True
+
+    _constraints = [
+        (_check_repeat_value, 'The value in the field "Repeat" must be greater than 0!', ['period_nbr']),
+        (_check_plan_name_unicity, 'It is not possible to have several Recurring Plans with the same name.', ['name']),
+    ]
+
+    def copy(self, cr, uid, acc_sub_id, default=None, context=None):
+        """
+        Account Subscription duplication:
+        - block the process if the model has been set to Done as it shouldn't be used in any plans created afterwards
+        - don't copy the link with subscription lines
+        - add " (copy)" after the name
+        """
+        if context is None:
+            context = {}
+        sub_copied = self.browse(cr, uid, acc_sub_id, fields_to_fetch=['name', 'model_id'], context=context)
+        if sub_copied.model_id.state == 'done':
+            raise osv.except_osv(_('Warning'), _('You cannot duplicate a Recurring Plan with a Done model.'))
+        suffix = ' (copy)'
+        name = '%s%s' % (sub_copied.name[:64 - len(suffix)], suffix)
+        if default is None:
+            default = {}
+        default.update({
+            'lines_id': [],
+            'name': name,
+        })
+        return super(account_subscription, self).copy(cr, uid, acc_sub_id, default, context=context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Edition of the Recurring Plans. If the model has been changed, triggers the recomputation of the state of the previous model used.
+
+        UC: use the model X in one plan. Compute Rec. entries => the plans and models are Running.
+        Select another model in the plan => model X must be set back to Draft.
+        """
+        if not ids:
+            return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if context is None:
+            context = {}
+        rec_model_obj = self.pool.get('account.model')
+        models_to_check = set()
+        for rec_plan in self.browse(cr, uid, ids, fields_to_fetch=['model_id'], context=context):
+            previous_model_id = rec_plan.model_id.id
+            if 'model_id' in vals and vals['model_id'] != previous_model_id:
+                models_to_check.add(previous_model_id)
+        res = super(account_subscription, self).write(cr, uid, ids, vals, context=context)
+        if models_to_check:
+            # check model states after the plan states have been updated
+            rec_model_obj._store_set_values(cr, uid, list(models_to_check), ['state'], context)
+        return res
+
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Prevents deletion in case the subscription lines have already been computed
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        sub_lines_obj = self.pool.get('account.subscription.line')
+        if sub_lines_obj.search_exist(cr, uid, [('subscription_id', 'in', ids)], context=context):
+            raise osv.except_osv(_('Warning'), _('You cannot delete a Recurring Plan if Subscription lines have already been computed.'))
+        return super(account_subscription, self).unlink(cr, uid, ids, context=context)
+
+    def update_plan_state(self, cr, uid, subscription_id, context=None):
+        """
+        Updates the Recurring Plan state with the following rules:
+        - no lines computed = Draft
+        - lines computed but not all lines posted = Running
+        - all lines posted = Done
+        """
+        if context is None:
+            context = {}
+        sub = self.browse(cr, uid, subscription_id, fields_to_fetch=['lines_id'], context=context)
+        if not sub.lines_id:
+            state = 'draft'
+        else:
+            running = False
+            for sub_line in sub.lines_id:
+                if not sub_line.move_id or sub_line.move_id.state != 'posted':
+                    running = True
                     break
-            if ok:
-                todone.append(sub.id)
-        if todone:
-            self.write(cr, uid, todone, {'state':'done'})
-        return False
+            if running:
+                state = 'running'
+            else:
+                state = 'done'
+        self.write(cr, uid, subscription_id, {'state': state}, context=context)
 
     def remove_line(self, cr, uid, ids, context=None):
         toremove = []
         for sub in self.browse(cr, uid, ids, context=context):
             for line in sub.lines_id:
-                if not line.move_id.id:
+                if not line.move_id:
                     toremove.append(line.id)
         if toremove:
             self.pool.get('account.subscription.line').unlink(cr, uid, toremove)
-        self.write(cr, uid, ids, {'state':'draft'})
         return False
 
     def delete_unposted(self, cr, uid, ids, context=None):
@@ -2407,29 +2527,17 @@
         This method:
         - searches for the unposted Journal Entries linked to the account subscription(s)
         - deletes the unposted JEs, and the related JIs and AJIs
-        - deletes all the Subscription Lines not linked to a Posted JE
-        - triggers the "Compute" method on the subscription(s) to get the correct lines and state
         """
         if context is None:
             context = {}
-        subline_obj = self.pool.get('account.subscription.line')
         je_obj = self.pool.get('account.move')
-        subline_to_delete_ids = []
         je_to_delete_ids = []
         for sub in self.browse(cr, uid, ids, fields_to_fetch=['lines_id'], context=context):
             for subline in sub.lines_id:
-                if not subline.move_id:
-                    # also deletes the sub. lines without JE (covers the case where frequency has been modified
-                    # => avoids having inconsistent lines at the end of the process)
-                    subline_to_delete_ids.append(subline.id)
-                elif subline.move_id.state == 'draft':  # draft = Unposted state
-                    subline_to_delete_ids.append(subline.id)
+                if subline.move_id and subline.move_id.state == 'draft':  # draft = Unposted state
                     je_to_delete_ids.append(subline.move_id.id)
-        subline_obj.unlink(cr, uid, subline_to_delete_ids, context=context)
-        je_obj.unlink(cr, uid, je_to_delete_ids, context=context)  # also deletes JIs / AJIs
-        # retrigger the creation of the subscription lines "to be generated"
-        # and recompute the state of the subscription accordingly (= "Running" if lines have been generated)
-        self.compute(cr, uid, ids, context=context)
+        if je_to_delete_ids:
+            je_obj.unlink(cr, uid, je_to_delete_ids, context=context)  # also deletes JIs / AJIs
         return True
 
     def get_dates_to_create(self, cr, uid, subscription_id, context=None):
@@ -2460,6 +2568,9 @@
         if context is None:
             context = {}
         for sub in self.browse(cr, uid, ids, context=context):
+            if sub.state == 'running':
+                # first remove existing lines without JE
+                self.remove_line(cr, uid, ids, context=context)
             if sub.model_id and sub.model_id.has_any_bad_ad_line_exp_in:
                 # UFTP-103: block compute if recurring model has line with
                 # expense/income accounts with invalid AD
@@ -2474,10 +2585,7 @@
                     'date': date_sub,
                     'subscription_id': sub.id,
                 })
-            if dates_to_create:
-                self.write(cr, uid, sub.id, {'state': 'running'}, context=context)
-            else:  # all the subscription lines were already created => the account subscription can be marked as "Done"
-                self.write(cr, uid, sub.id, {'state': 'done'}, context=context)
+            self.update_plan_state(cr, uid, sub.id, context=context)
         return True
 account_subscription()
 
@@ -2492,19 +2600,16 @@
     _order = 'date, id'
 
     def move_create(self, cr, uid, ids, context=None):
-        tocheck = {}
         all_moves = []
         obj_model = self.pool.get('account.model')
         for line in self.browse(cr, uid, ids, context=context):
             datas = {
                 'date': line.date,
+                'ref': line.subscription_id.ref or '',
             }
             move_ids = obj_model.generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
-            tocheck[line.subscription_id.id] = True
             self.write(cr, uid, [line.id], {'move_id':move_ids[0]})
             all_moves.extend(move_ids)
-        if tocheck:
-            self.pool.get('account.subscription').check(cr, uid, tocheck.keys(), context)
         return all_moves
 
     _rec_name = 'date'

=== modified file 'bin/addons/account/account_view.xml'
--- bin/addons/account/account_view.xml	2019-11-04 09:40:45 +0000
+++ bin/addons/account/account_view.xml	2020-08-07 12:54:52 +0000
@@ -1711,10 +1711,12 @@
             <field name="model">account.model</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Journal Entry Model">
+                <tree string="Journal Entry Model" colors="grey:state=='done';blue:state=='draft';black:state=='running'">
                     <field name="name"/>
                     <field name="journal_id"/>
                     <field name="company_id" groups="base.group_multi_company"/>
+                    <field name="create_date"/>
+                    <field name="state"/>
                 </tree>
             </field>
         </record>
@@ -1729,9 +1731,11 @@
                     <filter string="Sale" icon="terp-camera_test" domain="[('journal_id.type', '=', 'sale')]"/>
                     <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
                     <separator orientation="vertical"/>
+                      <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state', '=', 'draft')]"/>
+                      <filter icon="terp-camera_test" string="Running" name="running" domain="[('state', '=', 'running')]"/>
+                      <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state', '=', 'done')]" />
                       <field name="name"/>
-                      <field name="journal_id" widget="selection"/>
-                      <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                      <field name="journal_id" domain="[('type', '=', 'purchase'), ('is_current_instance', '=', True)]"/>
                     </group>
                     <newline/>
                     <group expand="0" string="Group By...">
@@ -1746,6 +1750,7 @@
             <field name="res_model">account.model</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_draft': 1, 'search_default_running': 1}</field>
             <field name="search_view_id" ref="view_model_search"/>
         </record>
         <menuitem
@@ -1885,7 +1890,7 @@
             <field name="model">account.subscription</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');gray:state in ('done');black:state in ('running')" string="Entry Subscription">
+                <tree colors="blue:state=='draft';grey:state=='done';black:state=='running'" string="Recurring Plan">
                     <field name="name"/>
                     <field name="model_id"/>
                     <field name="ref"/>
@@ -1900,10 +1905,10 @@
             <field name="model">account.subscription</field>
             <field name="type">search</field>
             <field name="arch" type="xml">
-                <search string="Entry Subscription">
+                <search string="Recurring Plan">
                     <group col="8" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]" help="Draft Subscription"/>
-                        <filter icon="terp-camera_test" string="Running" name="running" domain="[('state','=','running')]" help="Running Subscription"/>
+                        <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state', '=', 'draft')]"/>
+                        <filter icon="terp-camera_test" string="Running" name="running" domain="[('state', '=', 'running')]"/>
                         <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" />
                         <separator orientation="vertical"/>
                         <field name="name"/>
@@ -1924,19 +1929,20 @@
             <field name="model">account.subscription</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Recurring">
-                    <group col="6" colspan="4">
+                <form string="Recurring Plan">
+                    <group col="6" colspan="4" attrs="{'readonly': [('state', '=', 'done')]}">
                         <field name="name" select="1"/>
-                        <field name="model_id"/>
+                        <field name="frozen_model" invisible="1"/>
+                        <field name="model_id" domain="[('state', '!=', 'done')]" attrs="{'readonly': [('frozen_model', '=', True)]}"/>
                         <field name="ref" select="1"/>
                     </group>
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" attrs="{'readonly': [('state', '=', 'done')]}">
                         <separator colspan="4" string="Starts on"/>
                         <field name="date_start" select="1"/>
                         <field name="period_total"/>
                     </group>
 
-                    <group col="2" colspan="2">
+                    <group col="2" colspan="2" attrs="{'readonly': [('state', '=', 'done')]}">
                         <separator colspan="4" string="Valid Up to"/>
                         <field name="period_nbr"/>
                         <field name="period_type"/>
@@ -1945,7 +1951,8 @@
                     <group col="2" colspan="2">
                     </group>
                     <separator colspan="4" string="Subscription Lines"/>
-                    <field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"/>
+                    <field colspan="4" name="lines_id" widget="one2many_list" nolabel="1"
+                           attrs="{'readonly': [('state', '=', 'done')]}"/>
 
                     <group col="6" colspan="4">
                         <field name="state"/>
@@ -1953,23 +1960,22 @@
                         <button name="delete_unposted" type="object" icon="terp-gtk-stop"
                                 string="Delete Unposted Entries"
                                 attrs="{'readonly': [('has_unposted_entries', '=', False)]}"/>
-                        <button name="compute" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                        <button name="remove_line" states="running" string="Remove Lines" type="object" icon="gtk-remove"/>
+                        <button name="compute" states="draft,running" string="Compute" type="object" icon="terp-stock_format-scientific"/>
                     </group>
                 </form>
             </field>
         </record>
         <record id="action_subscription_form" model="ir.actions.act_window">
-            <field name="name">Recurring Lines</field>
+            <field name="name">Recurring Plan</field>
             <field name="res_model">account.subscription</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="search_view_id" ref="view_subscription_search"/>
-            <field name="context">{'search_default_draft': 1, 'search_default_running': 1}</field>
-            <field name="help">A recurring entry is a miscellaneous entry that occurs on a recurrent basis from a specific date, i.e. corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create such entries to automate the postings in the system.</field>
+            <field name="context">{'search_default_running': 1, 'search_default_draft': 1}</field>
+            <field name="help">A recurring entry is a miscellaneous entry that occurs on a recurrent basis from a specific date, i.e. corresponding to the signature of a contract or an agreement with a customer or a supplier. With Recurring Plan, you can create such entries to automate the postings in the system.</field>
         </record>
         <menuitem
-            name="Define Recurring Entries" action="action_subscription_form"
+            name="Recurring Plan" action="action_subscription_form"
             groups="base.group_extended"
             id="menu_action_subscription_form" sequence="1"
             parent="account.menu_finance_recurrent_entries"/>

=== modified file 'bin/addons/account/wizard/account_subscription_generate.py'
--- bin/addons/account/wizard/account_subscription_generate.py	2018-10-17 09:25:17 +0000
+++ bin/addons/account/wizard/account_subscription_generate.py	2020-08-07 12:54:52 +0000
@@ -41,7 +41,7 @@
         account_obj = self.pool.get('account.account')
         moves_created=[]
         for data in  self.read(cr, uid, ids, context=context):
-            cr.execute('select id from account_subscription_line where date<%s and move_id is null', (data['date'],))
+            cr.execute('select id from account_subscription_line where date<=%s and move_id is null;', (data['date'],))
             line_ids = map(lambda x: x[0], cr.fetchall())
             # check that the entry is valid before creating it
             for sub_line in sub_line_obj.browse(cr, uid, line_ids, context=context):
@@ -66,10 +66,11 @@
                         raise osv.except_osv(_('Warning'), _('The entry is not balanced for the Recurring Model %s!') % (acc_model.name))
             moves = self.pool.get('account.subscription.line').move_create(cr, uid, line_ids, context=context)
             moves_created.extend(moves)
-        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_move_line_form')
+        result = mod_obj.get_object_reference(cr, uid, 'account_subscription', 'act_account_subscription_to_account_move_line_open')
         id = result and result[1] or False
         result = act_obj.read(cr, uid, [id], context=context)[0]
-        result['domain'] = str([('id','in',moves_created)])
+        # restrict display to Draft lines so that they automatically disappear from the list once the user posts them
+        result['domain'] = str([('move_id', 'in', moves_created), ('move_state', '=', 'draft')])
         return result
 
 account_subscription_generate()

=== modified file 'bin/addons/account/wizard/account_subscription_generate_view.xml'
--- bin/addons/account/wizard/account_subscription_generate_view.xml	2011-01-14 00:11:01 +0000
+++ bin/addons/account/wizard/account_subscription_generate_view.xml	2020-08-07 12:54:52 +0000
@@ -8,8 +8,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Subscription Compute">
-                    <separator string="Generate Entries before:" colspan="4"/>
-                    <label string ="Automatically generate entries based on what has been entered in the  system before a specific date." colspan="4" nolabel="1"/>
+                    <separator string="Generate Entries until:" colspan="4"/>
+                    <label string = "Automatically generate entries based on what has been entered in the system until a specific date." colspan="4" nolabel="1"/>
                     <newline/>
                     <field name="date"/>
                 	<separator colspan="4" />

=== modified file 'bin/addons/account/wizard/account_validate_account_move.py'
--- bin/addons/account/wizard/account_validate_account_move.py	2011-01-14 00:11:01 +0000
+++ bin/addons/account/wizard/account_validate_account_move.py	2020-08-07 12:54:52 +0000
@@ -49,6 +49,8 @@
     def validate_move_lines(self, cr, uid, ids, context=None):
         obj_move_line = self.pool.get('account.move.line')
         obj_move = self.pool.get('account.move')
+        obj_subscription_line = self.pool.get('account.subscription.line')
+        obj_recurring_plan = self.pool.get('account.subscription')
         move_ids = []
         if context is None:
             context = {}
@@ -60,6 +62,14 @@
         if not move_ids:
             raise osv.except_osv(_('Warning'), _('Selected Entry Lines does not have any account move enties in draft state'))
         obj_move.button_validate(cr, uid, move_ids, context)
+        # update the state of the related Recurring Plans if any
+        sub_line_ids = obj_subscription_line.search(cr, uid, [('move_id', 'in', move_ids)], context=context)
+        if sub_line_ids:
+            recurring_plans = set()
+            for sub_line in obj_subscription_line.browse(cr, uid, sub_line_ids, fields_to_fetch=['subscription_id'], context=context):
+                recurring_plans.add(sub_line.subscription_id.id)
+            for recurring_plan_id in recurring_plans:
+                obj_recurring_plan.update_plan_state(cr, uid, recurring_plan_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 validate_account_move_lines()
 

=== modified file 'bin/addons/account_period_closing_level/account_period.py'
--- bin/addons/account_period_closing_level/account_period.py	2020-03-20 14:08:02 +0000
+++ bin/addons/account_period_closing_level/account_period.py	2020-08-07 12:54:52 +0000
@@ -25,7 +25,6 @@
 from tools.safe_eval import safe_eval
 from account_period_closing_level import ACCOUNT_PERIOD_STATE_SELECTION
 from register_accounting import register_tools
-from datetime import datetime
 
 
 class account_period(osv.osv):
@@ -69,7 +68,6 @@
 
         # Prepare some elements
         reg_obj = self.pool.get('account.bank.statement')
-        sub_obj = self.pool.get('account.subscription')
         sub_line_obj = self.pool.get('account.subscription.line')
         curr_obj = self.pool.get('res.currency')
         curr_rate_obj = self.pool.get('res.currency.rate')
@@ -233,21 +231,10 @@
                                                    "to close and have a balance which isn't equal to 0:\n"
                                                    "%s") % ", ".join([r.name for r in reg_ko]))
 
-                # check if subscriptions lines haven't been generated yet for this period
-                draft_sub_ids = sub_obj.search(cr, uid, [('state', '=', 'draft')], order='NO_ORDER', context=context)
-                for draft_sub_id in draft_sub_ids:
-                    dates_to_create = sub_obj.get_dates_to_create(cr, uid, draft_sub_id, context=context)
-                    date_stop_dt = datetime.strptime(period.date_stop, "%Y-%m-%d")
-                    for date_to_create in dates_to_create:
-                        date_to_create_dt = datetime.strptime(date_to_create, "%Y-%m-%d")
-                        if date_to_create_dt <= date_stop_dt:
-                            raise osv.except_osv(_('Warning'), _("Subscription Lines included in the Period \"%s\" or before haven't been generated. "
-                                                                 "Please generate them and create the related recurring entries "
-                                                                 "before closing the period.") % (period.name,))
                 # for subscription lines generated check if some related recurring entries haven't been created yet
                 if sub_line_obj.search_exist(cr, uid, [('date', '<=', period.date_stop), ('move_id', '=', False)], context=context):
                     raise osv.except_osv(_('Warning'), _("Recurring entries included in the Period \"%s\" or before haven't been created. "
-                                                         "Please create them before closing the period.") % (period.name,))
+                                                         "Please generate them before closing the period.") % (period.name,))
                 # then verify that all currencies have a fx rate in this period
                 # retrieve currencies for this period (in account_move_lines)
                 sql = """SELECT DISTINCT currency_id

=== modified file 'bin/addons/account_subscription/__init__.py'
--- bin/addons/account_subscription/__init__.py	2012-08-09 11:20:48 +0000
+++ bin/addons/account_subscription/__init__.py	2020-08-07 12:54:52 +0000
@@ -22,6 +22,5 @@
 import account_move_line
 import account_model
 import account_use_model
-import account_subscription
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account_subscription/account_model.py'
--- bin/addons/account_subscription/account_model.py	2020-01-22 10:35:39 +0000
+++ bin/addons/account_subscription/account_model.py	2020-08-07 12:54:52 +0000
@@ -133,6 +133,7 @@
                                            selection=[('no_exp_in', 'Not expense/income'), ('no_header', 'No header'),
                                                       ('valid', 'Valid'), ('invalid', 'Invalid'), ('invalid_small_amount', 'Invalid')],
                                            string='Expense/income line status'),  # UFTP-103
+        'is_balanced': fields.related('model_id', 'is_balanced', type='boolean', string='Is balanced', readonly=True, store=False),
     }
 
     _defaults = {
@@ -253,6 +254,75 @@
                     break
         return res
 
+    def _get_model_state(self, cr, uid, ids, name, args, context=None):
+        """
+        A model is:
+        - in Done state if it is used in a least one Done Recurring Plan,
+        - in Running state if it is used in a least one Running Recurring Plan,
+        - in Draft state otherwise.
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = {}
+        recurring_plan_obj = self.pool.get('account.subscription')
+        for model_id in ids:
+            if recurring_plan_obj.search_exist(cr, uid, [('model_id', '=', model_id), ('state', '=', 'done')], context=context):
+                state = 'done'
+            elif recurring_plan_obj.search_exist(cr, uid, [('model_id', '=', model_id), ('state', '=', 'running')], context=context):
+                state = 'running'
+            else:
+                state = 'draft'
+            res[model_id] = state
+        return res
+
+    def _get_models_to_check(self, cr, uid, recurring_plan_ids, context=None):
+        """
+        Returns the list of Recurring Models for which the state should be checked and updated if necessary
+        """
+        if context is None:
+            context = {}
+        res = set()
+        recurring_plan_obj = self.pool.get('account.subscription')
+        for rec_plan in recurring_plan_obj.browse(cr, uid, recurring_plan_ids, fields_to_fetch=['model_id'], context=context):
+            res.add(rec_plan.model_id.id)
+        return list(res)
+
+    def unlink(self, cr, uid, ids, context=None):
+        """
+        Prevents deletion in case the model has been selected into a Recurring Plan
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        recurring_plan_obj = self.pool.get('account.subscription')
+        recurring_plan_ids = recurring_plan_obj.search(cr, uid, [('model_id', 'in', ids)], context=context)
+        if recurring_plan_ids:
+            plan_names = [p.name for p in recurring_plan_obj.browse(cr, uid, recurring_plan_ids, fields_to_fetch=['name'], context=context)]
+            raise osv.except_osv(_('Warning'), _('You cannot delete a model which is used in the following plan(s): %s') %
+                                 (', '.join(plan_names),))
+        return super(account_model, self).unlink(cr, uid, ids, context=context)
+
+    def _get_is_balanced(self, cr, uid, ids, name, arg, context=None):
+        """
+        Returns True for the models for which the total of the lines is zero
+        """
+        if context is None:
+            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = {}
+        for model in self.browse(cr, uid, ids, fields_to_fetch=['lines_id'], context=context):
+            debit = sum([l.debit or 0.0 for l in model.lines_id]) or 0.0
+            credit = sum([l.credit or 0.0 for l in model.lines_id]) or 0.0
+            if abs(debit - credit) <= 10**-3:
+                res[model.id] = True
+            else:
+                res[model.id] = False
+        return res
+
     _columns = {
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
         'analytic_distribution_id': fields.many2one('analytic.distribution', 'Analytic Distribution'),
@@ -260,13 +330,38 @@
                                                       method=True, type='boolean',
                                                       string='Has bad analytic distribution on expense/income lines',
                                                       help='There is lines with expense or income accounts with invalid analytic distribution or using header AD that is not defined or not compatible.'),  # UFTP-103
+        'state': fields.function(_get_model_state, method=True, type='selection', string="State",
+                                 selection=[('draft', 'Draft'), ('running', 'Running'), ('done', 'Done')],
+                                 store={
+                                     'account.subscription': (_get_models_to_check, ['model_id', 'state'], 10),
+                                 }),
+        'is_balanced': fields.function(_get_is_balanced, method=True, type='boolean', string="Is balanced", readonly=True, store=False),
+        'create_date': fields.date('Creation date', readonly=True),  # overwrites the standard create_date so it can be displayed in the views
+        'recurring_plan_ids': fields.one2many('account.subscription', 'model_id', string='Recurring Plans', readonly=True),
     }
 
     _defaults = {
         'currency_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id,
         'has_any_bad_ad_line_exp_in': False,
+        'state': lambda *a: 'draft',
     }
 
+    _order = 'create_date DESC, id DESC'
+
+    def _check_model_name_unicity(self, cr, uid, ids, context=None):
+        """
+        Prevents having 2 models using the same name
+        """
+        for model in self.read(cr, uid, ids, ['name']):
+            if self.search_exist(cr, uid, [('name', '=', model['name']), ('id', '!=', model['id'])]):
+                raise osv.except_osv(_('Error'),
+                                     _('It is not possible to have several Recurring Models with the same name: %s.') % model['name'])
+        return True
+
+    _constraints = [
+        (_check_model_name_unicity, 'It is not possible to have several Recurring Models with the same name.', ['name']),
+    ]
+
     # @@@[e-mail]_model.generate()
     def generate(self, cr, uid, ids, datas={}, context=None):
         move_ids = []
@@ -275,6 +370,7 @@
         account_move_line_obj = self.pool.get('account.move.line')
         pt_obj = self.pool.get('account.payment.term')
         ana_obj = self.pool.get('analytic.distribution')
+        period_obj = self.pool.get('account.period')
 
         if context is None:
             context = {}
@@ -282,13 +378,15 @@
         if datas.get('date', False):
             context.update({'date': datas['date']})
 
-        period_id = self.pool.get('account.period').find(cr, uid, dt=context.get('date', False))
-        if not period_id:
+        period_domain = [('date_start', '<=', context.get('date')), ('date_stop', '>=', context.get('date')), ('special', '=', False)]
+        period_ids = period_obj.search(cr, uid, period_domain, context=context)
+
+        if not period_ids:
             raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
-        period_id = period_id[0]
+        period_id = period_ids[0]
         # UFTP-105: Check that period is open. Otherwise raise an error
-        period = self.pool.get('account.period').browse(cr, uid, period_id, context=context)
-        if not period or period.state != 'draft':
+        period = period_obj.browse(cr, uid, period_id, fields_to_fetch=['state', 'name'], context=context)
+        if period.state != 'draft':
             raise osv.except_osv(_('Warning'), _('This period should be in open state: %s') % (period.name))
 
         for model in self.browse(cr, uid, ids, context=context):
@@ -315,8 +413,9 @@
             except Exception:
                 raise osv.except_osv(_('Error'), _('The name of the Recurring Model used is incorrect: %s\n'
                                                    'You can find a list of the formatted strings usable on the Recurring Model form.') % model.name)
+            ref = datas.get('ref', '') or entry['name']
             move_id = account_move_obj.create(cr, uid, {
-                'ref': entry['name'],
+                'ref': ref,
                 'period_id': period_id,
                 'journal_id': model.journal_id.id,
                 'date': context.get('date',time.strftime('%Y-%m-%d'))
@@ -327,10 +426,11 @@
                     'move_id': move_id,
                     'journal_id': model.journal_id.id,
                     'period_id': period_id,
+                    'reference': ref,
                 }
                 if line.account_id.is_analytic_addicted:
                     if line.analytic_distribution_state == 'invalid':
-                        raise osv.except_osv(_('Invalid Analytic Distribution !'),_("Please define a valid analytic distribution for the recurring model '%s'!") % (line.name))
+                        raise osv.except_osv(_('Invalid Analytic Distribution !'),_("Please define a valid analytic distribution for the recurring model '%s'!") % (line.model_id.name))
                     if not model.journal_id.analytic_journal_id:
                         raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (model.journal_id.name,))
                     if line.analytic_distribution_id:
@@ -438,5 +538,23 @@
         recurring_obj.write(cr, uid, to_reset, {'analytic_distribution_id': False})
         return True
 
+    def copy(self, cr, uid, model_id, default=None, context=None):
+        """
+        Recurring Model duplication: don't copy the link with the rec. plans, and add " (copy)" after the name
+        """
+        if context is None:
+            context = {}
+        suffix = ' (copy)'
+        model_copied = self.read(cr, uid, model_id, ['name'], context=context)
+        name = '%s%s' % (model_copied['name'][:64 - len(suffix)], suffix)
+        if default is None:
+            default = {}
+        default.update({
+            'name': name,
+            'recurring_plan_ids': [],
+        })
+        return super(account_model, self).copy(cr, uid, model_id, default, context=context)
+
+
 account_model()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'bin/addons/account_subscription/account_model_view.xml'
--- bin/addons/account_subscription/account_model_view.xml	2020-01-22 10:35:39 +0000
+++ bin/addons/account_subscription/account_model_view.xml	2020-08-07 12:54:52 +0000
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="account.view_model_form"/>
             <field name="arch" type="xml">
                 <form string="Journal Entry Model" position="replace">
-                    <form string="Journal Entry Model">
+                    <form string="Recurring Models">
                        <group><html>
                             <p id="para_has_any_bad_ad_line_exp_in"
                             style="display:none; text-align:center; color: red; font-weight: bold; font-size: 1.2em;">
@@ -24,19 +24,38 @@
                         </script>
                         </html></group>
                         <group col="6" colspan="4">
-                            <field name="name"/>
-                            <field name="journal_id" domain="[('type','=','purchase'),('is_current_instance','=',True)]"/>
-                            <field name="currency_id"/>
+                            <group attrs="{'readonly': [('state', '=', 'done')]}" colspan="6" col="6">
+                                <field name="name"/>
+                                <field name="journal_id" domain="[('type', '=', 'purchase'), ('is_current_instance', '=', True)]"/>
+                                <field name="currency_id"/>
+                            </group>
                             <group colspan="6" col="6" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}">
                                 <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-check" context="context" colspan="3" attrs="{'invisible': [('analytic_distribution_id', '=', False)]}"/>
-                                <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="3"/>
+                                <button name="button_reset_distribution" string="Reset AD at line level" type="object"
+                                        icon="gtk-undelete" colspan="3" attrs="{'invisible': [('state', '=', 'done')]}"/>
                             </group>
                             <group colspan="6" col="6" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}">
                                 <button name="button_analytic_distribution" string="Analytical Distribution" type="object" icon="terp-emblem-important" context="context" colspan="3" attrs="{'invisible': [('analytic_distribution_id', '!=', False)]}"/>
-                                <button name="button_reset_distribution" string="Reset AD at line level" type="object" icon="gtk-undelete" colspan="3"/>
+                                <button name="button_reset_distribution" string="Reset AD at line level" type="object"
+                                        icon="gtk-undelete" colspan="3" attrs="{'invisible': [('state', '=', 'done')]}"/>
                             </group>
                             <field name="analytic_distribution_id" invisible="1"/>
-                            <field colspan="6" nolabel="1" name="lines_id" widget="one2many_list"/>
+                            <notebook colspan="4">
+                                <page string="Model">
+                                    <field nolabel="1" name="lines_id" widget="one2many_list" colspan="4"
+                                           attrs="{'readonly': [('state', '=', 'done')]}"/>
+                                </page>
+                                <page string="Related plans">
+                                    <field nolabel="1" name="recurring_plan_ids" colspan="4">
+                                        <tree>
+                                            <field name="name" string="Plan names"/>
+                                            <field name="state" string="Plan status"/>
+                                        </tree>
+                                    </field>
+                                </page>
+                            </notebook>
+                            <label string="" colspan="4"/>
+                            <field name="state" readonly="1"/>
                             <separator colspan="6" string="Legend (for the Model Name)"/>
                             <group col="8" colspan="6">
                                 <group>
@@ -91,7 +110,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Journal Entry Model Line" editable="bottom"
-                    colors="red: exp_in_ad_state in ('no_header', 'bad_header', 'invalid', 'invalid_small_amount')">
+                      colors="red: exp_in_ad_state in ('no_header', 'bad_header', 'invalid', 'invalid_small_amount');blue:not is_balanced and exp_in_ad_state not in ('no_header', 'bad_header', 'invalid', 'invalid_small_amount')">
+                    <field name="is_balanced" invisible="1"/>
                     <field name="sequence" readonly="1"/>
                     <field name="name"/>
                     <field name="account_id" domain="[('restricted_area', '=', 'recurring_lines')]"/>
@@ -101,8 +121,8 @@
                     <field name="analytic_distribution_state" invisible="1"/>
                     <field name="is_allocatable" invisible="1"/>
                     <field name="partner_id"/>
-                    <field name="debit"/>
-                    <field name="credit"/>
+                    <field name="debit" sum="Total Debit"/>
+                    <field name="credit" sum="Total Credit"/>
                     <field name="exp_in_ad_state" invisible="1"/>
                 </tree>
             </field>
@@ -162,7 +182,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="14"/>
             <field name="arch" type="xml">
-                <tree string="Recurring Entries To Validate" min_rows="100"
+                <tree string="Recurring Entries To Post" min_rows="100"
                       hide_new_button="1" hide_delete_button="1" hide_edit_button="1"
                       colors="red:analytic_distribution_state not in ('valid')">
                     <field name="instance_id"/>
@@ -209,14 +229,47 @@
             </field>
         </record>
 
-        <act_window
-            id="act_account_subscription_to_account_move_line_open"
-            name="Recurring Entries To Validate"
-            domain="[('move_id.state','=','draft'), ('is_recurring', '=', True)]"
-            context="{'from_recurring_entries': True}"
-            res_model="account.move.line"
-            src_model="account.subscription"
-            view_id="account_move_line_recurring_entries_to_validate"/>
+        <!-- Recurring Entries To Post Search View -->
+        <record id="view_recurring_entries_to_post_search" model="ir.ui.view">
+            <field name="name">recurring.entries.to.post.search</field>
+            <field name="model">account.move.line</field>
+            <field name="type">search</field>
+            <field name="priority" eval="25"/>
+            <field name="arch" type="xml">
+                <search>
+                    <group colspan="6" col="14">
+                        <field name="move_id"/>
+                        <field name="name"/>
+                        <field name="ref"/>
+                        <field name="document_date"/>
+                        <field name="date"/>
+                        <field name="period_id" domain="[('special', '=', False), ('state', '=', 'draft')]"/>
+                        <field name="account_id" domain="[('restricted_area', '=', 'recurring_lines')]"/>
+                        <newline/>
+                        <!-- title matching with the tree view but only Partners are possible -->
+                        <field name="partner_id" string="Third Parties"/>
+                        <field name="debit_currency"/>
+                        <field name="credit_currency"/>
+                        <field name="currency_id"/>
+                        <field name="debit"/>
+                        <field name="credit"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <!-- Recurring Entries To Post Entry Menu -->
+        <record id="act_account_subscription_to_account_move_line_open" model="ir.actions.act_window">
+            <field name="name">Recurring Entries To Post</field>
+            <field name="res_model">account.move.line</field>
+            <field name="src_model">account.subscription</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="account_move_line_recurring_entries_to_validate"/>
+            <field name="context">{'from_recurring_entries': True}</field>
+            <field name="domain">[('move_id.state', '=', 'draft'), ('is_recurring', '=', True)]</field>
+            <field name="search_view_id" ref="view_recurring_entries_to_post_search"/>
+        </record>
 
     </data>
 </openerp>

=== removed file 'bin/addons/account_subscription/account_subscription.py'
=== modified file 'bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py'
--- bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2020-02-21 15:15:49 +0000
+++ bin/addons/analytic_distribution/wizard/analytic_distribution_wizard.py	2020-08-07 12:54:52 +0000
@@ -549,6 +549,11 @@
                 if not context.get('from_correction', False) and \
                         el.move_id.state and el.move_id.state not in ['draft']:
                     res[el.id] = False
+            # check Recurring Model state
+            if el.model_id and el.model_id.state == 'done':
+                res[el.id] = False
+            if el.model_line_id and el.model_line_id.model_id.state == 'done':
+                res[el.id] = False
         return res
 
     def _have_header(self, cr, uid, ids, name, args, context=None):

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2020-08-04 08:00:56 +0000
+++ bin/addons/msf_profile/data/patches.xml	2020-08-07 12:54:52 +0000
@@ -577,9 +577,16 @@
             <field name="method">us_7412_set_fy_closure_settings</field>
         </record>
 
+<<<<<<< TREE
         <record id="us_6453_set_ref_on_in" model="patch.scripts">
             <field name="method">us_6453_set_ref_on_in</field>
         </record>
 
+=======
+        <record id="us_5216_update_recurring_object_state" model="patch.scripts">
+            <field name="method">us_5216_update_recurring_object_state</field>
+        </record>
+
+>>>>>>> MERGE-SOURCE
     </data>
 </openerp>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-08-04 08:46:20 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-08-07 12:54:52 +0000
@@ -8436,7 +8436,7 @@
 msgid "Either there are no moves linked to the picking or Accounting Journals are misconfigured!"
 msgstr "Soit les Journaux Comptables sont mal configurés, soit il n'y a pas de mouvement connexe à ce prélèvement !"
 
-#. modules: tender_flow, financing_contract, msf_tools, account_override, purchase_allocation_report, register_accounting, mission_stock, msf_accrual, finance, sync_client, return_claim, account_mcdb, res_currency_tables, supplier_catalogue, procurement_request, stock_forecast, analytic, stock_override, msf_doc_import, analytic_distribution, msf_order_date, msf_homere_interface, consumption_calculation, msf_instance, purchase_override, specific_rules, kit, out_step, base, msf_supply_doc_export, msf_budget, account_corrections, account, msf_outgoing, documents_done, sale, sales_followup, procurement, sourcing, purchase, msf_audittrail, stock, product, procurement_cycle
+#. modules: tender_flow, financing_contract, msf_tools, account_override, purchase_allocation_report, register_accounting, mission_stock, msf_accrual, finance, sync_client, return_claim, account_mcdb, res_currency_tables, supplier_catalogue, procurement_request, stock_forecast, analytic, stock_override, msf_doc_import, analytic_distribution, msf_order_date, msf_homere_interface, consumption_calculation, msf_instance, purchase_override, specific_rules, kit, out_step, base, msf_supply_doc_export, msf_budget, account_corrections, account, msf_outgoing, documents_done, sale, sales_followup, procurement, sourcing, purchase, msf_audittrail, stock, product, procurement_cycle, account_subscription
 #: code:addons/msf_supply_doc_export/wizard/po_follow_up.py:106
 #: selection:msf.instance.cloud,state:0
 #: field:ppl.processor,draft_step2:0
@@ -8609,6 +8609,8 @@
 #: selection:replenishment.segment,state:0
 #: view:product.stock_out:0
 #: selection:product.stock_out,state:0
+#: selection:account.model,state:0
+#: view:account.model:0
 #, python-format
 msgid "Draft"
 msgstr "Brouillon"
@@ -10058,11 +10060,6 @@
 msgid "Funding pools:"
 msgstr "Funding pools:"
 
-#. module: account
-#: view:account.subscription:0
-msgid "Entry Subscription"
-msgstr "Ecriture de souscription"
-
 #. modules: account, account_period_closing_level
 #: model:ir.actions.act_window,help:account.action_account_period_tree
 #: model:ir.actions.act_window,help:account_period_closing_level.action_account_period_closing_level_tree
@@ -13614,9 +13611,10 @@
 msgid "Invoice Control"
 msgstr "Contrôle Facture"
 
-#. module: account
+#. modules: account, account_subscription
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
+#: view:account.model:0
 msgid "Recurring Models"
 msgstr "Modèles périodiques"
 
@@ -20777,12 +20775,11 @@
 msgid "Etc/GMT-11"
 msgstr "Etc/GMT-11"
 
-#. modules: sales_followup, msf_tools, account
+#. modules: sales_followup, msf_tools
 #: selection:ir.followup.location.wizard,state:0
 #: selection:job.in_progress,state:0
-#: view:account.subscription:0
 msgid "Done"
-msgstr "Cloturé"
+msgstr "Clôturé"
 
 #. module: delivery_mechanism
 #: code:addons/delivery_mechanism/delivery_mechanism.py:360
@@ -23927,7 +23924,7 @@
 #. module: account
 #: field:account.subscription,period_nbr:0
 msgid "Repeat"
-msgstr "Repeat"
+msgstr "Périodicité"
 
 #. module: sourcing
 #: code:addons/sourcing/sale_order_line.py:905
@@ -30362,8 +30359,8 @@
 
 #. module: account
 #: view:account.subscription.generate:0
-msgid "Automatically generate entries based on what has been entered in the  system before a specific date."
-msgstr "Génère automatiquement des écritures en se basant sur ce qui a été enregistré dans le système avant une date spécifique"
+msgid "Automatically generate entries based on what has been entered in the system until a specific date."
+msgstr "Génère automatiquement des écritures en se basant sur ce qui a été enregistré dans le système jusqu'à une date spécifique."
 
 #. module: base
 #: model:res.currency,currency_name:base.DZD
@@ -33535,11 +33532,6 @@
 msgid "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr "utilisé dans le domaine du lettrage de relevés, mais ne devrait pas être utilisé ailleurs"
 
-#. module: account
-#: view:account.subscription:0
-msgid "Draft Subscription"
-msgstr "Draft Subscription"
-
 #. module: base
 #: view:partner.wizard.ean.check:0
 msgid "Correct EAN13"
@@ -38135,11 +38127,6 @@
 msgid "Reservation Destination"
 msgstr "Destination de la Réservation"
 
-#. module: account
-#: view:account.subscription:0
-msgid "Remove Lines"
-msgstr "Supprimer des lignes"
-
 #. module: base
 #: help:ir.cron,function:0
 msgid "Name of the method to be called on the object when this scheduler is executed."
@@ -38308,7 +38295,7 @@
 #: code:addons/account/wizard/account_subscription_generate.py:52
 #, python-format
 msgid "The Recurring Model %s must have at least two lines."
-msgstr "Le Modèle Récurrent %s doit au moins avoir deux lignes."
+msgstr "Le Modèle Périodique %s doit avoir au moins deux lignes."
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/msf_import_export.py:103
@@ -38581,7 +38568,7 @@
 msgid "Is inactive for destination given in context"
 msgstr "Is inactive for destination given in context"
 
-#. modules: sales_followup, account, documents_done, consumption_calculation, sale, specific_rules, transport_mgmt, account_override, purchase_allocation_report, product_list, tender_flow, msf_doc_import, stock, product_attributes, purchase_override, purchase
+#. modules: sales_followup, account, documents_done, consumption_calculation, sale, specific_rules, transport_mgmt, account_override, purchase_allocation_report, product_list, tender_flow, msf_doc_import, stock, product_attributes, purchase_override, purchase, account_subscription
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 #: report:allocation.invoices.report:0
@@ -38608,6 +38595,7 @@
 #: field:internal.request.import,in_creation_date:0
 #: field:purchase.order.line,create_date:0
 #: field:internal.request.import,in_creation_date:0
+#: field:account.model,create_date:0
 #, python-format
 msgid "Creation date"
 msgstr "Date de création"
@@ -39212,7 +39200,7 @@
 msgid "RfQs"
 msgstr "DdD"
 
-#. modules: account, sync_client, product_asset, base, msf_audittrail, board, object_query, msf_profile, msf_field_access_rights, msf_button_access_rights,msf_tools
+#. modules: account, sync_client, product_asset, base, msf_audittrail, board, object_query, msf_profile, msf_field_access_rights, msf_button_access_rights, msf_tools, account_subscription
 #: field:account.model.line,model_id:0
 #: view:account.subscription:0
 #: field:account.subscription,model_id:0
@@ -39241,6 +39229,7 @@
 #: field:automated.import.function,model_id:0
 #: field:sync.client.log_sale_purchase,model:0
 #: field:sync.client.log_sale_purchase,model_id:0
+#: view:account.model:0
 msgid "Model"
 msgstr "Modèle"
 
@@ -43211,6 +43200,7 @@
 #. modules: account, finance
 #: view:account.move:0
 #: view:cash.request:0
+#: view:account.model.line:0
 msgid "Total Debit"
 msgstr "Total Débit"
 
@@ -44394,8 +44384,8 @@
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
-msgid "A recurring entry is a miscellaneous entry that occurs on a recurrent basis from a specific date, i.e. corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create such entries to automate the postings in the system."
-msgstr "Une écriture périodique est une écriture qui est configurée par le biais de la fonctionnalité Définir Ecritures Périodiques. Ceci vous permet d'enregistrer une écriture à partir d'une date spécifique. Cette écriture sera reproduite automatiquement dans votre comptabilité et à une fréquence définie. Vous pouvez utiliser cette fonctionnalité par exemple pour étaler la charge d'un loyer sur plusieurs mensualités. "
+msgid "A recurring entry is a miscellaneous entry that occurs on a recurrent basis from a specific date, i.e. corresponding to the signature of a contract or an agreement with a customer or a supplier. With Recurring Plan, you can create such entries to automate the postings in the system."
+msgstr "Une écriture périodique est une écriture qui est configurée par le biais de la fonctionnalité Plan d'Ecritures Périodiques. Ceci vous permet d'enregistrer une écriture à partir d'une date spécifique. Cette écriture sera reproduite automatiquement dans votre comptabilité et à une fréquence définie. Vous pouvez utiliser cette fonctionnalité par exemple pour étaler la charge d'un loyer sur plusieurs mensualités."
 
 #. modules: account, finance
 #: view:account.bank.statement:0
@@ -50461,11 +50451,6 @@
 msgid "Logs Sequence"
 msgstr "Journaux de bord - Sequence"
 
-#. module: account
-#: view:account.subscription:0
-msgid "Running Subscription"
-msgstr "Running Subscription"
-
 #. modules: base,  msf_currency_revaluation
 #: code:addons/msf_currency_revaluation/res_currency.py:40
 #: code:addons/base/res/res_currency.py:108
@@ -62609,8 +62594,8 @@
 #. module: account_subscription
 #: model:ir.actions.act_window,name:account_subscription.act_account_subscription_to_account_move_line_open
 #: view:account.move.line:0
-msgid "Recurring Entries To Validate"
-msgstr "Entrées récurrentes à valider"
+msgid "Recurring Entries To Post"
+msgstr "Lignes Périodiques à Poster"
 
 #. module: product
 #: view:product.product:0
@@ -62763,8 +62748,8 @@
 
 #. module: account
 #: view:account.subscription.generate:0
-msgid "Generate Entries before:"
-msgstr "Générer les Ecritures avant :"
+msgid "Generate Entries until:"
+msgstr "Générer les Ecritures jusqu'au :"
 
 #. modules: account, msf_instance
 #: field:account.invoice.refund,journal_id:0
@@ -65459,10 +65444,9 @@
 msgid "Supplier catalogue"
 msgstr "Catalogue du fournisseur"
 
-#. module: account_subscription
-#: code:addons/account_subscription/account_subscription.py:41
-#: code:addons/account_subscription/account_subscription.py:50
-#, python-format
+#. modules: account, account_subscription
+#: constraint:account.subscription:0
+#: constraint:account.subscription:0
 msgid "The value in the field \"Repeat\" must be greater than 0!"
 msgstr "La valeur dans le champ \"Périodicité\" doit être supérieure à 0 !"
 
@@ -66574,6 +66558,7 @@
 #. modules: account, finance
 #: view:account.move:0
 #: view:cash.request:0
+#: view:account.model.line:0
 msgid "Total Credit"
 msgstr "Total Crédit"
 
@@ -74124,14 +74109,8 @@
 #. module: account_period_closing_level
 #: code:addons/account_period_closing_level/account_period.py:236
 #, python-format
-msgid "Recurring entries included in the Period \"%s\" or before haven't been created. Please create them before closing the period."
-msgstr "Des Ecritures périodiques incluses dans la Période \"%s\" ou avant n'ont pas été créées. Veuillez les créer avant de clôturer la période."
-
-#. module: account_period_closing_level
-#: code:addons/account_period_closing_level/account_period.py:231
-#, python-format
-msgid "Subscription Lines included in the Period \"%s\" or before haven't been generated. Please generate them and create the related recurring entries before closing the period."
-msgstr "Des Lignes d'Abonnement incluses dans la Période \"%s\" ou avant n'ont pas été générées. Veuillez les générer et créer les écritures périodiques associées avant de clôturer la période."
+msgid "Recurring entries included in the Period \"%s\" or before haven't been created. Please generate them before closing the period."
+msgstr "Des Ecritures périodiques incluses dans la Période \"%s\" ou avant n'ont pas été créées. Veuillez les générer avant de clôturer la période."
 
 #. module: msf_field_access_rights
 #: view:msf_field_access_rights.field_access_rule:0
@@ -74940,9 +74919,11 @@
 msgstr "Line %s in your Excel file: %s: %s\n"
 ""
 
-#. module: account
+#. modules: account, account_subscription
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
+#: selection:account.model,state:0
+#: view:account.model:0
 msgid "Running"
 msgstr "En cours"
 
@@ -76426,7 +76407,7 @@
 #. module: account
 #: help:account.subscription,period_nbr:0
 msgid "This field will determine how often entries will be generated: if the period type is 'month' and the repeat '2' then entries will be generated every 2 months"
-msgstr "This field will determine how often entries will be generated: if the period type is 'month' and the repeat '2' then entries will be generated every 2 months"
+msgstr "Ce champ déterminera la fréquence à laquelle les écritures seront générées : si le type de période est 'mois' et la périodicité est '2', alors les écritures seront générées tous les 2 mois."
 
 #. module: sync_client
 #: selection:sync.client.log_sale_purchase,action_type:0
@@ -81523,7 +81504,7 @@
 msgid "Confirm the selected invoices"
 msgstr "Confirmer les factures sélectionnées"
 
-#. modules: purchase, res_currency_tables,tender_flow, sync_client, account_mcdb, sales_followup, supplier_catalogue, sale, account, stock_forecast, export_import_lang, purchase_followup, msf_supply_doc_export, specific_rules, analytic_distribution, useability_dashboard_and_menu, procurement_request, out_step, consumption_calculation, stock_override, process, account_reconciliation, msf_instance, purchase_override, account_hq_entries, purchase_allocation_report, msf_tools, vertical_integration, msf_outgoing, register_accounting, documents_done, transport_mgmt, analytic, msf_audittrail, msf_doc_import, stock, msf_budget, msf_homere_interface, kit, hr, finance, financing_contract, update_client, account_override, base, return_claim, procurement, procurement_cycle
+#. modules: purchase, res_currency_tables,tender_flow, sync_client, account_mcdb, sales_followup, supplier_catalogue, sale, account, stock_forecast, export_import_lang, purchase_followup, msf_supply_doc_export, specific_rules, analytic_distribution, useability_dashboard_and_menu, procurement_request, out_step, consumption_calculation, stock_override, process, account_reconciliation, msf_instance, purchase_override, account_hq_entries, purchase_allocation_report, msf_tools, vertical_integration, msf_outgoing, register_accounting, documents_done, transport_mgmt, analytic, msf_audittrail, msf_doc_import, stock, msf_budget, msf_homere_interface, kit, hr, finance, financing_contract, update_client, account_override, base, return_claim, procurement, procurement_cycle, account_subscription
 #: view:account.bank.statement:0
 #: field:account.bank.statement,state:0
 #: field:account.entries.report,move_state:0
@@ -81735,6 +81716,7 @@
 #: field:account.invoice.import,state:0
 #: report:addons/procurement_cycle/report/product_stock_out.mako:436
 #: field:product.stock_out,state:0
+#: field:account.model,state:0
 #, python-format
 msgid "State"
 msgstr "Statut"
@@ -82770,10 +82752,9 @@
 msgid "Select a supplier"
 msgstr "Sélectionner un fournisseur"
 
-#. modules: delivery_mechanism, msf_budget, account, msf_outgoing, msf_homere_interface, sync_client, register_accounting, specific_rules, sale, sales_followup, base, stock, tender_flow, msf_tools, return_claim, msf_doc_import, analytic_distribution, finance, product
+#. modules: delivery_mechanism, msf_budget, account, msf_outgoing, msf_homere_interface, sync_client, register_accounting, specific_rules, sale, sales_followup, base, stock, tender_flow, msf_tools, return_claim, msf_doc_import, analytic_distribution, finance, product, account_subscription
 #: selection:account.invoice.report,state:0
 #: selection:account.journal.period,state:0
-#: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 #: view:account.commitment:0
 #: selection:account.commitment,state:0
@@ -82838,6 +82819,10 @@
 #: selection:wizard.import.product.line,state:0
 #: selection:product.mass.update,state:0
 #: selection:account.invoice.import,state:0
+#: view:account.subscription:0
+#: view:account.model:0
+#: selection:account.model,state:0
+#: selection:account.subscription,state:0
 #, python-format
 msgid "Done"
 msgstr "Terminé"
@@ -85076,7 +85061,7 @@
 #: code:addons/account_subscription/account_model.py:306
 #, python-format
 msgid "Please define a valid analytic distribution for the recurring model '%s'!"
-msgstr "Please define a valid analytic distribution for the recurring model '%s'!"
+msgstr "Veuillez définir une distribution analytique valide pour le modèle périodique '%s' !"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_donation_stock_moves
@@ -85148,11 +85133,6 @@
 msgid "Qty Balance"
 msgstr "Bilan des Qtés"
 
-#. module: account
-#: model:ir.actions.act_window,name:account.action_subscription_form
-msgid "Recurring Lines"
-msgstr "Lignes périodiques"
-
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/account.py:54
 #, python-format
@@ -93378,7 +93358,7 @@
 msgid "Additional Information"
 msgstr "Information Complémentaire"
 
-#. modules: account, register_accounting, account_mcdb, msf_homere_interface, msf_audittrail, account_corrections
+#. modules: account, register_accounting, account_mcdb, msf_homere_interface, msf_audittrail, account_corrections, account_subscription
 #: report:combined.journals.report.pdf:0
 #: report:addons/account_mcdb/report/combined_journals_report.mako:226
 #: field:hr.payroll.msf,partner_type:0
@@ -93396,6 +93376,7 @@
 #: selection:account.journal.column,field:0
 #: field:account.bank.statement.line,partner_type2:0
 #: report:addons/register_accounting/report/fully_report_xls.mako:563
+#: view:account.move.line:0
 msgid "Third Parties"
 msgstr "Tiers"
 
@@ -94298,8 +94279,15 @@
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
-msgid "Define Recurring Entries"
-msgstr "Définir des Ecritures Périodiques"
+#: model:ir.actions.act_window,name:account.action_subscription_form
+#: view:account.subscription:0
+msgid "Recurring Plan"
+msgstr "Plan d'Ecritures Périodiques"
+
+#. module: account_subscription
+#: field:account.model,recurring_plan_ids:0
+msgid "Recurring Plans"
+msgstr "Plans d'Ecritures Périodiques"
 
 #. module: msf_doc_import
 #: code:addons/msf_doc_import/wizard/wizard_po_simulation_screen.py:628
@@ -110353,6 +110341,68 @@
 msgid "IN-line %s Wrong BN/ED attributes"
 msgstr "Ligne du IN %s: Mauvais attributs NL/DE"
 
+#. module: account
+#: code:addons/account/account.py:2475
+#, python-format
+msgid "You cannot delete a Recurring Plan if Subscription lines have already been computed."
+msgstr "Vous ne pouvez pas supprimer un Plan d'Ecritures Périodiques si les lignes d'Abonnement ont déjà été calculées."
+
+#. module: account
+#: field:account.subscription,frozen_model:0
+msgid "Frozen model"
+msgstr "Modèle figé"
+
+#. module: account_subscription
+#: code:addons/account_subscription/account_model.py:303
+#, python-format
+msgid "You cannot delete a model which is used in the following plan(s): %s"
+msgstr "Vous ne pouvez pas supprimer un modèle qui est utilisé dans le(s) plan(s) suivant(s) : %s"
+
+#. modules: account, account_subscription
+#: constraint:account.model:0
+#: constraint:account.model:0
+msgid "It is not possible to have several Recurring Models with the same name."
+msgstr "Il n'est pas possible d'avoir plusieurs Modèles périodiques portant le même nom."
+
+#. module: account_subscription
+#: code:addons/account_subscription/account_model.py:358
+#, python-format
+msgid "It is not possible to have several Recurring Models with the same name: %s."
+msgstr "Il n'est pas possible d'avoir plusieurs Modèles périodiques portant le même nom : %s."
+
+#. modules: account, account_subscription
+#: constraint:account.subscription:0
+#: constraint:account.subscription:0
+msgid "It is not possible to have several Recurring Plans with the same name."
+msgstr "Il n'est pas possible d'avoir plusieurs Plans d'Ecritures Périodiques portant le même nom."
+
+#. module: account
+#: code:addons/account/account.py:2423
+#, python-format
+msgid "It is not possible to have several Recurring Plans with the same name: %s."
+msgstr "Il n'est pas possible d'avoir plusieurs Plans d'Ecritures Périodiques portant le même nom : %s."
+
+#. module: account_subscription
+#: field:account.model,is_balanced:0
+#: field:account.model.line,is_balanced:0
+msgid "Is balanced"
+msgstr "Est équilibré"
+
+#. module: account_subscription
+#: view:account.model:0
+msgid "Plan names"
+msgstr "Nom des plans"
+
+#. module: account_subscription
+#: view:account.model:0
+msgid "Plan status"
+msgstr "Statut des plans"
+
+#. module: account_subscription
+#: view:account.model:0
+msgid "Related plans"
+msgstr "Plans associés"
+
 #. module: product
 #: view:product.product:0
 msgid "Merge product"
@@ -110363,9 +110413,18 @@
 #, python-format
 msgid "is dispatched."
 msgstr "est expédié."
+<<<<<<< TREE
 
 #. module: sale
 #: code:addons/sale/sale_workflow.py:584
 #, python-format
 msgid "You can not validate a line of a Regular FO with an Inter-section Customer if it was not created by sync."
 msgstr "Vous ne pouvez pas valider une ligne de CdT Normale qui a un Client Inter-section si elle n'a pas été créée par synchro."
+=======
+
+#. module: account
+#: code:addons/account/account.py:2441
+#, python-format
+msgid "You cannot duplicate a Recurring Plan with a Done model."
+msgstr "Vous ne pouvez pas dupliquer un Plan d'Ecritures Périodiques utilisant un modèle Terminé."
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2020-08-04 08:00:56 +0000
+++ bin/addons/msf_profile/msf_profile.py	2020-08-07 12:54:52 +0000
@@ -53,6 +53,66 @@
     }
 
     # UF18.0
+    def us_5216_update_recurring_object_state(self, cr, uid, *a, **b):
+        """
+        Updates the state of the Recurring Plans and Recurring Models with the new rules set in US-5216.
+        """
+        if not self.pool.get('sync.server.update'):
+            rec_plan_obj = self.pool.get('account.subscription')
+            rec_model_obj = self.pool.get('account.model')
+            # Recurring Plans
+            rec_plans = {
+                'draft': [],
+                'running': [],
+                'done': [],
+            }
+            rec_plan_ids = rec_plan_obj.search(cr, uid, [], order='NO_ORDER')
+            for rec_plan in rec_plan_obj.browse(cr, uid, rec_plan_ids, fields_to_fetch=['lines_id']):
+                if not rec_plan.lines_id:
+                    rec_plans['draft'].append(rec_plan.id)
+                else:
+                    running = False
+                    for sub_line in rec_plan.lines_id:
+                        if not sub_line.move_id or sub_line.move_id.state != 'posted':
+                            running = True
+                            break
+                    if running:
+                        rec_plans['running'].append(rec_plan.id)
+                    else:
+                        rec_plans['done'].append(rec_plan.id)
+            for plan_state in rec_plans:
+                if rec_plans[plan_state]:
+                    update_rec_plans = """
+                                       UPDATE account_subscription
+                                       SET state = %s
+                                       WHERE id IN %s;
+                                       """
+                    cr.execute(update_rec_plans, (plan_state, tuple(rec_plans[plan_state])))
+            # Recurring Models
+            rec_models = {
+                'draft': [],
+                'running': [],
+                'done': [],
+            }
+            rec_model_ids = rec_model_obj.search(cr, uid, [], order='NO_ORDER')
+            for model_id in rec_model_ids:
+                if rec_plan_obj.search_exist(cr, uid, [('model_id', '=', model_id), ('state', '=', 'done')]):
+                    state = 'done'
+                elif rec_plan_obj.search_exist(cr, uid, [('model_id', '=', model_id), ('state', '=', 'running')]):
+                    state = 'running'
+                else:
+                    state = 'draft'
+                rec_models[state].append(model_id)
+            for model_state in rec_models:
+                if rec_models[model_state]:
+                    update_rec_models = """
+                                        UPDATE account_model
+                                        SET state = %s
+                                        WHERE id IN %s;
+                                        """
+                    cr.execute(update_rec_models, (model_state, tuple(rec_models[model_state])))
+        return True
+
     def us_7412_set_fy_closure_settings(self, cr, uid, *a, **b):
         """
         Sets the Fiscal Year Closure options depending on the OC.

=== modified file 'bin/addons/msf_profile/usability.xml'
--- bin/addons/msf_profile/usability.xml	2012-11-06 14:18:56 +0000
+++ bin/addons/msf_profile/usability.xml	2020-08-07 12:54:52 +0000
@@ -7,7 +7,7 @@
         <!-- reorder existing ones -->
         <menuitem id="account.menu_finance_periodical_processing" name="Periodical Processing" parent="account.menu_finance" sequence="7" />
         <menuitem id="account.menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="8"/>
-        <menuitem name="Define Recurring Entries" action="account.action_subscription_form" id="account.menu_action_subscription_form" sequence="2" parent="account.menu_finance_recurrent_entries"/>
+        <menuitem name="Recurring Plan" action="account.action_subscription_form" id="account.menu_action_subscription_form" sequence="2" parent="account.menu_finance_recurrent_entries"/>
         <menuitem id="account.menu_finance_entries" name="Journal Entries" parent="account.menu_finance" sequence="10" />
         <menuitem id="account.menu_action_model_form" action="account.action_model_form" sequence="1" parent="account.menu_finance_recurrent_entries" />
         <menuitem id="account.menu_finance_accounting" name="Financial Accounting" parent="account.menu_finance_configuration" sequence="1"/>