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

[jftempo]

=== modified file 'bin/addons/account_mcdb/account_period_state.py'
--- bin/addons/account_mcdb/account_period_state.py	2016-02-08 08:37:05 +0000
+++ bin/addons/account_mcdb/account_period_state.py	2017-07-04 09:20:54 +0000
@@ -145,6 +145,55 @@
 
         return super(account_fiscalyear_state, self).create(cr, uid, vals, context=context)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        When the "FY HQ-closure" update is received via sync in coordo: if during FY mission-closure "Balance move to 0" lines
+        had been generated, the system will reconcile each of these lines together with the lines there have balanced
+        """
+        if not ids:
+            return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if context is None:
+            context = {}
+        aml_obj = self.pool.get('account.move.line')
+        year_end_closing_obj = self.pool.get('account.year.end.closing')
+        user_obj = self.pool.get('res.users')
+        journal_code = 'EOY'
+        period_number = 16
+        company_instance = user_obj.browse(cr, uid, [uid], fields_to_fetch=['company_id'], context=context)[0].company_id.instance_id
+        instance_ids = year_end_closing_obj._get_mission_ids_from_coordo(cr, uid, company_instance.id, context=context)
+        if context.get('sync_update_execution', False) and vals.get('state', False) == 'done' and company_instance.level == 'coordo':
+            sql = '''SELECT ml.id
+                     FROM account_move_line ml
+                     INNER JOIN account_move m ON m.id = ml.move_id
+                     WHERE ml.instance_id in %s
+                     AND ml.date >= %s AND ml.date <= %s AND m.period_id != %s
+                     AND ml.account_id = %s AND ml.currency_id = %s;
+                  '''
+            for fy_state_id in ids:
+                fy = self.browse(cr, uid, fy_state_id, fields_to_fetch=['fy_id'], context=context).fy_id
+                period_id = year_end_closing_obj._get_period_id(cr, uid, fy.id, period_number, context=context)
+                if not period_id:
+                    raise osv.except_osv(_('Error'), _("FY 'Period %d' not found") % (period_number,))
+                balance_line_domain = [('journal_id.code', '=', journal_code),
+                                       ('period_id.number', '=', period_number),
+                                       ('period_id.fiscalyear_id', '=', fy.id),
+                                       ('account_id.include_in_yearly_move', '=', True)]
+                balance_line_ids = aml_obj.search(cr, uid, balance_line_domain, context=context, order='NO_ORDER')
+                # get the entries balanced by each "Balance move to 0" line
+                for balance_line in aml_obj.browse(cr, uid, balance_line_ids,
+                                                   fields_to_fetch=['account_id', 'currency_id'], context=context):
+                    cr.execute(sql, (tuple(instance_ids), fy.date_start, fy.date_stop, period_id,
+                                     balance_line.account_id.id,  balance_line.currency_id.id,))
+                    aml_ids = map(lambda x: x[0], cr.fetchall())
+                    aml_ids.append(balance_line.id)
+                    # with 'fy_hq_closing' in context we don't check if the account is reconcilable
+                    # (but the check that no entry is already reconciled is kept)
+                    context['fy_hq_closing'] = True
+                    aml_obj.reconcile(cr, uid, aml_ids, context=context)
+        return super(account_fiscalyear_state, self).write(cr, uid, ids, vals, context=context)
+
     def get_fy(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         view_id = mod_obj.get_object_reference(cr, uid, 'account_mcdb',

=== modified file 'bin/addons/account_override/account.py'
--- bin/addons/account_override/account.py	2017-04-19 13:25:50 +0000
+++ bin/addons/account_override/account.py	2017-07-04 09:20:54 +0000
@@ -497,16 +497,49 @@
                 'has_partner_type_section' in vals and not vals['has_partner_type_section']:
             raise osv.except_osv(_('Warning !'), _('At least one Allowed Partner type must be selected.'))
 
+    def _check_reconcile_status(self, cr, uid, vals, account_id=None, context=None):
+        """
+        Prevent an account from being set as reconcilable if it is included in the yearly move to 0.
+        """
+        if context is None:
+            context = {}
+        reconcile = False
+        include_in_yearly_move = False
+        account = False
+        # if one of the fields to check isn't in vals, use its current value if it exists
+        if 'reconcile' in vals:
+            reconcile = vals['reconcile']
+        elif account_id is not None:
+            account = self.browse(cr, uid, account_id,
+                                  fields_to_fetch=['reconcile', 'include_in_yearly_move'], context=context)
+            reconcile = account.reconcile
+        if 'include_in_yearly_move' in vals:
+            include_in_yearly_move = vals['include_in_yearly_move']
+        elif account_id is not None:
+            account = account or self.browse(cr, uid, account_id,
+                                             fields_to_fetch=['include_in_yearly_move'], context=context)
+            include_in_yearly_move = account.include_in_yearly_move
+        if reconcile and include_in_yearly_move:
+            raise osv.except_osv(_('Warning !'),
+                                 _("An account can't be both reconcilable and included in the yearly move to 0."))
+
     def create(self, cr, uid, vals, context=None):
         self._check_date(vals)
         self._check_allowed_partner_type(vals)
+        self._check_reconcile_status(cr, uid, vals, context=context)
         return super(account_account, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         if not ids:
             return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if context is None:
+            context = {}
         self._check_date(vals)
         self._check_allowed_partner_type(vals)
+        for account_id in ids:
+            self._check_reconcile_status(cr, uid, vals, account_id=account_id, context=context)
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):

=== modified file 'bin/addons/account_period_closing_level/account_year_end_closing.py'
--- bin/addons/account_period_closing_level/account_year_end_closing.py	2016-07-06 10:23:25 +0000
+++ bin/addons/account_period_closing_level/account_year_end_closing.py	2017-07-04 09:20:54 +0000
@@ -400,14 +400,15 @@
         sql = '''select ml.account_id as account_id, max(a.code) as account_code,
             ml.currency_id as currency_id, max(c.name) as currency_code,
             (sum(ml.debit_currency) - sum(ml.credit_currency)) as balance_currency,
-            (sum(ml.debit) - sum(ml.credit)) as balance
+            (sum(ml.debit) - sum(ml.credit)) as balance,
+            ml.reconcile_id, ml.reconcile_partial_id
             from account_move_line ml
             inner join account_move m on m.id = ml.move_id
             inner join account_account a on a.id = ml.account_id
             inner join res_currency c on c.id = ml.currency_id
             where ml.instance_id in %s and a.include_in_yearly_move = 't'
             and ml.date >= %s and ml.date <= %s and m.period_id != %s
-            group by ml.account_id, ml.currency_id
+            group by ml.account_id, ml.currency_id, ml.reconcile_id, ml.reconcile_partial_id
         '''
         cr.execute(sql, (tuple(instance_ids), fy_rec.date_start,
             fy_rec.date_stop, period_id, ))
@@ -416,7 +417,11 @@
 
         je_by_acc_ccy = {}  # JE/ ACC/CCY, key: (acc_id, ccy_id), value: JE id
         for account_id, account_code, ccy_id, ccy_code, \
-            balance_currency, balance in cr.fetchall():
+            balance_currency, balance, reconcile_id, reconcile_partial_id in cr.fetchall():
+            if reconcile_id or reconcile_partial_id:
+                raise osv.except_osv(_('Warning'),
+                                     _("The yearly closure can't be processed due to one or several reconciled entries "
+                                       "that are included in the move to 0."))
             balance_currency = float(balance_currency)
             balance = float(balance)
 

=== modified file 'bin/addons/account_reconciliation/account_move_line.py'
--- bin/addons/account_reconciliation/account_move_line.py	2017-05-12 12:36:30 +0000
+++ bin/addons/account_reconciliation/account_move_line.py	2017-07-04 09:20:54 +0000
@@ -243,6 +243,7 @@
             account_id = line['account_id']['id']
             partner_id = (line['partner_id'] and line['partner_id']['id']) or False
         func_balance = func_debit - func_credit
+        book_balance = debit - credit
 
         cr.execute('SELECT account_id, reconcile_id '\
                    'FROM account_move_line '\
@@ -256,12 +257,18 @@
         if not unrec_lines:
             raise osv.except_osv(_('Error'), _('Entry is already reconciled'))
         account = account_obj.browse(cr, uid, account_id, context=context)
-        if not context.get('fy_closing', False) and not account.reconcile:
+        if not context.get('fy_closing', False) and not context.get('fy_hq_closing', False) and not account.reconcile:
             raise osv.except_osv(_('Error'), _('The account is not defined to be reconciled !'))
         if r[0][1] != None:
             raise osv.except_osv(_('Error'), _('Some entries are already reconciled !'))
 
-        if abs(func_balance) > 10**-3: # FIX UF-1903 problem
+        if context.get('fy_hq_closing', False):
+            if abs(func_balance) > 10**-3 or abs(book_balance) > 10**-3:
+                # yearly move to zero entries should be balanced in functional and booking currency
+                raise osv.except_osv(_('Error'),
+                                     _("The entries included in the yearly move to zero can't be reconciled together "
+                                       "because they are unbalanced."))
+        elif abs(func_balance) > 10**-3:  # FIX UF-1903 problem
             partner_line_id = self.create_addendum_line(cr, uid, [x.id for x in unrec_lines], func_balance)
             if partner_line_id:
                 # Add partner_line to do total reconciliation

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-06-12 15:48:51 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-07-04 09:20:54 +0000
@@ -71913,6 +71913,7 @@
 #: code:addons/unifield_setup/installer/project_leadtime.py:61
 #: code:addons/unifield_setup/installer/restrictive_country.py:138
 #: code:addons/unifield_setup/setup_configuration.py:110
+#: code:addons/account_mcdb/account_period_state.py:178
 #: view:allocation.stock.setup:0
 #: field:allocation.stock.setup,error_central_ok:0
 #: field:allocation.stock.setup,error_cross_ok:0
@@ -92566,12 +92567,13 @@
 msgid "Date start:"
 msgstr "Date start:"
 
-#. module: account_period_closing_level
+#. modules: account_period_closing_level, account_mcdb
 #: code:addons/account_period_closing_level/account_year_end_closing.py:393
 #: code:addons/account_period_closing_level/account_year_end_closing.py:533
+#: code:addons/account_mcdb/account_period_state.py:178
 #, python-format
 msgid "FY 'Period %d' not found"
-msgstr "FY 'Period %d' not found"
+msgstr "'Période %d' de l'année fiscale non trouvée"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
@@ -98688,3 +98690,21 @@
 #, python-format
 msgid "Warning, you have removed header value source location! The lines will be re-set to have 'Other Supplier' as the source location. Please check this is correct!"
 msgstr "Attention, vous avez supprimé la zone source d'en-tête! La zone source des lignes va être réinitialisée avec la valeur 'Autre Fournisseur'. Merci de vérifier leur cohérence!"
+
+#. module: account_override
+#: code:addons/account_override/account.py:524
+#, python-format
+msgid "An account can't be both reconcilable and included in the yearly move to 0."
+msgstr "Un compte ne peut pas être à la fois lettrable et inclus dans la mise à zéro annuelle."
+
+#. module: account_period_closing_level
+#: code:addons/account_period_closing_level/account_year_end_closing.py:423
+#, python-format
+msgid "The yearly closure can't be processed due to one or several reconciled entries that are included in the move to 0."
+msgstr "La fermeture de l'année fiscale ne peut pas être effectuée car une ou plusieurs écritures incluses dans la mise à zéro sont déjà lettrées."
+
+#. module: account_reconciliation
+#: code:addons/account_reconciliation/account_move_line.py:269
+#, python-format
+msgid "The entries included in the yearly move to zero can't be reconciled together because they are unbalanced."
+msgstr "Les écritures incluses dans la mise à zéro annuelle ne peuvent pas être lettrées ensemble car elles ne sont pas équilibrées."