Merge lp:~mukunde/unifield-server/8088 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/msf_import_export.py'
--- bin/addons/msf_doc_import/msf_import_export.py	2021-11-02 16:20:11 +0000
+++ bin/addons/msf_doc_import/msf_import_export.py	2022-04-28 16:07:53 +0000
@@ -843,7 +843,7 @@
                                     self._cache[dbname].setdefault('product.product.%s' % field, {})
                                     self._cache[dbname]['product.product.%s.%s' % (field, value)] = key
                                 break
-                if fields_def[field]['type'] == 'many2many':
+                if fields_def[field]['type'] == 'many2many' and field != 'fp_account_ids':
                     new_obj = self.pool.get(fields_def[field]['relation'])
                     ret = [(6, 0, [])]
                     for name in value.split(','):
@@ -964,8 +964,13 @@
                                 data[points[0]] = False
                             elif line_data[n]:
                                 data[points[0]] = _get_obj(h, line_data[n], fields_def) or False
-                        elif fields_def[points[0]]['type'] == 'many2many' and line_data[n]:
-                            data.setdefault(points[0], []).append((4, _get_obj(h, line_data[n], fields_def)))
+                        elif fields_def[points[0]]['type'] == 'many2many' and line_data[n] :
+                            if points[0] == 'fp_account_ids' :
+                                value = process_data(points[0], line_data[n], fields_def)
+                                if value is not None:
+                                    data[points[0]] = value
+                            else:
+                                data.setdefault(points[0], []).append((4, _get_obj(h, line_data[n], fields_def)))
 
                 if not line_ok:
                     rejected.append((row_index+1, line_data, ''))
@@ -1047,6 +1052,12 @@
                             raise Exception(_('The Parent Analytic Account must be a View type Funding Pool.'))
                     # Cost Centers
                     if data.get('cost_center_ids'):
+                        # Block the possibility to have both a list of Cost Centers and "Allow all Cost Centers" set to "True"
+                        if data.get('allow_all_cc_with_fp'):
+                            raise Exception(_('Import error for account "%s" : If listing Cost Centers, "Allow all Cost Centers" must be set to False.') % data.get('name'))
+                        else:
+                            # Listing "Cost Centers" unticks the box "Allow all Cost Centers" in the FP form
+                            data['allow_all_cc_with_fp'] = False
                         cc_list = []
                         for cost_center in data.get('cost_center_ids').split(','):
                             cc = cost_center.strip()
@@ -1062,6 +1073,12 @@
                         data['cost_center_ids'] = [(6, 0, [])]
                     # Account/Destination
                     if data.get('tuple_destination_account_ids'):
+                        # Block the possibility to have both "Accounts/Destinations" and "G/L Accounts
+                        if data.get('fp_account_ids'):
+                            raise Exception(_('Import error for account "%s" : Listing both Accounts/Destinations and G/L Accounts is not allowed') % data.get('name'))
+                        else:
+                            # Listing "Accounts/Destinations" unticks the box "Select Accounts Only" in the FP form
+                            data['select_accounts_only'] = False
                         dest_acc_list = []
                         for destination_account in data.get('tuple_destination_account_ids').split(','):
                             dest_acc_ids = []
@@ -1080,6 +1097,28 @@
                         data['tuple_destination_account_ids'] = [(6, 0, dest_acc_list)]
                     else:
                         data['tuple_destination_account_ids'] = [(6, 0, [])]
