diff --git a/__manifest__.py b/__manifest__.py
index 76260596693ed8fb5abedef69209d8e02636a545..5dd7ffcee2df9e0c7fca41765e030c66e5391282 100644
--- a/__manifest__.py
+++ b/__manifest__.py
@@ -5,7 +5,7 @@
'author': 'LE FILAMENT',
'version': '14.0.0.0.1',
'license': "AGPL-3",
- 'depends': ['web','sale','stock'],
+ 'depends': ['web','ap_sale_project'],
'qweb': [],
'data': [
'data/paperformat_data.xml',
diff --git a/i18n/fr.po b/i18n/fr.po
new file mode 100644
index 0000000000000000000000000000000000000000..01217d503d08e4779df21f50eb70b3ed4228da1e
--- /dev/null
+++ b/i18n/fr.po
@@ -0,0 +1,403 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * ap_report
+# * stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-16 10:36+0000\n"
+"PO-Revision-Date: 2021-11-16 10:36+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+msgid "&nbsp;<span>on</span>&nbsp;"
+msgstr "&nbsp;<span>sur</span>&nbsp;"
+
+#. module: ap_report
+#: model:ir.actions.report,print_report_name:ap_report.action_compostion
+msgid "'Composition - %s' % (object.name)"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_external_layout_generic
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_external_layout_generic_compo
+msgid "- Code NAF:"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_external_layout_generic
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_external_layout_generic_compo
+msgid "- SIRET:"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid ""
+"<span groups=\"account.group_show_line_subtotals_tax_excluded\">Montant "
+"HT</span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid ""
+"<span "
+"groups=\"account.group_show_line_subtotals_tax_excluded\">Montant</span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid ""
+"<span groups=\"account.group_show_line_subtotals_tax_included\">Prix "
+"total</span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<span>Description</span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_picking
+msgid "<span>Devis N° </span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "<span>Facture pro-forma n° </span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<span>Prix unitaire</span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<span>Quantité</span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<span>Rem.%</span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<span>Taxes</span>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong class=\"mr16\">Sous-total HT</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong class=\"mr16\">Sous-total</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+msgid "<strong>Adresse de facturation:</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+msgid "<strong>Adresse de livraison:</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong>Echéance:</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong>Montant dû</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong>Origine:</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_picking
+msgid "<strong>Produit</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_picking
+msgid "<strong>Quantité</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong>Référent:</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong>Sous-total HT</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong>Sous-total</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong>Total TTC</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "<strong>Total</strong>"
+msgstr ""
+
+#. module: ap_report
+#: model:ir.model.fields,field_description:ap_report.field_base_document_layout__ape
+msgid "APE"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "Avoir"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "Avoir de fournisseur"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_picking
+msgid "Bon de préparation"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "Commande n°"
+msgstr ""
+
+#. module: ap_report
+#: model:ir.model,name:ap_report.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: ap_report
+#: model:ir.model,name:ap_report.model_base_document_layout
+msgid "Company Document Layout"
+msgstr "Mise en page des documents de votre société"
+
+#. module: ap_report
+#: model:ir.actions.report,name:ap_report.action_compostion
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "Compositions"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+msgid "Description"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "Devis N°"
+msgstr ""
+
+#. module: ap_report
+#: model:ir.model.fields,field_description:ap_report.field_base_document_layout__display_name
+#: model:ir.model.fields,field_description:ap_report.field_res_company__display_name
+msgid "Display Name"
+msgstr "Nom affiché"
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+#: model_terms:ir.ui.view,arch_db:ap_report.report_picking
+msgid "Du"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "Facture"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "Facture annulée"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "Facture en brouillon"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "Facture fournisseur"
+msgstr ""
+
+#. module: ap_report
+#: model:ir.model.fields,field_description:ap_report.field_base_document_layout__id
+#: model:ir.model.fields,field_description:ap_report.field_res_company__id
+msgid "ID"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "Intervalle entre plants:"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "Intervention n°"
+msgstr ""
+
+#. module: ap_report
+#: model:ir.model.fields,field_description:ap_report.field_base_document_layout____last_update
+#: model:ir.model.fields,field_description:ap_report.field_res_company____last_update
+msgid "Last Modified on"
+msgstr "Dernière modification le"
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_external_layout_generic
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_external_layout_generic_compo
+msgid "Logo"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "Longueur:"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+msgid "Mention « bon pour accord » et signature du client"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "Nombre de plants:"
+msgstr ""
+
+#. module: ap_report
+#: model:ir.model.fields,field_description:ap_report.field_base_document_layout__formation
+#: model:ir.model.fields,field_description:ap_report.field_res_company__formation
+msgid "N° Organisme de formation"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_external_layout_generic
+msgid "N°déclaration activité de prestataire de formation:"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "OU"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_external_layout_generic
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_external_layout_generic_compo
+msgid "Page: <span class=\"page\"/> / <span class=\"topage\"/>"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "Payé le"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+msgid "Prix unitaire"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "Projet N°"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+msgid "Quantité"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "Référent projet:"
+msgstr ""
+
+#. module: ap_report
+#: model:ir.model.fields,field_description:ap_report.field_base_document_layout__siret
+msgid "SIRET"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "Tax ID"
+msgstr "N° TVA"
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.ap_report_saleorder_document
+msgid "Taxes"
+msgstr ""
+
+#. module: ap_report
+#: model:ir.model.fields,field_description:ap_report.field_res_company__text_report
+msgid "Texte à afficher sur les rapports"
+msgstr ""
+
+#. module: ap_report
+#: model:ir.model.fields,field_description:ap_report.field_base_document_layout__company_type
+#: model:ir.model.fields,field_description:ap_report.field_res_company__company_type
+msgid "Type de société"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_invoice_document
+msgid "on"
+msgstr "sur"
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "plants par séquence"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "plants supplémentaires"
+msgstr ""
+
+#. module: ap_report
+#: model_terms:ir.ui.view,arch_db:ap_report.report_composition_document
+msgid "séquences entières"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.report,name:stock.action_report_picking
+msgid "Picking Operations"
+msgstr "Bon de préparation"
diff --git a/views/report_composition_templates.xml b/views/report_composition_templates.xml
index ef7b288c821e475bd1d1d98fc5a30a802ac7aac7..a32df4ff07de7857e34f18cf628c6d16d7fc1877 100644
--- a/views/report_composition_templates.xml
+++ b/views/report_composition_templates.xml
@@ -69,6 +69,7 @@
<t t-foreach="intervention.plant_sequence_ids" t-as="compo">
<tr>
+ <td class="text-center"><t t-if="compo.product_id.categ_id.symbol"><i t-attf-class="fa {{compo.product_id.categ_id.symbol}}"></i></t></td>
<td><span t-field="compo.product_id.name"/></td>
<td><t t-if="compo.product_alternance_id">OU</t></td>
<td><t t-if="compo.product_alternance_id"><span t-field="compo.product_alternance_id.name"/></t></td>
@@ -79,6 +80,7 @@
<t t-foreach="intervention.plant_sequence_ids" t-as="compo">
<tr>
+ <td class="text-center"><t t-if="compo.product_id.categ_id.symbol"><i t-attf-class="fa {{compo.product_id.categ_id.symbol}}"></i></t></td>
<td><span t-field="compo.product_id.name"/></td>
<td><span t-field="compo.qty"/></td>
</tr>
diff --git a/views/report_delivery_ap_template.xml b/views/report_delivery_ap_template.xml
index 543abb41ff9e728fb7fd3a22be9045fda678fb5f..7f152e102f49b606a801a374fc81b909dc4cf598 100644
--- a/views/report_delivery_ap_template.xml
+++ b/views/report_delivery_ap_template.xml
@@ -4,19 +4,18 @@
<template id="report_picking" inherit_id="stock.report_picking">
<div class="page" position="replace">
- <h1 class="mt0 text-center">Bon de préparation</h1>
+ <h1 class="mt0 mb-2 text-center">Bon de préparation</h1>
<div class="page">
<div class="row">
- <div class="col-9" name="div_outgoing_address">
+ <div class="col-8" name="div_outgoing_address">
<h2>
<span>Devis N° </span><span t-field="o.origin"/>
</h2>
<div class="mw-100 mb-3">
<p class="m-0">Du <span t-field="o.scheduled_date" t-options='{"widget": "date"}'/></p>
-<!-- <p class="m-0">Référent projet: <span t-field="o.user_id"/></p>-->
</div>
</div>
- <div class="col-3" name="div_outgoing_address">
+ <div class="col-4" name="div_outgoing_address">
<div>
<div t-field="o.partner_id"
t-options='{"widget": "contact", "fields": ["address", "name", "phone"], "no_marker": True, "phone_icons": True}'/>