Merge lp:~mukunde/unifield-server/US-12645 into lp:unifield-server

[jftempo]

[lp:~mukunde/unifield-server/US-12645]

6250. By Gaël Mukunde on 2024-05-10

US-12440 [IMP] Add caches for frequently searched objects that may be the same across rows

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2024-05-02 13:19:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2024-05-10 12:38:34 +0000
@@ -5905,6 +5905,7 @@
 #: field:wizard.temp.posting.line,name:0
 #: field:product.template,name:0
 #: field:product.asset.type,description:0
+#: field:product.asset.import.entries.errors,name:0
 #, python-format
 msgid "Description"
 msgstr "Description"
@@ -8671,7 +8672,7 @@
 msgid "The currency used to enter statement"
 msgstr "Devise utilisée pour entrer les relevés"
 
-#. modules: register_accounting, account_hq_entries, msf_homere_interface, msf_doc_import, account
+#. modules: register_accounting, account_hq_entries, msf_homere_interface, msf_doc_import, account, product_asset
 #: field:msf.doc.import.accounting,filename:0
 #: field:hq.entries.import,filename:0
 #: field:hr.expat.employee.import,filename:0
@@ -8682,6 +8683,7 @@
 #: field:account.invoice.import,filename:0
 #: field:account.cv.import,filename:0
 #: field:esc.line.import,filename:0
+#: field:product.asset.import.entries,filename:0
 msgid "Imported filename"
 msgstr "Nom du fichier importé"
 
@@ -10156,8 +10158,9 @@
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
 msgstr "  par exemple : 1 x (cette unité) = ratio x (unité de référence)"
 
-#. module: msf_doc_import
+#. module: msf_doc_import, product_asset
 #: view:msf.doc.import.accounting:0
+#: view:product.asset.import.entries:0
 msgid "Import template"
 msgstr "Import template"
 
@@ -15467,6 +15470,7 @@
 #: code:addons/consumption_calculation/history_consumption.py:719
 #: field:msf_button_access_rights.button_access_rule,bar_type:0
 #: report:addons/account/report/export_cv.mako:137
+#: field:product.asset.import.entries.lines,type:0
 msgid "Type"
 msgstr "Type"
 
@@ -19935,7 +19939,7 @@
 msgid "Some entries are already reconciled !"
 msgstr "Certaines écritures sont déjà lettrées !"
 
-#. modules: msf_doc_import, register_accounting, consumption_calculation, account, account_hq_entries
+#. modules: msf_doc_import, register_accounting, consumption_calculation, account, account_hq_entries, product_asset
 #: field:weekly.forecast.report,progress:0
 #: field:abstract.wizard.import,progression:0
 #: field:msf.doc.import.accounting,progression:0
@@ -19946,6 +19950,7 @@
 #: field:hq.entries.import,progress:0
 #: field:account.cv.import,progression:0
 #: field:esc.line.import,progress:0
+#: field:product.asset.import.entries,progression:0
 msgid "Progression"
 msgstr "Progression"
 
@@ -20824,6 +20829,7 @@
 #: selection:product.asset,state:0
 #: selection:product.asset.event,asset_state:0
 #: selection:signature.follow_up,doc_state:0
+#: selection:product.asset.import.entries,state:0
 msgid "Done"
 msgstr "Clôturé"
 
@@ -30182,7 +30188,7 @@
 msgid "Operator '%s' not suported"
 msgstr "Operator '%s' not suported"
 
-#. modules: register_accounting, account_mcdb, msf_homere_interface, financing_contract, procurement_request, consumption_calculation, sync_client, msf_config_locations, stock_forecast, base, msf_currency_revaluation, specific_rules, msf_doc_import, stock, analytic_distribution, account, purchase, product
+#. modules: register_accounting, account_mcdb, msf_homere_interface, financing_contract, procurement_request, consumption_calculation, sync_client, msf_config_locations, stock_forecast, base, msf_currency_revaluation, specific_rules, msf_doc_import, stock, analytic_distribution, account, purchase, product, product_asset
 #: view:account.line.csv.export:0
 #: field:account.line.csv.export,message:0
 #: field:import.commitment.wizard,last_error:0
@@ -30239,6 +30245,7 @@
 #: field:product.mass.update,message:0
 #: field:account.cv.import,message:0
 #: field:message.action,message:0
+#: field:product.asset.import.entries,message:0
 msgid "Message"
 msgstr "Message"
 
@@ -37138,6 +37145,7 @@
 #: view:product.asset.type:0
 #: field:product.template,asset_type_id:0
 #: field:product.asset.useful.life,asset_type_id:0
+#: field:product.asset.import.entries.lines,asset_type_id:0
 msgid "Asset Type"
 msgstr "Type d'Immobilisation"
 
@@ -38123,6 +38131,7 @@
 #: view:account.move.line:0
 #: field:wizard.account.invoice.line,move_lines:0
 #: field:product.asset,move_line_id:0
+#: field:product.asset.import.entries.lines,move_line_id:0
 msgid "Journal Item"
 msgstr "Ligne d'écriture comptable"
 
@@ -39127,6 +39136,7 @@
 #: field:sale.report,year:0
 #: view:report.stock.move:0
 #: field:report.stock.move,year:0
+#: field:product.asset.import.entries.lines,year:0
 msgid "Year"
 msgstr "Année"
 
@@ -39271,6 +39281,7 @@
 #: field:sync.client.log_sale_purchase,model_id:0
 #: view:account.model:0
 #: field:signature,signature_res_model:0
+#: field:product.asset.import.entries.lines,model:0
 msgid "Model"
 msgstr "Modèle"
 
@@ -39703,6 +39714,7 @@
 #: report:product.asset:0
 #: field:product.asset,serial_nb:0
 #: field:product.asset.event,serial_nb:0
+#: field:product.asset.import.entries.lines,serial_nb:0
 msgid "Serial Number"
 msgstr "Numéro de Série"
 
@@ -41160,6 +41172,7 @@
 #: report:product.asset:0
 #: field:product.asset,brand:0
 #: field:product.asset.event,brand:0
+#: field:product.asset.import.entries.lines,brand:0
 msgid "Brand"
 msgstr "Marque"
 
@@ -41995,7 +42008,7 @@
 msgid "Contract code/name:"
 msgstr "Contrat - Code/Nom:"
 
-#. modules: sales_followup, register_accounting, import_data, sync_client, base, purchase_followup, msf_doc_import, stock, product, account, account_hq_entries
+#. modules: sales_followup, register_accounting, import_data, sync_client, base, purchase_followup, msf_doc_import, stock, product, account, account_hq_entries, product_asset
 #: view:base.module.update:0
 #: view:base.update.translations:0
 #: selection:import_data,import_mode:0
@@ -42026,6 +42039,7 @@
 #: view:hq.entries.import:0
 #: view:account.cv.import:0
 #: view:esc.line.import:0
+#: view:product.asset.import.entries:0
 msgid "Update"
 msgstr "Mettre à jour"
 
@@ -43460,6 +43474,7 @@
 #: field:unidata.project,msl_product_ids:0
 #: field:replenishment.product.list,l_default_code:0
 #: field:unifield.instance,msl_product_ids:0
