diff options
| author | Thibault Delavallée <tde@openerp.com> | 2016-08-10 13:06:02 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2016-08-10 15:48:10 +0200 |
| commit | fff2201d3f5af0081b2bed319c13f92dfc81276e (patch) | |
| tree | ab65553f1bb0ecb599d41b9c6dce1d4e56fc3e4c /addons | |
| parent | 52467414a709a75500a64ff4752e6e906802c016 (diff) | |
[MOV] mrp: rename report files according to guidelines
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mrp/__openerp__.py | 4 | ||||
| -rw-r--r-- | addons/mrp/report/__init__.py | 6 | ||||
| -rw-r--r-- | addons/mrp/report/mrp_bom_cost_report.py (renamed from addons/mrp/report/bom_cost.py) | 2 | ||||
| -rw-r--r-- | addons/mrp/report/mrp_bom_cost_report_templates.xml (renamed from addons/mrp/report/bom_cost.xml) | 2 | ||||
| -rw-r--r-- | addons/mrp/report/mrp_bom_structure_report.py (renamed from addons/mrp/report/bom_structure.py) | 2 | ||||
| -rw-r--r-- | addons/mrp/report/mrp_bom_structure_report_templates.xml (renamed from addons/mrp/report/mrp_bom_templates.xml) | 2 | ||||
| -rw-r--r-- | addons/mrp/report/mrp_report_views_main.xml | 1 |
7 files changed, 10 insertions, 9 deletions
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index 83b9c4d187b..ccd6ba1de3c 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -63,8 +63,8 @@ Dashboard / Reports for MRP will include: 'report/mrp_report_views_main.xml', 'report/mrp_report_views.xml', 'report/mrp_production_templates.xml', - 'report/mrp_bom_templates.xml', - 'report/bom_cost.xml', + 'report/mrp_bom_structure_report_templates.xml', + 'report/mrp_bom_cost_report_templates.xml', ], 'demo': [ 'data/mrp_demo.xml', diff --git a/addons/mrp/report/__init__.py b/addons/mrp/report/__init__.py index 73a73053af1..a3ba4a1f517 100644 --- a/addons/mrp/report/__init__.py +++ b/addons/mrp/report/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import bom_structure -import mrp_report -import bom_cost
\ No newline at end of file +import mrp_bom_cost_report +import mrp_bom_structure_report +import mrp_report
\ No newline at end of file diff --git a/addons/mrp/report/bom_cost.py b/addons/mrp/report/mrp_bom_cost_report.py index 54cd5ea21b7..acdd977f777 100644 --- a/addons/mrp/report/bom_cost.py +++ b/addons/mrp/report/mrp_bom_cost_report.py @@ -45,4 +45,4 @@ class MrpBomCost(models.AbstractModel): def render_html(self, docids, data=None): boms = self.env['mrp.bom'].browse(docids) res = self.get_lines(boms) - return self.env['report'].render('mrp.mrp_bom_cost', {'lines': res}) + return self.env['report'].render('mrp.mrp_bom_cost_report', {'lines': res}) diff --git a/addons/mrp/report/bom_cost.xml b/addons/mrp/report/mrp_bom_cost_report_templates.xml index 3237e55c47a..87de18872bf 100644 --- a/addons/mrp/report/bom_cost.xml +++ b/addons/mrp/report/mrp_bom_cost_report_templates.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <odoo> - <template id="mrp_bom_cost"> + <template id="mrp_bom_cost_report"> <div class="o_form_view"> <div class="page o_form_sheet_bg"> <div class="o_form_sheet"> diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/mrp_bom_structure_report.py index ae8599fa5b5..1649496fd28 100644 --- a/addons/mrp/report/bom_structure.py +++ b/addons/mrp/report/mrp_bom_structure_report.py @@ -41,4 +41,4 @@ class BomStructureReport(models.AbstractModel): 'get_children': self.get_children, 'data': data, } - return self.env['report'].render('mrp.report_mrpbomstructure', docargs) + return self.env['report'].render('mrp.mrp_bom_structure_report', docargs) diff --git a/addons/mrp/report/mrp_bom_templates.xml b/addons/mrp/report/mrp_bom_structure_report_templates.xml index 80e5eec5fa2..eacec5e4dd5 100644 --- a/addons/mrp/report/mrp_bom_templates.xml +++ b/addons/mrp/report/mrp_bom_structure_report_templates.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> -<template id="report_mrpbomstructure"> +<template id="mrp_bom_structure_report"> <t t-call="report.html_container"> <t t-call="report.internal_layout"> <div class="page"> diff --git a/addons/mrp/report/mrp_report_views_main.xml b/addons/mrp/report/mrp_report_views_main.xml index 2262a234c91..27b4b69d346 100644 --- a/addons/mrp/report/mrp_report_views_main.xml +++ b/addons/mrp/report/mrp_report_views_main.xml @@ -18,6 +18,7 @@ file="mrp.report.mrp_production_templates" report_type="qweb-pdf" /> + <report string="BOM Cost" id="action_report_bom_price" |
