pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MOV][IMP] mrp, repair: reorganize qweb / jinja templates used for mailing

Browse Source 
PURPOSE

Clean organization of templates in odoo apps: mail.template records in data,
qweb templates (views) used directly in code, notably using post with view.
Purpose is to ease future improvements in posting based on templates.

SPECIFICATIONS

  * move those templates in their own file to ease their discovering and
    maintenance;
  * put them into data (as those are not views even if it contains qweb)
  * guidelines are now :

    -> Qweb templates should be in data/mail_templates.xml;
    -> mail.template records should be in data/mail_template_data.xml;

  * put their declaration in no update when not done if template has no
    technical code or complex dependency on underlying code;
  * move found mail data (mail.message.subtype or mail.activity.type) records
    in a mail_data file that should contain only "core" records linked to mail;

LINKS

Task ID-2375767
COM PR odoo/odoo#61814
ENT PR odoo/enterprise#14775
UPG PR odoo/upgrade#1936
This commit is contained in:
Thibault Delavallée
2020-11-25 12:31:09 +00:00
parent 36047333dd
commit 03c4eae63b
6 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/__manifest__.py
+2 -1
View File
@@ -15,6 +15,7 @@
'security/mrp_security.xml',
'security/ir.model.access.csv',
'data/digest_data.xml',
'data/mail_templates.xml',
'data/mrp_data.xml',
'wizard/change_production_qty_views.xml',
'wizard/mrp_workcenter_block_view.xml',
@@ -36,7 +37,7 @@
'views/mrp_unbuild_views.xml',
'views/ir_attachment_view.xml',
'views/res_config_settings_views.xml',
'views/mrp_templates.xml',
'views/assets.xml',
'views/stock_scrap_views.xml',
'report/report_deliveryslip.xml',
'report/mrp_report_views_main.xml',
addons/mrp/data/mail_templates.xml
+53
View File
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="exception_on_mo">
<div class="alert alert-warning" role="alert">
Exception(s) occurred on the manufacturing order(s):
<a href="#" data-oe-model="mrp.production" t-att-data-oe-id="production_order.id"><t t-esc="production_order.name"/></a>.
Manual actions may be needed.
<div class="mt16">
<p>Exception(s):</p>
<ul t-foreach="order_exceptions.items()" t-as="order_exception">
<li>
<t t-set="move_raw_id" t-value="order_exception[0]"/>
<t t-set="exception" t-value="order_exception[1]"/>
<t t-set="order" t-value="exception[0]"/>
<t t-set="new_qty" t-value="exception[1][0]"/>
<t t-set="old_qty" t-value="exception[1][1]"/>
<a href="#" data-oe-model="mrp.production" t-att-data-oe-id="production_order.id"><t t-esc="production_order.name"/></a>:
<t t-esc="new_qty"/> <t t-esc="move_raw_id.product_uom.name"/> of <t t-esc="move_raw_id.product_id.name"/>
<t t-if="cancel">
cancelled
</t>
<t t-if="not cancel">
ordered instead of <t t-esc="old_qty"/> <t t-esc="move_raw_id.product_uom.name"/>
</t>
</li>
</ul>
</div>
<div class="mt16" t-if="not cancel and impacted_pickings">
<p>Impacted Transfer(s):</p>
<ul t-foreach="impacted_pickings" t-as="picking">
<li><a href="#" data-oe-model="stock.picking" t-att-data-oe-id="picking.id"><t t-esc="picking.name"/></a></li>
</ul>
</div>
</div>
</template>
<template id="production_message">
<t t-if="move.move_id.raw_material_production_id">
<t t-set="message">Consumed</t>
</t>
<t t-if="move.move_id.production_id">
<t t-set="message">Produced</t>
</t>
<strong><t t-esc="message"/> quantity has been updated.</strong>
</template>
<template id="track_production_move_template">
<div>
<t t-call="mrp.production_message"/>
<t t-call="stock.message_body"/>
</div>
</template>
</odoo>
addons/mrp/report/mrp_production_templates.xml
-17
View File
@@ -184,21 +184,4 @@
</div>
</t>
</template>
<template id="production_message">
<t t-if="move.move_id.raw_material_production_id">
<t t-set="message">Consumed</t>
</t>
<t t-if="move.move_id.production_id">
<t t-set="message">Produced</t>
</t>
<strong><t t-esc="message"/> quantity has been updated.</strong>
</template>
<template id="track_production_move_template">
<div>
<t t-call="mrp.production_message"/>
<t t-call="stock.message_body"/>
</div>
</template>
</odoo>
addons/mrp/views/mrp_templates.xml → addons/mrp/views/assets.xml
-35
View File
@@ -31,39 +31,4 @@
<script type="text/javascript" src="/mrp/static/tests/mrp_document_kanban_tests.js"/>
</xpath>
</template>
<template id="exception_on_mo">
<div class="alert alert-warning" role="alert">
Exception(s) occurred on the manufacturing order(s):
<a href="#" data-oe-model="mrp.production" t-att-data-oe-id="production_order.id"><t t-esc="production_order.name"/></a>.
Manual actions may be needed.
<div class="mt16">
<p>Exception(s):</p>
<ul t-foreach="order_exceptions.items()" t-as="order_exception">
<li>
<t t-set="move_raw_id" t-value="order_exception[0]"/>
<t t-set="exception" t-value="order_exception[1]"/>
<t t-set="order" t-value="exception[0]"/>
<t t-set="new_qty" t-value="exception[1][0]"/>
<t t-set="old_qty" t-value="exception[1][1]"/>
<a href="#" data-oe-model="mrp.production" t-att-data-oe-id="production_order.id"><t t-esc="production_order.name"/></a>:
<t t-esc="new_qty"/> <t t-esc="move_raw_id.product_uom.name"/> of <t t-esc="move_raw_id.product_id.name"/>
<t t-if="cancel">
cancelled
</t>
<t t-if="not cancel">
ordered instead of <t t-esc="old_qty"/> <t t-esc="move_raw_id.product_uom.name"/>
</t>
</li>
</ul>
</div>
<div class="mt16" t-if="not cancel and impacted_pickings">
<p>Impacted Transfer(s):</p>
<ul t-foreach="impacted_pickings" t-as="picking">
<li><a href="#" data-oe-model="stock.picking" t-att-data-oe-id="picking.id"><t t-esc="picking.name"/></a></li>
</ul>
</div>
</div>
</template>
</odoo>
addons/repair/__manifest__.py
+1 -1
View File
@@ -31,7 +31,7 @@ The following topics are covered by this module:
'report/repair_reports.xml',
'report/repair_templates_repair_order.xml',
'data/ir_sequence_data.xml',
'data/repair_data.xml',
'data/mail_template_data.xml',
],
'demo': ['data/repair_demo.xml'],
'test': [],
addons/repair/data/repair_data.xml → addons/repair/data/mail_template_data.xml
View File