+#: field:product.asset.import.entries.lines,prod_int_code:0
 #, python-format
 msgid "Product Code"
 msgstr "Code Produit"
@@ -45042,7 +45057,7 @@
 msgid "Output Out"
 msgstr "Modèles de Taxe"
 
-#. modules: stock_forecast, register_accounting, msf_outgoing, documents_done, unifield_setup, account_override, purchase_compare_rfq, base, stock, msf_profile, msf_doc_import, sale, account_hq_entries, res_currency_tables, account
+#. modules: stock_forecast, register_accounting, msf_outgoing, documents_done, unifield_setup, account_override, purchase_compare_rfq, base, stock, msf_profile, msf_doc_import, sale, account_hq_entries, res_currency_tables, account, product_asset
 #: field:wizard.split.invoice.lines,wizard_id:0
 #: view:ir.actions.wizard:0
 #: field:wizard.ir.model.menu.create.line,wizard_id:0
@@ -45076,6 +45091,8 @@
 #: field:wizard.hard.posting.line,wizard_id:0
 #: field:wizard.ignore.posting.line,wizard_id:0
 #: field:wizard.temp.posting.line,wizard_id:0
+#: field:product.asset.import.entries.errors,wizard_id:0
+#: field:product.asset.import.entries.lines,wizard_id:0
 msgid "Wizard"
 msgstr "Assistant"
 
@@ -68707,7 +68724,7 @@
 msgid "Kit Composition"
 msgstr "Kit - Composition"
 
-#. modules: register_accounting, msf_homere_interface, account_override, base, msf_doc_import, msf_profile, sync_client, msf_supply_doc_export, account
+#. modules: register_accounting, msf_homere_interface, account_override, base, msf_doc_import, msf_profile, sync_client, msf_supply_doc_export, account, product_asset
 #: view:ir.attachment:0
 #: view:ir.attachment:0
 #: selection:msf.doc.import.accounting,state:0
@@ -68722,6 +68739,7 @@
 #: code:addons/msf_supply_doc_export/msf_supply_doc_export.py:896
 #: selection:account.invoice.import,state:0
 #: selection:account.cv.import,state:0
+#: selection:product.asset.import.entries,state:0
 msgid "Created"
 msgstr "Créé"
 
@@ -72414,7 +72432,7 @@
 msgid "Expected Pack Date"
 msgstr "Date Prévue de Colisage"
 
-#. modules: tender_flow, analytic_distribution_supply, product_nomenclature, financing_contract, msf_tools, account_hq_entries, export_import_lang, account_override, procurement_cycle, account_journal, register_accounting, mission_stock, return_claim, sync_client, account_mcdb, res_currency_tables, supplier_catalogue, stock_schedule, procurement_request, spreadsheet_xml, unifield_setup, purchase_compare_rfq, stock_batch_recall, purchase_followup, stock_override, msf_doc_import, analytic_distribution, msf_order_date, msf_cross_docking, reason_types_moves, purchase_allocation_report, finance, msf_homere_interface, msf_instance, account_reconciliation, service_purchasing, consumption_calculation, purchase_override, specific_rules, kit, base, account_subscription, res_currency_functional, msf_budget, account_corrections, account, msf_outgoing, stock_move_tracking, msf_partner, product_attributes, order_nomenclature, documents_done, sale, msf_config_locations, sales_followup, sourcing, msf_custom_settings, product_list, object_query, stock, msf_profile, product, msf_supply_doc_export, purchase
+#. modules: tender_flow, analytic_distribution_supply, product_nomenclature, financing_contract, msf_tools, account_hq_entries, export_import_lang, account_override, procurement_cycle, account_journal, register_accounting, mission_stock, return_claim, sync_client, account_mcdb, res_currency_tables, supplier_catalogue, stock_schedule, procurement_request, spreadsheet_xml, unifield_setup, purchase_compare_rfq, stock_batch_recall, purchase_followup, stock_override, msf_doc_import, analytic_distribution, msf_order_date, msf_cross_docking, reason_types_moves, purchase_allocation_report, finance, msf_homere_interface, msf_instance, account_reconciliation, service_purchasing, consumption_calculation, purchase_override, specific_rules, kit, base, account_subscription, res_currency_functional, msf_budget, account_corrections, account, msf_outgoing, stock_move_tracking, msf_partner, product_attributes, order_nomenclature, documents_done, sale, msf_config_locations, sales_followup, sourcing, msf_custom_settings, product_list, object_query, stock, msf_profile, product, msf_supply_doc_export, purchase, product_asset
 #: code:addons/account/account.py:294
 #: code:addons/account/account.py:988
 #: code:addons/account/account.py:992
@@ -73589,6 +73607,7 @@
 #: selection:unidata.sync,last_msl_execution_status:0
 #: field:unidata.sync.log,error:0
 #: selection:unidata.sync.log,state:0
+#: selection:product.asset.import.entries,state:0
 #, python-format, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -74026,7 +74045,7 @@
 msgid "Do you want to update the Date of Stock Take of all/selected draft Order lines ?"
 msgstr "Voulez-vous mettre à jour la Date de Prise de Stock sur toutes les lignes brouillon de la Commande ou les lignes brouillon sélectionnées ?"
 
-#. modules: register_accounting, msf_homere_interface, documents_done, consumption_calculation, msf_button_access_rights, mission_stock, msf_doc_import, analytic_distribution, sourcing, sale, account, account_hq_entries
+#. modules: register_accounting, msf_homere_interface, documents_done, consumption_calculation, msf_button_access_rights, mission_stock, msf_doc_import, analytic_distribution, sourcing, sale, account, account_hq_entries, product_asset
 #: field:mass.reallocation.verification.wizard,error_ids:0
 #: field:monthly.review.consumption.line,text_error:0
 #: field:real.average.consumption.line,text_error:0
@@ -74047,6 +74066,7 @@
 #: field:hq.entries.import,nberrors:0
 #: field:account.cv.import,error_ids:0
 #: field:esc.line.import,nberrors:0
+#: field:product.asset.import.entries,error_ids:0
 #, python-format
 msgid "Errors"
 msgstr "Erreurs"
@@ -81079,7 +81099,7 @@
 msgid "Wizard lines for internal picking processor"
 msgstr "Wizard lines for internal picking processor"
 
-#. modules: vertical_integration, register_accounting, res_currency_tables, account_hq_entries, update_client, msf_tools, msf_doc_import, analytic_distribution, account, procurement_cycle
+#. modules: vertical_integration, register_accounting, res_currency_tables, account_hq_entries, update_client, msf_tools, msf_doc_import, analytic_distribution, account, procurement_cycle, product_asset
 #: view:hq.entries.import:0
 #: view:import.commitment.wizard:0
 #: view:msf.doc.import.accounting:0
@@ -81099,6 +81119,7 @@
 #: view:account.cv.import:0
 #: view:esc.line.import:0
 #: field:esc.line.import.rejected,wiz_id:0
+#: view:product.asset.import.entries:0
 msgid "Import"
 msgstr "Importer"
 
@@ -81809,6 +81830,7 @@
 #: report:delivery.order:0
 #: field:stock.move,ship_influenced_state:0
 #: field:product.asset,state:0
