Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REF] joint_buying_product: Remove Nextcloud link, in the email templ… #96

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions joint_buying_product/data/ir_config_parameter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 0 additions & 1 deletion joint_buying_product/data/mail_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions joint_buying_product/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions joint_buying_product/models/res_config_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 1 addition & 9 deletions joint_buying_product/views/view_res_config_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading