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

[jftempo]

=== modified file 'bin/addons/account_override/invoice.py'
--- bin/addons/account_override/invoice.py	2018-08-06 13:07:33 +0000
+++ bin/addons/account_override/invoice.py	2018-10-22 13:50:56 +0000
@@ -27,6 +27,7 @@
 from time import strftime
 from tools.translate import _
 from lxml import etree
+from datetime import datetime
 import re
 import netsvc
 
@@ -264,6 +265,141 @@
         'is_merged_by_account': lambda *a: False,
     }
 
+    def import_data_web(self, cr, uid, fields, datas, mode='init', current_module='', noupdate=False, context=None, filename=None,
+                        display_all_errors=False, has_header=False):
+        """
+        Overrides the standard import_data_web method for account.invoice model:
+        - based on the 3 values for "cost_center_id / destination_id / funding_pool_id", creates a new AD at 100% for
+          each invoice line and add it to "datas"
+        - removes these 3 values that won't be used in the SI line
+        - adapts the "fields" list accordingly
+        - converts the dates from the format '%d/%m/%Y' to the standard one '%Y-%m-%d' so the checks on dates are correctly made
+        """
+        if context is None:
+            context = {}
+        new_data = datas
+        analytic_acc_obj = self.pool.get('account.analytic.account')
+        account_obj = self.pool.get('account.account')
+        analytic_distrib_obj = self.pool.get('analytic.distribution')
+        cc_distrib_line_obj = self.pool.get('cost.center.distribution.line')
+        fp_distrib_line_obj = self.pool.get('funding.pool.distribution.line')
+        curr_obj = self.pool.get('res.currency')
+        nb_ad_fields = 0
+        if 'invoice_line/cost_center_id' in fields:
+            nb_ad_fields += 1
+        if 'invoice_line/destination_id' in fields:
+            nb_ad_fields += 1
+        if 'invoice_line/funding_pool_id' in fields:
+            nb_ad_fields += 1
+        if nb_ad_fields:
+            if nb_ad_fields != 3:
+                raise osv.except_osv(_('Error'),
+                                     _('Either the Cost Center, the Destination, or the Funding Pool is missing.'))
+            # note: CC, dest and FP indexes always exist at this step
+            cc_index = fields.index('invoice_line/cost_center_id')
+            dest_index = fields.index('invoice_line/destination_id')
+            fp_index = fields.index('invoice_line/funding_pool_id')
+            si_line_name_index = 'invoice_line/name' in fields and fields.index('invoice_line/name')
+            si_journal_index = 'journal_id' in fields and fields.index('journal_id')
+            curr_index = 'currency_id' in fields and fields.index('currency_id')
+            account_index = 'invoice_line/account_id' in fields and fields.index('invoice_line/account_id')
+            doc_date_index = 'document_date' in fields and fields.index('document_date')
+            date_inv_index = 'date_invoice' in fields and fields.index('date_invoice')
+            new_data = []
+            curr = False
+            for data in datas:
+                cc_ids = []
+                dest_ids = []
+                fp_ids = []
+                distrib_id = ''
+                cc = len(data) > cc_index and data[cc_index].strip()
+                dest = len(data) > dest_index and data[dest_index].strip()
+                fp = len(data) > fp_index and data[fp_index].strip()
+                # check if details for SI line are filled in (based on the required field "name")
+                has_si_line = si_line_name_index is not False and len(data) > si_line_name_index and data[si_line_name_index].strip()
+                # process AD only for SI lines where at least one AD field has been filled in
+                # (otherwise no AD should be added to the line AND no error should be displayed)
+                if has_si_line and (cc or dest or fp):  # at least one AD field has been filled in
+                    if cc:
+                        cc_dom = [('category', '=', 'OC'), ('type', '=', 'normal'), '|', ('code', '=ilike', cc), ('name', '=ilike', cc)]
+                        cc_ids = analytic_acc_obj.search(cr, uid, cc_dom, order='id', limit=1, context=context)
+                    if dest:
+                        dest_dom = [('category', '=', 'DEST'), ('type', '=', 'normal'), '|', ('code', '=ilike', dest), ('name', '=ilike', dest)]
+                        dest_ids = analytic_acc_obj.search(cr, uid, dest_dom, order='id', limit=1, context=context)
+                    if fp:
+                        fp_dom = [('category', '=', 'FUNDING'), ('type', '=', 'normal'), '|', ('code', '=ilike', fp), ('name', '=ilike', fp)]
+                        fp_ids = analytic_acc_obj.search(cr, uid, fp_dom, order='id', limit=1, context=context)
+                    if not cc_ids or not dest_ids or not fp_ids:
+                        raise osv.except_osv(_('Error'), _('Either the Cost Center, the Destination, or the Funding Pool '
+                                                           'was not found on the line %s.') % data)
+                    else:
+                        # create the Analytic Distribution
+                        distrib_id = analytic_distrib_obj.create(cr, uid, {}, context=context)
+                        # get the next currency to use IF NEED BE (cf for an SI with several lines the curr. is indicated on the first one only)
+                        si_journal = si_journal_index is not False and len(data) > si_journal_index and data[si_journal_index].strip()
+                        if si_journal:  # first line of the SI
+                            curr = curr_index is not False and len(data) > curr_index and data[curr_index].strip()
+                        curr_ids = []
+                        if curr:  # must exist at least on the first imported line
+                            curr_ids = curr_obj.search(cr, uid, [('name', '=ilike', curr)], limit=1, context=context)
+                        if not curr_ids:
+                            raise osv.except_osv(_('Error'),
+                                                 _('The currency was not found for the line %s.') % data)
+                        vals = {
+                            'analytic_id': cc_ids[0],  # analytic_id = Cost Center for the CC distrib line
+                            'percentage': 100.0,
+                            'distribution_id': distrib_id,
+                            'currency_id': curr_ids[0],
+                            'destination_id': dest_ids[0],
+                        }
+                        cc_distrib_line_obj.create(cr, uid, vals, context=context)
+                        vals.update({
+                            'analytic_id': fp_ids[0],  # analytic_id = Funding Pool for the FP distrib line
+                            'cost_center_id': cc_ids[0],
+                            })
+                        fp_distrib_line_obj.create(cr, uid, vals, context=context)
+                        account_code = account_index is not False and len(data) > account_index and data[account_index].strip()
+                        if account_code:
+                            account_ids = account_obj.search(cr, uid, [('code', '=', account_code)], context=context, limit=1)
+                            if not account_ids:
+                                raise osv.except_osv(_('Error'), _('The account %s was not found on the line %s.') % (account_code, data))
+                            parent_id = False  # no distrib. at header level
+                            distrib_state = analytic_distrib_obj._get_distribution_state(cr, uid, distrib_id, parent_id,
+                                                                                         account_ids[0], context=context)
+                            if distrib_state == 'invalid':
+                                raise osv.except_osv(_('Error'), _('The analytic distribution is invalid on the line %s.') % data)
+                # create a new list with the new distrib id and without the old AD fields
+                # to be done also if no AD to ensure the size of each data list is always the same
+                i = 0
+                new_sub_list = []
+                for d in data:  # loop on each value of the file line
+                    if i not in [cc_index, dest_index, fp_index]:
+                        if doc_date_index is not False and date_inv_index is not False and i in [doc_date_index, date_inv_index]:
+                            # format the date from '%d/%m/%Y' to '%Y-%m-%d' so the checks on dates are correctly made
+                            raw_date = len(data) > i and data[i].strip()
+                            try:
+                                new_date = raw_date and datetime.strptime(raw_date, '%d/%m/%Y').strftime('%Y-%m-%d') or ''
+                            except ValueError:
+                                new_date = raw_date
+                            new_sub_list.append(new_date)
+                        else:
+                            new_sub_list.append(d)
+                    i += 1
+                # add new field value
+                new_sub_list.append(distrib_id)
+                new_data.append(new_sub_list)
+
+            # remove old field names from fields
+            fields.remove('invoice_line/cost_center_id')
+            fields.remove('invoice_line/destination_id')
+            fields.remove('invoice_line/funding_pool_id')
+            # add new field
+            fields.append('invoice_line/analytic_distribution_id/.id')  # .id = id in the database
+
+        return super(account_invoice, self).import_data_web(cr, uid, fields, new_data, mode=mode, current_module=current_module,
+                                                            noupdate=noupdate, context=context, filename=filename,
+                                                            display_all_errors=display_all_errors, has_header=has_header)
+
     def onchange_company_id(self, cr, uid, ids, company_id, part_id, ctype, invoice_line, currency_id):
         """
         This is a method to redefine the journal_id domain with the current_instance taken into account
@@ -1529,6 +1665,15 @@
 
         return res
 
+    def _get_fake_m2o(self, cr, uid, ids, field_name=None, arg=None, context=None):
+        """
+        Returns False for all ids
+        """
+        res = {}
+        for i in ids:
+            res[i] = False
+        return res
+
     _columns = {
         'line_number': fields.integer(string='Line Number'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account Computation')),
@@ -1543,6 +1688,18 @@
         'reversed_invoice_line_id': fields.many2one('account.invoice.line', string='Reversed Invoice Line',
                                                     help='Invoice line that has been reversed by this one through a '
                                                          '"refund cancel" or "refund modify"'),
+        'cost_center_id': fields.function(_get_fake_m2o, method=True, type='many2one', store=False,
+                                          states={'draft': [('readonly', False)]},  # see def detect_data in unifield-web/addons/openerp/controllers/impex.py
+                                          relation="account.analytic.account", string='Cost Center',
+                                          help="Field used for import only"),
+        'destination_id': fields.function(_get_fake_m2o, method=True, type='many2one', store=False,
+                                          relation="account.analytic.account", string='Destination',
+                                          states={'draft': [('readonly', False)]},
+                                          help="Field used for import only"),
+        'funding_pool_id': fields.function(_get_fake_m2o, method=True, type='many2one', store=False,
+                                           relation="account.analytic.account", string='Funding Pool',
+                                           states={'draft': [('readonly', False)]},
+                                           help="Field used for import only"),
     }
 
     _defaults = {

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2018-10-17 09:42:30 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2018-10-22 13:50:56 +0000
@@ -38394,6 +38394,7 @@
 #: field:hr.analytic.reallocation,funding_pool_id:0
 #: field:hr.employee,funding_pool_id:0
 #: field:hr.payroll.msf,funding_pool_id:0
+#: field:account.invoice.line,funding_pool_id:0
 #: report:addons/account/report/free_allocation_report.mako:208
 #, python-format
 msgid "Funding Pool"
@@ -81948,6 +81949,7 @@
 #: report:addons/sale/report/fo_allocation_report.mako:231
 #: report:sale.order.allocation.report:0
 #: field:purchase.report,cost_center_id:0
+#: field:account.invoice.line,cost_center_id:0
 #: code:addons/register_accounting/wizard/wizard_register_import.py:570
 #: report:addons/account/report/free_allocation_report.mako:205
 #, python-format
@@ -96141,6 +96143,7 @@
 #: field:purchase.order.line.allocation.report,destination_id:0
 #: code:addons/register_accounting/wizard/wizard_register_import.py:558
 #: field:wizard.register.import.lines,destination_id:0
+#: field:account.invoice.line,destination_id:0
 #: report:addons/sale/report/fo_allocation_report.mako:228
 #: report:sale.order.allocation.report:0
 #: field:sale.order.line.cancel,partner_id:0
@@ -101952,6 +101955,7 @@
 #: field:account.commitment.line,commit_number:0
 msgid "Commitment Voucher Number"
 msgstr "Numéro du Bon d'Engagement"
+<<<<<<< TREE
 
 #. module: account_mcdb
 #: code:addons/account_mcdb/account_mcdb.py:1494
@@ -101975,3 +101979,42 @@
 #: code:addons/account_mcdb/account_mcdb.py:1276
 msgid "Related entries"
 msgstr "Ecritures associées"
+=======
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:339
+#, python-format
+msgid "The currency was not found for the line %s."
+msgstr "La devise n'a pas été trouvée pour la ligne %s."
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:293
+#, python-format
+msgid "Either the Cost Center, the Destination, or the Funding Pool is missing."
+msgstr "Il manque le Centre de Coût, la Destination, ou le Funding Pool."
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:325
+#, python-format
+msgid "Either the Cost Center, the Destination, or the Funding Pool was not found on the line %s."
+msgstr "Le Centre de Coût, la Destination, ou le Funding Pool n'a pas été trouvé sur la ligne %s."
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:365
+#, python-format
+msgid "The account %s was not found on the line %s."
+msgstr "Le compte %s n'a pas été trouvé sur la ligne %s."
+
+#. module: account_override
+#: code:addons/account_override/invoice.py:370
+#, python-format
+msgid "The analytic distribution is invalid on the line %s."
+msgstr "La distribution analytique est invalide sur la ligne %s."
+
+#. module: account_override
+#: help:account.invoice.line,cost_center_id:0
+#: help:account.invoice.line,destination_id:0
+#: help:account.invoice.line,funding_pool_id:0
+msgid "Field used for import only"
+msgstr "Champ utilisé pour l'import uniquement"
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2018-08-14 14:10:58 +0000
+++ bin/osv/orm.py	2018-10-22 13:50:56 +0000
@@ -1122,6 +1122,16 @@
             self._parent_store_compute(cr)
         return (position, 0, 0, 0)
 
+    def import_data_web(self, cr, uid, fields, datas, mode='init', current_module='', noupdate=False, context=None,
+                        filename=None, display_all_errors=False, has_header=False):
+        """
+        Import data method called at import from web ONLY (contrary to the import_data method also used for sync msgs).
+        Call import_data by default but can be overridden if needed.
+        """
+        return super(orm, self).import_data(cr, uid, fields, datas, mode=mode, current_module=current_module,
+                                            noupdate=noupdate, context=context, filename=filename,
+                                            display_all_errors=display_all_errors, has_header=has_header)
+
     def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
         """
         Read records with given ids with the given fields