+#: field:product.asset.import.entries,state:0
 #, python-format
 msgid "State"
 msgstr "Statut"
@@ -82985,7 +83007,7 @@
 msgid "Computation"
 msgstr "Calcul"
 
-#. modules: register_accounting, msf_homere_interface, import_data, account_hq_entries, export_import_lang, base, msf_doc_import, mission_stock, analytic_distribution, account
+#. modules: register_accounting, msf_homere_interface, import_data, account_hq_entries, export_import_lang, base, msf_doc_import, mission_stock, analytic_distribution, account, product_asset
 #: field:int.commitment.export.wizard,data:0
 #: field:import_category,file:0
 #: field:import_nomenclature,file:0
@@ -83006,6 +83028,7 @@
 #: field:account.invoice.import,file:0
 #: field:account.cv.import,file:0
 #: field:esc.line.import,file:0
+#: field:product.asset.import.entries,file:0
 msgid "File"
 msgstr "Fichier"
 
@@ -83663,7 +83686,7 @@
 msgid "Sourced-n line"
 msgstr "Ligne sourcée-n"
 
-#. modules: analytic_distribution, sales_followup, register_accounting, reason_types_moves, msf_homere_interface, stock_override, consumption_calculation, sale, specific_rules, order_types, msf_tools, mission_stock, msf_doc_import, stock, product, acccount, msf_supply_doc_export, account
+#. modules: analytic_distribution, sales_followup, register_accounting, reason_types_moves, msf_homere_interface, stock_override, consumption_calculation, sale, specific_rules, order_types, msf_tools, mission_stock, msf_doc_import, stock, product, acccount, msf_supply_doc_export, account, product_asset
 #: field:import.commitment.wizard,in_progress:0
 #: view:product.history.consumption:0
 #: selection:product.history.consumption,fake_status:0
@@ -83713,6 +83736,7 @@
 #: selection:wizard.import.ad.line,state:0
 #: selection:supplier.performance.wizard,state:0
 #: selection:account.cv.import,state:0
+#: selection:product.asset.import.entries,state:0
 #, python-format
 msgid "In Progress"
 msgstr "En cours"
@@ -96645,6 +96669,7 @@
 #: selection:product.asset.event,asset_state:0
 #: view:product.asset.generate.entries:0
 #: view:journal.change.account:0
+#: view:product.asset.import.entries:0
 #, python-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -120983,6 +121008,7 @@
 #: field:product.asset,asset_bs_depreciation_account_id:0
 #: field:product.asset.line,asset_bs_depreciation_account_id:0
 #: field:product.category,asset_bs_depreciation_account_id:0
+#: field:product.asset.import.entries.lines,asset_bs_depreciation_account_id:0
 msgid "Asset B/S Depreciation Account"
 msgstr "Compte de bilan des amortissements"
 
@@ -121028,6 +121054,7 @@
 #. module: product_asset
 #: field:product.asset,asset_pl_account_id:0
 #: field:product.asset.line,asset_pl_account_id:0
+#: field:product.asset.import.entries.lines,asset_pl_account_id:0
 msgid "Asset P&L Depreciation Account"
 msgstr "Compte de résultat des amortissements"
 
@@ -121237,6 +121264,7 @@
 
 #. module: product_asset
 #: field:product.asset,useful_life_id:0
+#: field:product.asset.import.entries.lines,useful_life_id:0
 msgid "Useful Life"
 msgstr "Durée Amortissement"
 
@@ -121806,6 +121834,7 @@
 #, python-format
 msgid "This action can only be done on a Picking"
 msgstr "Cette action peut uniquement être faite sur un Picking"
+<<<<<<< TREE
 
 #. modules: purchase, sale
 #: code:addons/purchase/purchase_workflow.py:107
@@ -122096,3 +122125,175 @@
 msgid "No valid catalogue"
 msgstr "Aucun catalogue valide"
 
+=======
+
+#. module: product_asset
+#: field:product.asset,external_asset_id:0
+#: field:product.asset.import.entries.lines,external_asset_id:0
+msgid "External Asset ID"
+msgstr "Immobilisation - ID Externe"
+
+#. module: product_asset
+#: model:ir.model,name:product_asset.model_product_asset_import_entries_errors
+msgid "Asset Entries Import - Error List"
+msgstr "Import d'immobilisations - Liste des erreurs"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1462
+#, python-format
+msgid "Checking file..."
+msgstr "Vérification du fichier..."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1417
+#, python-format
+msgid "Cleaning up old imports..."
+msgstr "Nettoyage des anciens imports..."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1427
+#, python-format
+msgid "Copying file..."
+msgstr "Copie du fichier..."
+
+#. module: product_asset
+#: model:ir.actions.act_window,name:product_asset.action_product_asset_import_entries
+#: model:ir.model,name:product_asset.model_product_asset_import_entries
+#: model:ir.ui.menu,name:product_asset.menu_product_asset_import_entries
+#: view:product.asset.import.entries:0
+msgid "Import Asset Entries"
+msgstr "Import d'immobilisations"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1404
+#, python-format
+msgid "Initialization..."
+msgstr "Initialisation..."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1605
+#, python-format
+msgid "Line %s: A problem occurred for line registration. Please contact an Administrator."
+msgstr "Ligne %s: Un problème est survenu lors de l'enregistrement de la ligne. Veuillez contacter un administrateur."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1564
+#, python-format
+msgid "Line %s: Asset B/S Depreciation Account \"%s\" must have \"Regular\" as Internal Type and \"Asset\" as Account Type"
+msgstr "Ligne %s: Le compte de bilan des amortissements \"%s\" doit avoir \"Normal\" comme type interne et \"Immobilisation\" comme type de compte"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1560
+#, python-format
+msgid "Line %s: Asset B/S Depreciation Account \"%s\" not found!"
+msgstr "Ligne %s: Le compte de bilan des amortissements \"%s\" n'a pas été trouvé!"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1581
+#, python-format
+msgid "Line %s: Asset P&L Depreciation Account \"%s\" must have \"Expense\" or \"Income\" as Account Type"
+msgstr "Ligne %s: Le compte de résultat des amortissements \"%s\" doit avoir \"Dépenses\" ou \"Recettes\" comme type de compte"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1575
+#, python-format
+msgid "Line %s: Asset P&L Depreciation Account \"%s\" not found!"
+msgstr "Ligne %s: Le compte de résultat des amortissements \"%s\" n'a pas été trouvé!"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1507
+#, python-format
+msgid "Line %s: Asset Type \"%s\" not found!"
+msgstr "Ligne %s: Le type d'immobilisation \"%s\" n'a pas été trouvé!"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1535
+#, python-format
+msgid "Line %s: Journal Item \"%s\" not found!\n"
+"Please check if that JI exists or has the product specified"
+msgstr "Ligne %s: La ligne d'écriture comptable \"%s\" n'a pas été trouvé!\n"
+"Veuillez vérifiez si cette ligne d'écriture existe ou si elle contient le produit spécifié"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1501
+#, python-format
+msgid "Line %s: No Asset Type specified! (External Asset ID: %s, Serial Number: %s)"
+msgstr "Ligne %s: Pas de type d'immobilisation spécifié! (Immobilisation - ID Externe: %s, Numéro de série: %s)"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1488
+#, python-format
+msgid "Line %s: No Product Code specified! (External Asset ID: %s, Serial Number: %s)"
+msgstr "Ligne %s: Pas de code produit spécifié! (Immobilisation - ID Externe: %s, Numéro de série: %s)"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1515
+#, python-format
+msgid "Line %s: No Useful Life specified! (External Asset ID: %s, Serial Number: %s)"
+msgstr "Ligne %s: Pas de durée d'amortissement spécifiée! (Immobilisation - ID Externe: %s, Numéro de série: %s)"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1494
+#, python-format
+msgid "Line %s: Product Code \"%s\" not found!"
+msgstr "Ligne %s: Le code produit \"%s\" n'a pas été trouvé!"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1521
+#, python-format
+msgid "Line %s: The \"%s\" year(s) Useful Life of Asset Type \"%s\" not found!"
+msgstr "Ligne %s: La durée d'amortissement \"%s\" an(s) du Type d'Immobilisation \"%s\" n'a pas été trouvé!"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1547
+#, python-format
+msgid "Line %s: The Journal Entry \"%s\" has to be in \"posted\" state."
+msgstr "Ligne %s: L'écriture comptable \"%s\" doit être à l'état \"comptabilisé\"."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1550
+#, python-format
+msgid "Line %s: The account type of Journal Item \"%s\" has to be either Asset or Expense."
+msgstr "Ligne %s: Le type du compte de la ligne d'écriture comptable \"%s\" doit être soit Immobilisations soit Dépenses."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1544
+#, python-format
+msgid "Line %s: The debit of Journal Item \"%s\" has to be greater than 0."
+msgstr "Ligne %s: Le débit de la ligne d'écriture comptable \"%s\" doit être supérieur à 0."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1541
+#, python-format
+msgid "Line %s: The journal of Journal Item \"%s\" has to be of type Purchase, Correction HQ, HQ or Intermission!"
+msgstr "Ligne %s: Le journal de la ligne d'écriture comptable \"%s\" doit être de type Achat, Correction HQ, HQ ou Intermission!"
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1435
+#, python-format
+msgid "Processing line..."
+msgstr "Traitement de la ligne..."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1439
+#, python-format
+msgid "Reading headers..."
+msgstr "Lecture des entêtes..."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1457
+#, python-format
+msgid "Reading lines..."
+msgstr "Lecture des lignes..."
+
+#. module: product_asset
+#: view:product.asset.import.entries:0
+msgid "This will import Entries from an XML file."
+msgstr "Ceci va importer les entrées d'immobilisations' depuis un fichier XML."
+
+#. module: product_asset
+#: code:addons/product_asset/product_asset.py:1632
+#, python-format
+msgid "Writing changes..."
+msgstr "Écriture des modifications..."
+>>>>>>> MERGE-SOURCE