+                    # G/L Accounts
+                    if data.get('fp_account_ids'):
+                        gl_list = []
+                        # Block the possibility to have both "Accounts/Destinations" and "G/L Accounts
+                        if data.get('tuple_destination_account_ids')[0][2]:     # at this stage even though the dest/acc is empty, data['tuple_destination_account_ids'] is filled with (6, 0, [])
+                            raise Exception(_('Import error for account "%s" : Listing both Accounts/Destinations and G/L Accounts is not allowed') % data.get('name'))
+                        else:
+                            # Listing "G/L Accounts" ticks the box "Select Accounts Only" in the FP form
+                            data['select_accounts_only'] = True
+                        gl_iter = data.get('fp_account_ids').split(',')
+                        for name in gl_iter:
+                            name = name.strip()
+                            # Allow the same accounts as in the interface
+                            gl_dom = [('type', '!=', 'view'), ('is_analytic_addicted', '=', True), ('active', '=', 't'), ('code', '=', name), ('user_type_code', 'in', ['expense', 'income'])]
+                            gl_ids = acc_obj.search(cr, uid, gl_dom, limit=1, context=context)
+                            if gl_ids:
+                                gl_list.append(gl_ids[0])
+                            else:
+                                raise Exception(_('Import error for account "%s" : G/L Account "%s" not found or not of type Income or Expense') % (data.get('name'), name))
+                        data['fp_account_ids'] = [(6, 0, gl_list)]
+                    else:
+                        data['fp_account_ids'] = [(6, 0, [])]
 
                 # Destinations
                 dest_cc_tuple_list = []

=== modified file 'bin/addons/msf_doc_import/msf_import_export_conf.py'
--- bin/addons/msf_doc_import/msf_import_export_conf.py	2021-11-16 14:37:35 +0000
+++ bin/addons/msf_doc_import/msf_import_export_conf.py	2022-04-28 16:07:53 +0000
@@ -517,6 +517,8 @@
             'cost_center_ids',
             'tuple_destination_account_ids',
             'instance_id.code',
