Merge PR #96 into 12.0

Signed-off-by legalsylvain
grap · Oct 7, 2024 · 69dc931 · 69dc931
2 parents 991a157 + 6735b03
commit 69dc931
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 25 deletions.
diff --git a/joint_buying_product/data/ir_config_parameter.xml b/joint_buying_product/data/ir_config_parameter.xml
@@ -17,9 +17,4 @@
         <field name="value">60</field>
     </record>
 
-    <record id="supplier_url_document" model="ir.config_parameter">
-        <field name="key">joint_buying_product.supplier_document_url</field>
-        <field name="value">http://framabook.org/docs/NRC/Numerique_ReprendreLeControle_CC-By.pdf</field>
-    </record>
-
 </odoo>
diff --git a/joint_buying_product/data/mail_template.xml b/joint_buying_product/data/mail_template.xml
@@ -24,7 +24,6 @@
                     <br/>
                     If you see in this document, incorrect informations (product not for sale or out of stock, incorrect price, etc. ...) please contact your pivot activity <strong>${object.pivot_company_id.name}</strong> as soon as possible.
                     <br/><br/>
-                    You can download the packing instructions by clicking on <a href="${object.env['ir.config_parameter'].sudo().get_param('joint_buying_product.supplier_url_document')}">this link.</a>
                     Have a nice day.
                 </p>
             </div>

diff --git a/joint_buying_product/i18n/fr.po b/joint_buying_product/i18n/fr.po
@@ -46,7 +46,6 @@ msgid "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                    <br/>\n"
 "                    If you see in this document, incorrect informations (product not for sale or out of stock, incorrect price, etc. ...) please contact your pivot activity <strong>${object.pivot_company_id.name}</strong> as soon as possible.\n"
 "                    <br/><br/>\n"
-"                    You can download the packing instructions by clicking on <a href=\"${object.env['ir.config_parameter'].sudo().get_param('joint_buying_product.supplier_url_document')}\">this link.</a>\n"
 "                    Have a nice day.\n"
 "                </p>\n"
 "            </div>\n"
@@ -65,7 +64,6 @@ msgstr "<div style=\"margin: 0px; padding: 0px;\">\n"
 "                    <br/>\n"
 "                    Si vous voyez dans ce document des informations incorrectes (articles indisponibles, en rupture de stock, avec un prix incorrect, etc...) Veuillez contacter votre activité pivot <strong>${object.pivot_company_id.name}</strong> le plus rapidement possible.\n"
 "                    <br/><br/>\n"
-"                    Vous pouvez télécharger les consignes de livraison en cliquant sur <a href=\"${object.env['ir.config_parameter'].sudo().get_param('joint_buying_product.supplier_url_document')}\">ce lien.</a>\n"
 "                    Passez une bonne journée.\n"
 "                </p>\n"
 "            </div>\n"

diff --git a/joint_buying_product/models/res_config_settings.py b/joint_buying_product/models/res_config_settings.py
@@ -29,14 +29,6 @@ class ResConfigSettings(models.TransientModel):
         help="Number of days after which a product will no longer be marked as new.",
     )
 
-    joint_buying_supplier_document_url = fields.Char(
-        string="Supplier Document URL",
-        required=True,
-        config_parameter="joint_buying_product.supplier_document_url",
-        help="URL of the online document that will be added to the email"
-        " send to the supplier.",
-    )
-
     joint_buying_send_pivot_email_in_progress = fields.Boolean(
         string="Send email when opening Grouped Order",
         related="company_id.joint_buying_send_pivot_email_in_progress",

diff --git a/joint_buying_product/views/view_res_config_settings.xml b/joint_buying_product/views/view_res_config_settings.xml
@@ -42,18 +42,10 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                     </div>
                 </div>
 
-                <div class="col-xs-12 col-md-6 o_setting_box">
-                    <div class="o_setting_left_pane"/>
-                    <div class="o_setting_right_pane">
-
-                        <label for="joint_buying_supplier_document_url"/>
-                        <div class="text-muted">URL of the online document that will be added to the email send to the supplier.</div>
-                        <field name="joint_buying_supplier_document_url"/>
-                    </div>
-                </div>
             </xpath>
 
             <xpath expr="//div[@name='joint_buying_company_setting']" position="inside">
+
                 <div class="col-xs-12 col-md-6 o_setting_box">
                     <div class="o_setting_left_pane"/>
                     <div class="o_setting_right_pane">