=== modified file 'bin/addons/product_asset/product_asset.py'
--- bin/addons/product_asset/product_asset.py	2023-11-16 13:03:16 +0000
+++ bin/addons/product_asset/product_asset.py	2024-05-10 12:38:34 +0000
@@ -6,6 +6,11 @@
 from tools import misc
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
+import threading
+import pooler
+from tempfile import NamedTemporaryFile
+from base64 import b64decode
+from spreadsheet_xml.spreadsheet_xml import SpreadsheetXML
 
 
 #----------------------------------------------------------
@@ -187,7 +192,31 @@
             'from_sync': False,
             'event_ids': [],
             'instance_id': False,
-            'invoice_id': False
+            'invoice_id': False,
+            'move_line_id': False,
+            'quantity_divisor': False,
+            'invo_value': False,
+            'invo_currency': False,
+            'invo_date': False,
+            'invo_supplier_id': False,
+            'invo_donator_code': False,
+            'invo_certif_depreciation': False,
+            'serial_nb': False,
+            'brand': False,
+            'type': False,
+            'model': False,
+            'year': False,
+            'project_po': False,
+            'orig_mission_code': False,
+            'international_po': False,
+            'arrival_date': False,
+            'receipt_place': False,
+            'comment': False,
+            'line_ids': [],
+            'depreciation_amount': False,
+            'disposal_amount': False,
+            'start_date': False,
+            'depreciation_method': False,
         })
         return super(product_asset, self).copy_data(cr, uid, id, default, context=context)
 
@@ -240,12 +269,12 @@
             vals['state'] = 'open'
 
         # fetch the product
-        if 'product_id' in vals:
+        if 'product_id' in vals and not context.get('from_import'):
             productId = vals['product_id']
             # add readonly fields to vals
             vals.update(self._getRelatedProductFields(cr, uid, productId, update_account=not from_sync))
 
-        if not from_sync and not vals.get('from_invoice') and 'move_line_id' in vals:
+        if not from_sync and not vals.get('from_invoice') and not context.get('from_import') and 'move_line_id' in vals:
             vals.update(self._getRelatedMoveLineFields(cr, uid, vals['move_line_id'], divisor=vals.get('quantity_divisor'), context=context))
 
         # UF-1617: set the current instance into the new object if it has not been sent from the sync
@@ -463,6 +492,7 @@
         'asset_type_id': fields.many2one('product.asset.type', 'Asset Type'), # from product
         'description': fields.char('Asset Description', size=128),
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade'),
+        'external_asset_id': fields.char('External Asset ID', size=32),
         # msf codification
         'prod_int_code': fields.char('Product Code', size=128, readonly=True), # from product
         'prod_int_name': fields.char('Product Description', size=128, readonly=True), # from product
@@ -484,13 +514,13 @@
         'arrival_date': fields.date('Arrival Date'), # required=True),
         'receipt_place': fields.char('Receipt Place', size=128), # required=True),
         # Invoice
-        'invo_date': fields.date('Invoice Date', required=True, readonly=1),
-        'invo_value': fields.float('Value', required=True, readonly=1),
+        'invo_date': fields.date('Invoice Date', readonly=1),
+        'invo_value': fields.float('Value', readonly=1),
         'invoice_id': fields.many2one('account.invoice', 'Invoice'),
-        'move_line_id': fields.many2one('account.move.line', 'Journal Item', domain="['&', '&', '&', ('journal_id.type', 'in', ['purchase', 'correction_hq', 'hq', 'intermission']), ('debit', '>', 0), ('move_id.state', '=', 'posted'), ('account_id.user_type_code', 'in', ['asset', 'expense'])]", required=1),
+        'move_line_id': fields.many2one('account.move.line', 'Journal Item', domain="['&', '&', '&', ('journal_id.type', 'in', ['purchase', 'correction_hq', 'hq', 'intermission']), ('debit', '>', 0), ('move_id.state', '=', 'posted'), ('account_id.user_type_code', 'in', ['asset', 'expense'])]"),
         'quantity_divisor': fields.integer_null('Divisor Quantity', help='This quantity will divide the total invoice value.'),
         'invoice_line_id': fields.many2one('account.invoice.line', 'Invoice Line'),