+            'allow_all_cc_with_fp',
+            'fp_account_ids',
         ],
         'required_field_list': [
             'name',

=== modified file 'bin/addons/msf_doc_import/report/import_generic_template.py'
--- bin/addons/msf_doc_import/report/import_generic_template.py	2019-05-24 15:09:28 +0000
+++ bin/addons/msf_doc_import/report/import_generic_template.py	2022-04-28 16:07:53 +0000
@@ -147,7 +147,7 @@
         new_ctx = context.copy()
         if 'lang' in MODEL_DICT.get(data['selection'], {}):
             new_ctx['lang'] = MODEL_DICT[data['selection']]['lang']
-        if data['selection'] == 'destinations':
+        if data['selection'] in ['destinations', 'funding_pools']:
             new_ctx['account_only_code'] = True
         for i in range(0, len(ids), chunk_size):
             ids_chunk = ids[i:i + chunk_size]

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2022-04-27 14:36:40 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2022-04-28 16:07:53 +0000
@@ -43433,8 +43433,12 @@
 #: field:replenishment.segment.line,product_id:0
 #: report:kitting.order.report:0
 #: code:addons/msf_doc_import/report/return_from_unit_export.py:118
+<<<<<<< TREE
 #: field:wizard.import.po.simulation.screen.line,in_product_code:0
 #: field:tender.line,product_default_code:0
+=======
+#: field:wizard.import.po.simulation.screen.line,in_product_code:0
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Product Code"
 msgstr "Code Produit"
@@ -43865,12 +43869,21 @@
 msgid "Update Instance"
 msgstr "Mise à jour Instance"
 
+<<<<<<< TREE
 #. modules: msf_doc_import, tender_flow, delete_button, sync_so, sales_followup
 #: constraint:tender:0
 #: constraint:tender:0
 #: constraint:tender:0
 #: constraint:tender:0
 #: constraint:tender.line:0
+=======
+#. modules: msf_doc_import, tender_flow, delete_button, sync_so
+#: constraint:tender:0
+#: constraint:tender:0
+#: constraint:tender:0
+#: constraint:tender:0
+#: constraint:tender.line:0
+>>>>>>> MERGE-SOURCE
 msgid "You cannot validate this tender because it contains a line with an inactive product"
 msgstr "Vous ne pouvez pas valider cet appel d'offre car il contient une ligne avec un produit inactif"
 
@@ -48996,10 +49009,16 @@
 #: selection:res.partner,transport_2:0
 #: selection:purchase.order,transport_type:0
 #: selection:shipment.add.pack.processor,transport_type:0
+<<<<<<< TREE
 #: selection:wizard.import.in.simulation.screen,transport_type:0
 #: selection:wizard.import.po.simulation.screen,imp_transport_type:0
 #: selection:wizard.import.po.simulation.screen,in_transport_type:0
 #: selection:international.transport.cost.report,transport_type:0
+=======
+#: selection:wizard.import.in.simulation.screen,transport_type:0
+#: selection:wizard.import.po.simulation.screen,imp_transport_type:0
+#: selection:wizard.import.po.simulation.screen,in_transport_type:0
+>>>>>>> MERGE-SOURCE
 msgid "Air"
 msgstr "Air"
 
@@ -90786,12 +90805,16 @@
 #: view:stock.move.cancel.more.wizard:0
 #: view:stock.picking.cancel.more.wizard:0
 #: view:product.ask.activate.wizard:0
+<<<<<<< TREE
 #: view:wizard.cancel.lines:0
 #: view:shipment.add.pack.processor:0
 #: view:po.follow.up:0
 #: view:supplier.performance.wizard:0
 #: view:wizard.pick.import:0
 #: view:stock.delivery.wizard:0
+=======
+#: view:wizard.cancel.lines:0
+>>>>>>> MERGE-SOURCE
 msgid "Actions"
 msgstr "Actions"
 
@@ -93283,8 +93306,13 @@
 msgid "Need Batch Number (Standard) not Expiry Date (Internal)"
 msgstr "Mention nécessaire d'un numéro de lot (Standard) mais pas d'une date d'expiration (Interne)"
 
+<<<<<<< TREE
 #. module: msf_outgoing, msf_doc_import,return_claim,kit,stock
+=======
+#. module: msf_outgoing, msf_doc_import
+>>>>>>> MERGE-SOURCE
 #: code:addons/msf_outgoing/__init__.py:43
+<<<<<<< TREE
 #: selection:assign.to.kit.line,integrity_status:0
 #: selection:kit.selection.line,integrity_status:0
 #: selection:kit.selection.sale.line,integrity_status:0
@@ -93298,6 +93326,9 @@
 #: selection:stock.move.processor,integrity_status:0
 #: selection:claim.product.line,integrity_status_claim_product_line:0
 #: selection:stock.move,integrity_error:0
+=======
+#: selection:wizard.import.in.line.simulation.screen,integrity_status:0
+>>>>>>> MERGE-SOURCE
 msgid "BN is linked to another product"
 msgstr "Ce lot est lié à un autre produit"
 
@@ -114589,6 +114620,7 @@
 msgid "Remove taxes on lines"
 msgstr "Supprimer les taxes des lignes"
 
+<<<<<<< TREE
 #. module: stock
 #: code:addons/stock/physical_inventory.py:1068
 #, python-format
@@ -114821,3 +114853,23 @@
 #, python-format
 msgid "There is already an Internal Partner with the name '%s'. The Intermission Partner could not be activated"
 msgstr "Il y a déjà un Partenaire Interne ayant le nom '%s'. Le Partenaire Intermission n'a pas pu être activé"
+=======
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:1113
+#, python-format
+msgid "Import error for account \"%s\" : G/L Account \"%s\" not found or not of type Income or Expense"
+msgstr "Erreur lors de l'import du compte \"%s\" : Le Compte Grand Livre \"%s\" n'a pas été trouvé ou n'est pas de type Compte de Produits ou Compte de Charge"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:1052
+#, python-format
+msgid "Import error for account \"%s\" : If listing Cost Centers, \"Allow all Cost Centers\" must be set to False."
+msgstr "Erreur lors de l'import du compte \"%s\" : Si vous listez les Centres de Coût, \"Autoriser tous les Centres de Coût\" doit être mis sur Faux"
+
+#. module: msf_doc_import
+#: code:addons/msf_doc_import/msf_import_export.py:1073
+#: code:addons/msf_doc_import/msf_import_export.py:1100
+#, python-format
+msgid "Import error for account \"%s\" : Listing both Accounts/Destinations and G/L Accounts is not allowed"
+msgstr "Erreur lors de l'import du compte \"%s\" : Lister à la fois les Comptes/Destinations et les Comptes Grand Livre n'est pas permis"
+>>>>>>> MERGE-SOURCE