-        'invo_currency': fields.many2one('res.currency', 'Currency', required=True, readonly=1),
+        'invo_currency': fields.many2one('res.currency', 'Currency', readonly=1),
         'invo_supplier_id': fields.many2one('res.partner', 'Supplier', readonly=1),
         'invo_donator_code': fields.char('Donator Code', size=128),
         'invo_certif_depreciation': fields.char('Certificate of Depreciation', size=128),
@@ -505,7 +535,7 @@
         'asset_bs_depreciation_account_id': fields.many2one('account.account', 'Asset B/S Depreciation Account', domain=[('type', '=', 'other'), ('user_type_code', '=', 'asset')]),
         'asset_pl_account_id': fields.many2one('account.account', 'Asset P&L Depreciation Account', domain=[('user_type_code', 'in', ['expense', 'income'])]),
         'useful_life_id': fields.many2one('product.asset.useful.life', 'Useful Life', ondelete='restrict'),
-        'start_date': fields.date('Start Date', required=1),
+        'start_date': fields.date('Start Date'),
         'line_ids': fields.one2many('product.asset.line', 'asset_id', 'Depreciation Lines'),
         'analytic_distribution_id': fields.many2one('analytic.distribution', 'Analytic Distribution'),
         'depreciation_amount': fields.function(_get_book_value, string='Depreciation', type='float', method=True, help="Sum of all Asset journal item lines", multi='get_book', with_null=True),
@@ -516,7 +546,7 @@
         'can_be_disposed': fields.function(_get_can_be_disposed, string='Can be diposed', type='boolean', method=True),
         'instance_level': fields.function(_get_instance_level, string='Instance Level', type='char', method=True),
         'prorata': fields.boolean('Prorata Temporis'),
-        'depreciation_method': fields.selection([('straight', 'Straight Line')], 'Depreciation Method', required=True),
+        'depreciation_method': fields.selection([('straight', 'Straight Line')], 'Depreciation Method'),
         'period_id': fields.function(misc.get_fake, fnct_search=_search_period_id, method=True, type='many2one', relation='account.period', string='Start Period', domain=[('special', '=', False)]),
     }
 
@@ -1354,6 +1384,374 @@
 
 product_asset_generate_entries()
 
+
+class product_asset_import_entries(osv.osv_memory):
+    _name = 'product.asset.import.entries'
+    _description = 'Import Asset Entries'
+    _columns = {
+        'file': fields.binary(string="File", filters='*.xml, *.xls', required=True),
+        'filename': fields.char(string="Imported filename", size=256),
+        'progression': fields.float(string="Progression", readonly=True),
+        'message': fields.char(string="Message", size=256, readonly=True),
+        'state': fields.selection(
+            [('draft', 'Created'), ('inprogress', 'In Progress'), ('error', 'Error'), ('done', 'Done')], string="State",
+            readonly=True, required=True),
+        'error_ids': fields.one2many('product.asset.import.entries.errors', 'wizard_id', "Errors", readonly=True),
+    }
+    _defaults = {
+        'progression': lambda *a: 0.0,
+        'state': lambda *a: 'draft',
+        'message': lambda *a: _('Initialization...'),
+    }
+
+    def _import(self, dbname, uid, ids, context=None):
+        if context is None:
+            context = {}
+        cr = pooler.get_db(dbname).cursor()
+        created = 0
+        processed = 0
+        errors = []
+        current_line_num = None
+        acc_cache = {}
+        prod_cache = {}
+        asset_type_cache = {}
+        use_life_cache = {}
+        try:
+            # Update wizard
+            self.write(cr, uid, ids, {'message': _('Cleaning up old imports...'), 'progression': 1.00})
+            # Clean up old temporary imported lines
+            old_lines_ids = self.pool.get('product.asset.import.entries.lines').search(cr, uid, [])
+            self.pool.get('product.asset.import.entries.lines').unlink(cr, uid, old_lines_ids)
+
+            for wiz in self.browse(cr, uid, ids):
+                # Check that a file was given
+                if not wiz.file:
+                    raise osv.except_osv(_('Error'), _('Nothing to import.'))
+                # Update wizard
+                self.write(cr, uid, [wiz.id], {'message': _('Copying file...'), 'progression': 2.00})
+                fileobj = NamedTemporaryFile('w+b', delete=False)
+                fileobj.write(b64decode(wiz.file))
+                fileobj.close()
+                content = SpreadsheetXML(xmlfile=fileobj.name, context=context)
+                if not content:
+                    raise osv.except_osv(_('Warning'), _('No content'))
+                # Update wizard
+                self.write(cr, uid, [wiz.id], {'message': _('Processing line...'), 'progression': 4.00})
+                rows = content.getRows()
+                nb_rows = len([x for x in content.getRows()])
+                # Update wizard
+                self.write(cr, uid, [wiz.id], {'message': _('Reading headers...'), 'progression': 5.00})
+                # Use the first row to find which column to use
+                cols = {}
+                col_names = ['External Asset ID', 'Product Code', 'Asset Type', 'Useful Life', 'Serial Number', 'Brand',
+                             'Type', 'Model', 'Year', 'Journal Item', 'Asset B/S Depreciation Account',
+                             'Asset P&L Depreciation Account']
+                for num, r in enumerate(rows):
+                    header = [x and x.data for x in r.iter_cells()]
+                    for el in col_names:
+                        if el in header:
+                            cols[el] = header.index(el)
+                    break
+                # Number of line to bypass in line's count
+                base_num = 2
+                for el in col_names:
+                    if el not in cols:
+                        raise osv.except_osv(_('Error'), _("'%s' column not found in file.") % (el or '',))
+                # Update wizard
+                self.write(cr, uid, [wiz.id], {'message': _('Reading lines...'), 'progression': 6.00})
+                # Check file's content
+                for num, r in enumerate(rows):
+                    # Update wizard
+                    progression = ((float(num + 1) * 94) / float(nb_rows)) + 6
+                    self.write(cr, uid, [wiz.id], {'message': _('Checking file...'), 'progression': progression})
+                    # Prepare some values
+                    r_prod = False
+                    r_asset_type = False
+                    r_use_life = False
+                    r_ji = False
+                    r_bs_acc = False
+                    r_pl_acc = False
+
+                    current_line_num = num + base_num
+                    # Fetch all XML row values
+                    line = self.pool.get('import.cell.data').get_line_values(cr, uid, ids, r, context=context)
+
+                    # ignore empty lines
+                    if not self.pool.get('msf.doc.import.accounting')._check_has_data(line):
+                        continue
+
+                    # Check line length and fill the cropped empty/missing cells at end of line with False
+                    if len(line) < len(col_names):
+                        line.extend([False] * (len(col_names) - len(line)))
+
+                    line = self.pool.get('msf.doc.import.accounting')._format_special_char(line)
+
+                    # Check Product Code
+                    if not line[cols['Product Code']]:
+                        errors.append(
+                            _('Line %s: No Product Code specified! (External Asset ID: %s, Serial Number: %s)') %
+                             (current_line_num, line[cols['External Asset ID']] or '_', line[cols['Serial Number']] or '_'))
+                    else:
+                        if not prod_cache.get(line[cols['Product Code']], False):
+                            product_ids = self.pool.get('product.product').search(cr, uid, [('default_code', '=', line[cols['Product Code']])])
+                            if product_ids:
+                                prod_cache[line[cols['Product Code']]] = product_ids[0]
+                            else:
+                                errors.append(_('Line %s: Product Code "%s" not found!') % (current_line_num, line[cols['Product Code']],))
+                        r_prod = prod_cache.get(line[cols['Product Code']], False)
+
+                    # Check Asset Type
+                    if not line[cols['Asset Type']]:
+                        errors.append(
+                            _('Line %s: No Asset Type specified! (External Asset ID: %s, Serial Number: %s)') %
+                            (current_line_num, line[cols['External Asset ID']] or '_', line[cols['Serial Number']] or '_'))
+                    else:
+                        if not asset_type_cache.get(line[cols['Asset Type']], False):
+                            asset_type_ids = self.pool.get('product.asset.type').search(cr, uid, [('name', '=', line[cols['Asset Type']])])
+                            if asset_type_ids:
+                                asset_type_cache[line[cols['Asset Type']]] = asset_type_ids[0]
+                            else:
+                                errors.append(_('Line %s: Asset Type "%s" not found!') % (current_line_num, line[cols['Asset Type']],))
+                        r_asset_type = asset_type_cache.get(line[cols['Asset Type']], False)
+
+                    # Check Useful Life
+                    if not line[cols['Useful Life']]:
+                        errors.append(
+                            _('Line %s: No Useful Life specified! (External Asset ID: %s, Serial Number: %s)') %
+                            (current_line_num, line[cols['External Asset ID']] or '_', line[cols['Serial Number']] or '_'))
+                    elif line[cols['Useful Life']] and r_asset_type:
+                        if not use_life_cache.get((line[cols['Useful Life']], r_asset_type), False):
+                            use_life_ids = self.pool.get('product.asset.useful.life').search(cr, uid, [('asset_type_id', '=', r_asset_type), ('year', '=', line[cols['Useful Life']])])
+                            if use_life_ids:
+                                use_life_cache[(line[cols['Useful Life']], r_asset_type)] = use_life_ids[0]
+                            else:
+                                errors.append(
+                                    _('Line %s: The "%s" year(s) Useful Life of Asset Type "%s" not found!') %
+                                    (current_line_num, line[cols['Useful Life']], line[cols['Asset Type']],))
+                        r_use_life = use_life_cache.get((line[cols['Useful Life']], r_asset_type), False)
+
+                    # Check Journal Item
+                    move_ids = False
+                    aml_ids = False
+                    if line[cols['Journal Item']]:
+                        move_ids = self.pool.get('account.move').search(cr, uid, [('name', '=', line[cols['Journal Item']])])
+                        if move_ids and move_ids[0]:
+                            if r_prod:
+                                product = self.pool.get('product.product').browse(cr, uid, r_prod, context=context)
+                                aml_ids = self.pool.get('account.move.line').search(cr, uid, [('move_id', '=', move_ids[0]), ('product_id', '=', product.id)])
+                        if not move_ids or not aml_ids:
+                            errors.append(_('Line %s: Journal Item "%s" not found!\nPlease check if that JI exists or has the product specified') % (current_line_num, line[cols['Journal Item']],))
+                        elif aml_ids:
+                            ji_error = False
+                            # Apply the same restrictions as in the asset form view
+                            aml = self.pool.get('account.move.line').browse(cr, uid, aml_ids[0], context=context)
+                            if aml.journal_id.type not in ['purchase', 'correction_hq', 'hq', 'intermission']:
+                                errors.append(_('Line %s: The journal of Journal Item "%s" has to be of type Purchase, Correction HQ, HQ or Intermission!') % (current_line_num, line[cols['Journal Item']],))
+                                ji_error = True
+                            if not (aml.debit > 0):
+                                errors.append(_('Line %s: The debit of Journal Item "%s" has to be greater than 0.') % (current_line_num, line[cols['Journal Item']],))
+                                ji_error = True
+                            if aml.move_id.state != 'posted':
+                                errors.append(_('Line %s: The Journal Entry "%s" has to be in "posted" state.') % (current_line_num, line[cols['Journal Item']],))
+                                ji_error = True
+                            if aml.account_id.user_type_code not in ['asset', 'expense']:
+                                errors.append(_('Line %s: The account type of Journal Item "%s" has to be either Asset or Expense.') % (current_line_num, line[cols['Journal Item']],))
+                                ji_error = True
+                            if not ji_error:
+                                r_ji = aml_ids[0]
+
+                    # Check Asset B/S Depreciation Account
+                    bs_ids = False
+                    if line[cols['Asset B/S Depreciation Account']]:
+                        if not acc_cache.get((line[cols['Asset B/S Depreciation Account']], 'bs'), False):
+                            bs_ids = self.pool.get('account.account').search(cr, uid, [('code', '=', line[cols['Asset B/S Depreciation Account']])])
+                            if not bs_ids:
+                                errors.append(_('Line %s: Asset B/S Depreciation Account "%s" not found!') % (current_line_num, line[cols['Asset B/S Depreciation Account']],))
+                            else:
+                                bs_account = self.pool.get('account.account').browse(cr, uid, bs_ids[0], context=context)
+                                if bs_account.type != 'other' or bs_account.user_type_code != 'asset':
+                                    errors.append(_('Line %s: Asset B/S Depreciation Account "%s" must have "Regular" as Internal Type and "Asset" as Account Type') %
+                                                  (current_line_num, line[cols['Asset B/S Depreciation Account']],))
+                                else:
+                                    acc_cache[(line[cols['Asset B/S Depreciation Account']], 'bs')] = bs_ids[0]
+                        else:
+                            r_bs_acc = acc_cache.get((line[cols['Asset B/S Depreciation Account']], 'bs'), False)
+
+                    # Check Asset P&L Depreciation Account
+                    pl_ids = False
+                    if line[cols['Asset P&L Depreciation Account']]:
+                        if not acc_cache.get((line[cols['Asset P&L Depreciation Account']], 'pl'), False):
+                            pl_ids = self.pool.get('account.account').search(cr, uid, [('code', '=', line[cols['Asset P&L Depreciation Account']])])
+                            if not pl_ids:
+                                errors.append(_('Line %s: Asset P&L Depreciation Account "%s" not found!') %
+                                              (current_line_num, line[cols['Asset P&L Depreciation Account']],))
+                            else:
+                                pl_account = self.pool.get('account.account').browse(cr, uid, pl_ids[0], context=context)
+                                if pl_account.user_type_code not in ['expense', 'income']:
+                                    errors.append(
+                                        _('Line %s: Asset P&L Depreciation Account "%s" must have "Expense" or "Income" as Account Type') %
+                                        (current_line_num, line[cols['Asset P&L Depreciation Account']],))
+                                else:
+                                    acc_cache[(line[cols['Asset P&L Depreciation Account']], 'pl')] = pl_ids[0]
+                        else:
+                            r_pl_acc = acc_cache.get((line[cols['Asset P&L Depreciation Account']], 'pl'), False)
+
+                    vals = {
+                        'external_asset_id': line[cols['External Asset ID']] or '',
+                        'prod_int_code': line[cols['Product Code']],
+                        'product_id': r_prod,
+                        'asset_type_id': r_asset_type,
+                        'useful_life_id': r_use_life,
+                        'serial_nb': line[cols['Serial Number']] or '',
+                        'brand': line[cols['Brand']],
+                        'type': line[cols['Type']] or '',
+                        'model': line[cols['Model']] or '',
+                        'year': line[cols['Year']] or '',
+                        'move_line_id': r_ji,
+                        'asset_bs_depreciation_account_id': r_bs_acc,
+                        'asset_pl_account_id': r_pl_acc,
+                        'wizard_id': wiz.id,
+                    }
+
+                    if not errors:
+                        line_res = self.pool.get('product.asset.import.entries.lines').create(cr, uid, vals, context=context)
+                        if not line_res:
+                            errors.append(_('Line %s: A problem occurred for line registration. Please contact an Administrator.') % (current_line_num,))
+                            continue
+                        created += 1
+
+            # Update wizard
+            self.write(cr, uid, ids,
+                       {'message': _('Check complete. Reading potential errors or write needed changes.'),
+                        'progression': 100.0})
+
+            wiz_state = 'done'
+            # If errors, cancel probable modifications
+            if errors:
+                cr.rollback()
+                created = 0
+                message = _('Import FAILED.')
+                # Delete old errors
+                error_ids = self.pool.get('product.asset.import.entries.errors').search(cr, uid, [], context)
+                if error_ids:
+                    self.pool.get('product.asset.import.entries.errors').unlink(cr, uid, error_ids, context)
+                # create errors lines
+                for e in errors:
+                    self.pool.get('product.asset.import.entries.errors').create(cr, uid,
+                                                                             {'wizard_id': wiz.id, 'name': e},
+                                                                             context)
+                wiz_state = 'error'
+            else:
+                # Update wizard
+                self.write(cr, uid, ids, {'message': _('Writing changes...'), 'progression': 0.0})
+                # Create all asset entries
+                import_lines_ids = self.pool.get('product.asset.import.entries.lines').search(cr, uid, [('wizard_id', '=', wiz.id)], context=context)
+                import_lines = self.pool.get('product.asset.import.entries.lines').browse(cr, uid, import_lines_ids, context=context)
+                context.update({'from_import': True})
+                try:
+                    for asset in import_lines:
+                        asset_vals = {
+                            'external_asset_id': asset.external_asset_id,
+                            'prod_int_code': asset.prod_int_code,
+                            'product_id': asset.product_id.id,
+                            'asset_type_id': asset.asset_type_id.id,
+                            'useful_life_id': asset.useful_life_id.id,
+                            'serial_nb': asset.serial_nb,
+                            'brand': asset.brand,
+                            'type': asset.type,
+                            'model': asset.model,
+                            'year': asset.year,
+                            'move_line_id': asset.move_line_id.id,
+                            'asset_bs_depreciation_account_id': asset.asset_bs_depreciation_account_id.id,
+                            'asset_pl_account_id': asset.asset_pl_account_id.id,
+                        }
+                        asset_id = self.pool.get('product.asset').create(cr, uid, asset_vals, context=context)
+                    message = _('Import successful.')
+                except osv.except_osv as osv_error:
+                    cr.rollback()
+                    self.write(cr, uid, ids,
+                               {'message': _("An error occurred. %s: %s") % (osv_error.name, osv_error.value,),
+                                'state': 'done', 'progression': 100.0})
+                    cr.close(True)
+
+            # Update wizard
+            self.write(cr, uid, ids, {'message': message, 'state': wiz_state, 'progression': 100.0})
+
+            # Close cursor
+            cr.commit()
+            cr.close(True)
+
+        except osv.except_osv as osv_error:
+            cr.rollback()
+            self.write(cr, uid, ids, {'message': _("An error occurred. %s: %s") % (osv_error.name, osv_error.value,), 'state': 'done', 'progression': 100.0})
+            cr.close(True)
+        except Exception as e:
+            cr.rollback()
+            if current_line_num is not None:
+                message = _("An error occurred on line %s: %s") % (current_line_num, e.args and e.args[0] or '')
+            else:
+                message = _("An error occurred: %s") % (e.args and e.args[0] or '',)
+            self.write(cr, uid, ids, {'message': message, 'state': 'done', 'progression': 100.0})
+            cr.close(True)
+        return True
+
+    def button_validate(self, cr, uid, ids, context=None):
+        """
+        Launch process in a thread and return a wizard
+        """
+        if not context:
+            context = {}
+        thread = threading.Thread(target=self._import, args=(cr.dbname, uid, ids, context))
+        thread.start()
+        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
+
+    def button_update(self, cr, uid, ids, context=None):
+        """
+        Update view
+        """
+        return False
+
+
+product_asset_import_entries()
+
+
+class product_asset_import_entries_lines(osv.osv):
+    _name = 'product.asset.import.entries.lines'
+
+    _columns = {
+        'external_asset_id': fields.char('External Asset ID', size=32, readonly=True),
+        'prod_int_code': fields.char('Product Code', size=128, readonly=True, required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+        'asset_type_id': fields.many2one('product.asset.type', 'Asset Type', readonly=True, required=True),
+        'useful_life_id': fields.many2one('product.asset.useful.life', 'Useful Life', ondelete='restrict', readonly=True, required=True),
+        'serial_nb': fields.char('Serial Number', size=128, readonly=True),
+        'brand': fields.char('Brand', size=128, readonly=True),
+        'type': fields.char('Type', size=128, readonly=True),
+        'model': fields.char('Model', size=128, readonly=True),
+        'year': fields.char('Year', size=4, readonly=True),
+        'move_line_id': fields.many2one('account.move.line', 'Journal Item', readonly=True),
+        'asset_bs_depreciation_account_id': fields.many2one('account.account', 'Asset B/S Depreciation Account', readonly=True),
+        'asset_pl_account_id': fields.many2one('account.account', 'Asset P&L Depreciation Account', readonly=True),
+        'wizard_id': fields.integer("Wizard", required=True, readonly=True),
+    }
+
+
+product_asset_import_entries_lines()
+
+
+class product_asset_import_entries_errors(osv.osv_memory):
+    _name = 'product.asset.import.entries.errors'
+    _description = 'Asset Entries Import - Error List'
+
+    _columns = {
+        'name': fields.text("Description", readonly=True, required=True),
+        'wizard_id': fields.many2one('product.asset.import.entries', "Wizard", required=True, readonly=True),
+    }
+
+
+product_asset_import_entries_errors()
+
+
 #----------------------------------------------------------
 # Products
 #----------------------------------------------------------

=== modified file 'bin/addons/product_asset/product_asset_view.xml'
--- bin/addons/product_asset/product_asset_view.xml	2024-03-13 13:36:47 +0000
+++ bin/addons/product_asset/product_asset_view.xml	2024-05-10 12:38:34 +0000
@@ -68,7 +68,10 @@
         <field name="arch" type="xml">
             <form string="Asset">
                     <field name="name" />
-                    <field name="instance_id" readonly='1'/>
+                    <group colspan="2" col="4">
+                        <field name="external_asset_id" attrs="{'readonly': ['|', ('lock_open', '=', True), ('state', 'not in', ['draft', 'open'])]}"/>
+                        <field name="instance_id" readonly='1'/>
+                    </group>
                     <field name="journal_id" />
                     <group colspan="2" col="4">
                         <field name="asset_type_id" on_change="change_asset_type_id(asset_type_id, useful_life_id)" required="1" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'open']), ('lock_open', '!=', False)]}" />
@@ -112,11 +115,11 @@
 
                         <group colspan="2" col="4">
                             <separator string="Invoice" colspan="4" />
-                            <field name="move_line_id" colspan="4" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('from_invoice', '=', True)]}" on_change="change_invo_date(move_line_id, product_id)" />
+                            <field name="move_line_id" required="1" colspan="4" attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('from_invoice', '=', True)]}" on_change="change_invo_date(move_line_id, product_id)" />
                             <field name="quantity_divisor"  attrs="{'readonly': ['|', ('state', '!=', 'draft'), ('from_invoice', '=', True)]}" on_change="change_quantity_divisor(quantity_divisor, move_line_id)"/>
-                            <field name="invo_value" />
-                            <field name="invo_currency"  />
-                            <field name="invo_date" />
+                            <field name="invo_value" required="1"/>
+                            <field name="invo_currency" required="1"/>
+                            <field name="invo_date" required="1"/>
                             <field name="invo_supplier_id" colspan="4" />
                             <field name="invo_donator_code" colspan="4" attrs="{'readonly': ['|', ('lock_open', '=', True), ('state', 'in', ['cancel', 'done'])]}"/>
                             <field name="invo_certif_depreciation" colspan="4" attrs="{'readonly': ['|', ('lock_open', '=', True), ('state', 'in', ['cancel', 'done'])]}"/>
@@ -141,8 +144,8 @@
                         </group>
                     </page>
                     <page string="Depreciation">
-                        <field name="start_date" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'open']), ('lock_open', '!=', False)]}" />
-                        <field name="depreciation_method" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'open']), ('lock_open', '!=', False)]}"/>
+                        <field name="start_date" required="1" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'open']), ('lock_open', '!=', False)]}" />
+                        <field name="depreciation_method" required="1" attrs="{'readonly': ['|', ('state', 'not in', ['draft', 'open']), ('lock_open', '!=', False)]}"/>
                         <newline />
                         <field name="depreciation_amount" />
                         <field name="disposal_amount" />
@@ -585,6 +588,82 @@
 
     <menuitem sequence="200" action="action_product_asset_generate_entries" id="menu_product_asset_generate_entries" parent="product_asset.menu_asset_sales" />
 
+    <record id="view_product_asset_import_entries" model="ir.ui.view">
+            <field name="name">product.asset.import.entries.form</field>
+            <field name="model">product.asset.import.entries</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Import Asset Entries">
+                    <separator string="This will import Entries from an XML file." colspan="4"/>
+                    <field name="file" filename="filename" attrs="{'invisible': [('state', '!=', 'draft')]}"/>
+                    <field name="filename" invisible="1"/>
+                    <field name="progression" widget="progressbar" nolabel="1" attrs="{'invisible': [('state', '=', 'draft')]}" colspan="4" />
+                    <field name="message" nolabel="1" attrs="{'invisible': [('state', '=', 'draft')]}"/>
+                    <newline/>
+                    <button name="button_update" type="object" string="Update" icon="gtk-refresh" attrs="{'invisible': [('state', '!=', 'inprogress')]}"/>
+                    <newline />
+                    <field name="error_ids" nolabel="1" attrs="{'invisible': [('state', '!=', 'error')]}"/>
+                    <group col="4" colspan="4" attrs="{'invisible': [('state', '!=', 'draft')]}">
+                        <separator string="Import template"/>
+                        <newline />
+                        <html>
+                          <br />
+                          <table style="margin: 0 auto;">
+                            <thead>
+                              <tr style='background-color: #ccc;font-size:1.2em;'>
+                                <th class='external_asset_id' style='border: thin solid black; text-transform: none;'>External Asset ID</th>
+                                <th class='prod_int_code' style='border: thin solid black; font-weigth:bold; border-left: none; text-transform: none;'>Product Code</th>
+                                <th class='asset_type_id' style='border: thin solid black; font-weigth:bold; border-left: none; text-transform: none;'>Asset Type</th>
+                                <th class='useful_life_id' style='border: thin solid black; font-weigth:bold; border-left: none; text-transform: none;'>Useful Life</th>
+                                <th class='serial_nb' style="border: thin solid black; border-left: none; text-transform: none;">Serial Number</th>
+                                <th class='brand' style='border: thin solid black; border-left: none; text-transform: none;'>Brand</th>
+                                <th class='type' style='border: thin solid black; border-left: none; text-transform: none;'>Type</th>
+                                <th class='model' style='border: thin solid black; border-left: none; text-transform: none;'>Model</th>
+                                <th class='year' style='border: thin solid black; border-left: none; text-transform: none;'>Year</th>
+                                <th class='move_line_id' style='border: thin solid black; border-left: none; text-transform: none;'>Journal Item</th>
+                                <th class='asset_bs_depreciation_account_id' style='border: thin solid black; border-left: none; text-transform: none;'>Asset B/S Depreciation Account</th>
+                                <th class='asset_pl_account_id' style='border: thin solid black; border-left: none; text-transform: none;'>Asset P&amp;L Depreciation Account</th>
+                              </tr>
+                            </thead>
+                            <tbody>
+                              <tr>
+                                <th style="border: thin solid black; border-top: none;"></th>
+                                <th style="border: thin solid black; color:red; font-weigth:bold; font-size:1.2em; border-left: none; border-top: none;">Mandatory</th>
+                                <th style="border: thin solid black; color:red; font-weigth:bold; font-size:1.2em; border-left: none; border-top: none;">Mandatory</th>
+                                <th style="border: thin solid black; color:red; font-weigth:bold; font-size:1.2em; border-left: none; border-top: none;">Mandatory</th>
+                                <th style="border: thin solid black; border-left: none; border-top: none;"></th>
+                                <th style="border: thin solid black; border-left: none; border-top: none;"></th>
+                                <th style="border: thin solid black; border-left: none; border-top: none;"></th>
+                                <th style="border: thin solid black; border-left: none; border-top: none;"></th>
+                                <th style="border: thin solid black; border-left: none; border-top: none;"></th>
+                                <th style="border: thin solid black; border-left: none; border-top: none;"></th>
+                                <th style="border: thin solid black; border-left: none; border-top: none;"></th>
+                                <th style="border: thin solid black; border-left: none; border-top: none;"></th>
+                              </tr>
+                            </tbody>
+                          </table>
+                          <br />
+                        </html>
+                    </group>
+                    <group colspan="4" col="2" attrs="{'invisible': [('state', '!=', 'draft')]}">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button name="button_validate" type="object" string="Import" icon="terp-camera_test"/>
+                    </group>
+                    <field name="state" invisible="1"/>
+                </form>
+            </field>
+        </record>
+
+    <record id="action_product_asset_import_entries" model="ir.actions.act_window">
+        <field name="name">Import Asset Entries</field>
+        <field name="res_model">product.asset.import.entries</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+    <menuitem sequence="300" action="action_product_asset_import_entries" id="menu_product_asset_import_entries" parent="product_asset.menu_asset_sales" />
+
 
 
 </data>