summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsvs-odoo <svs@odoo.com>2019-04-16 12:09:07 +0000
committerSimon Lejeune <sle@openerp.com>2019-04-24 08:13:56 +0000
commita765a38edbfd01bb886a65b2ea3ab93c85966497 (patch)
tree5f3f5f367ed8adaa58162a2a9a65f0cdcf1e0356
parente5479fcfdb76bdbf9301fb140d873483bafdb9e4 (diff)
[MOV] mrp_account: merge with mrp_bom_cost
Merges mrp_bom_cost into mrp_account since they have both the same depedences. Task #1964809 closes odoo/odoo#32722 Signed-off-by: Simon Lejeune (sle) <sle@openerp.com>
-rw-r--r--addons/mrp_account/__manifest__.py8
-rw-r--r--addons/mrp_account/i18n/af.po (renamed from addons/mrp_bom_cost/i18n/af.po)0
-rw-r--r--addons/mrp_account/i18n/am.po (renamed from addons/mrp_bom_cost/i18n/am.po)0
-rw-r--r--addons/mrp_account/i18n/ar.po (renamed from addons/mrp_bom_cost/i18n/ar.po)0
-rw-r--r--addons/mrp_account/i18n/az.po (renamed from addons/mrp_bom_cost/i18n/az.po)0
-rw-r--r--addons/mrp_account/i18n/bg.po (renamed from addons/mrp_bom_cost/i18n/bg.po)0
-rw-r--r--addons/mrp_account/i18n/bs.po (renamed from addons/mrp_bom_cost/i18n/bs.po)0
-rw-r--r--addons/mrp_account/i18n/ca.po (renamed from addons/mrp_bom_cost/i18n/ca.po)0
-rw-r--r--addons/mrp_account/i18n/cs.po (renamed from addons/mrp_bom_cost/i18n/cs.po)0
-rw-r--r--addons/mrp_account/i18n/da.po (renamed from addons/mrp_bom_cost/i18n/da.po)0
-rw-r--r--addons/mrp_account/i18n/de.po (renamed from addons/mrp_bom_cost/i18n/de.po)0
-rw-r--r--addons/mrp_account/i18n/el.po (renamed from addons/mrp_bom_cost/i18n/el.po)0
-rw-r--r--addons/mrp_account/i18n/en_AU.po (renamed from addons/mrp_bom_cost/i18n/en_AU.po)0
-rw-r--r--addons/mrp_account/i18n/en_GB.po (renamed from addons/mrp_bom_cost/i18n/en_GB.po)0
-rw-r--r--addons/mrp_account/i18n/es.po (renamed from addons/mrp_bom_cost/i18n/es.po)0
-rw-r--r--addons/mrp_account/i18n/es_AR.po (renamed from addons/mrp_bom_cost/i18n/es_AR.po)0
-rw-r--r--addons/mrp_account/i18n/es_BO.po (renamed from addons/mrp_bom_cost/i18n/es_BO.po)0
-rw-r--r--addons/mrp_account/i18n/es_CL.po (renamed from addons/mrp_bom_cost/i18n/es_CL.po)0
-rw-r--r--addons/mrp_account/i18n/es_CO.po (renamed from addons/mrp_bom_cost/i18n/es_CO.po)0
-rw-r--r--addons/mrp_account/i18n/es_CR.po (renamed from addons/mrp_bom_cost/i18n/es_CR.po)0
-rw-r--r--addons/mrp_account/i18n/es_DO.po (renamed from addons/mrp_bom_cost/i18n/es_DO.po)0
-rw-r--r--addons/mrp_account/i18n/es_EC.po (renamed from addons/mrp_bom_cost/i18n/es_EC.po)0
-rw-r--r--addons/mrp_account/i18n/es_PA.po (renamed from addons/mrp_bom_cost/i18n/es_PA.po)0
-rw-r--r--addons/mrp_account/i18n/es_PE.po (renamed from addons/mrp_bom_cost/i18n/es_PE.po)0
-rw-r--r--addons/mrp_account/i18n/es_PY.po (renamed from addons/mrp_bom_cost/i18n/es_PY.po)0
-rw-r--r--addons/mrp_account/i18n/es_VE.po (renamed from addons/mrp_bom_cost/i18n/es_VE.po)0
-rw-r--r--addons/mrp_account/i18n/et.po (renamed from addons/mrp_bom_cost/i18n/et.po)0
-rw-r--r--addons/mrp_account/i18n/eu.po (renamed from addons/mrp_bom_cost/i18n/eu.po)0
-rw-r--r--addons/mrp_account/i18n/fa.po (renamed from addons/mrp_bom_cost/i18n/fa.po)0
-rw-r--r--addons/mrp_account/i18n/fi.po (renamed from addons/mrp_bom_cost/i18n/fi.po)0
-rw-r--r--addons/mrp_account/i18n/fo.po (renamed from addons/mrp_bom_cost/i18n/fo.po)0
-rw-r--r--addons/mrp_account/i18n/fr.po (renamed from addons/mrp_bom_cost/i18n/fr.po)0
-rw-r--r--addons/mrp_account/i18n/fr_BE.po (renamed from addons/mrp_bom_cost/i18n/fr_BE.po)0
-rw-r--r--addons/mrp_account/i18n/fr_CA.po (renamed from addons/mrp_bom_cost/i18n/fr_CA.po)0
-rw-r--r--addons/mrp_account/i18n/gl.po (renamed from addons/mrp_bom_cost/i18n/gl.po)0
-rw-r--r--addons/mrp_account/i18n/gu.po (renamed from addons/mrp_bom_cost/i18n/gu.po)0
-rw-r--r--addons/mrp_account/i18n/he.po (renamed from addons/mrp_bom_cost/i18n/he.po)0
-rw-r--r--addons/mrp_account/i18n/hi.po (renamed from addons/mrp_bom_cost/i18n/hi.po)0
-rw-r--r--addons/mrp_account/i18n/hr.po (renamed from addons/mrp_bom_cost/i18n/hr.po)0
-rw-r--r--addons/mrp_account/i18n/hu.po (renamed from addons/mrp_bom_cost/i18n/hu.po)0
-rw-r--r--addons/mrp_account/i18n/id.po (renamed from addons/mrp_bom_cost/i18n/id.po)0
-rw-r--r--addons/mrp_account/i18n/is.po (renamed from addons/mrp_bom_cost/i18n/is.po)0
-rw-r--r--addons/mrp_account/i18n/it.po (renamed from addons/mrp_bom_cost/i18n/it.po)0
-rw-r--r--addons/mrp_account/i18n/ja.po (renamed from addons/mrp_bom_cost/i18n/ja.po)0
-rw-r--r--addons/mrp_account/i18n/ka.po (renamed from addons/mrp_bom_cost/i18n/ka.po)0
-rw-r--r--addons/mrp_account/i18n/kab.po (renamed from addons/mrp_bom_cost/i18n/kab.po)0
-rw-r--r--addons/mrp_account/i18n/km.po (renamed from addons/mrp_bom_cost/i18n/km.po)0
-rw-r--r--addons/mrp_account/i18n/ko.po (renamed from addons/mrp_bom_cost/i18n/ko.po)0
-rw-r--r--addons/mrp_account/i18n/lt.po (renamed from addons/mrp_bom_cost/i18n/lt.po)0
-rw-r--r--addons/mrp_account/i18n/lv.po (renamed from addons/mrp_bom_cost/i18n/lv.po)0
-rw-r--r--addons/mrp_account/i18n/mk.po (renamed from addons/mrp_bom_cost/i18n/mk.po)0
-rw-r--r--addons/mrp_account/i18n/ml_IN.po (renamed from addons/mrp_bom_cost/i18n/ml_IN.po)0
-rw-r--r--addons/mrp_account/i18n/mn.po (renamed from addons/mrp_bom_cost/i18n/mn.po)0
-rw-r--r--addons/mrp_account/i18n/mrp_bom_cost.pot (renamed from addons/mrp_bom_cost/i18n/mrp_bom_cost.pot)0
-rw-r--r--addons/mrp_account/i18n/nb.po (renamed from addons/mrp_bom_cost/i18n/nb.po)0
-rw-r--r--addons/mrp_account/i18n/nl.po (renamed from addons/mrp_bom_cost/i18n/nl.po)0
-rw-r--r--addons/mrp_account/i18n/nl_BE.po (renamed from addons/mrp_bom_cost/i18n/nl_BE.po)0
-rw-r--r--addons/mrp_account/i18n/pl.po (renamed from addons/mrp_bom_cost/i18n/pl.po)0
-rw-r--r--addons/mrp_account/i18n/pt.po (renamed from addons/mrp_bom_cost/i18n/pt.po)0
-rw-r--r--addons/mrp_account/i18n/pt_BR.po (renamed from addons/mrp_bom_cost/i18n/pt_BR.po)0
-rw-r--r--addons/mrp_account/i18n/ro.po (renamed from addons/mrp_bom_cost/i18n/ro.po)0
-rw-r--r--addons/mrp_account/i18n/ru.po (renamed from addons/mrp_bom_cost/i18n/ru.po)0
-rw-r--r--addons/mrp_account/i18n/sk.po (renamed from addons/mrp_bom_cost/i18n/sk.po)0
-rw-r--r--addons/mrp_account/i18n/sl.po (renamed from addons/mrp_bom_cost/i18n/sl.po)0
-rw-r--r--addons/mrp_account/i18n/sq.po (renamed from addons/mrp_bom_cost/i18n/sq.po)0
-rw-r--r--addons/mrp_account/i18n/sr.po (renamed from addons/mrp_bom_cost/i18n/sr.po)0
-rw-r--r--addons/mrp_account/i18n/sr@latin.po (renamed from addons/mrp_bom_cost/i18n/sr@latin.po)0
-rw-r--r--addons/mrp_account/i18n/sv.po (renamed from addons/mrp_bom_cost/i18n/sv.po)0
-rw-r--r--addons/mrp_account/i18n/ta.po (renamed from addons/mrp_bom_cost/i18n/ta.po)0
-rw-r--r--addons/mrp_account/i18n/th.po (renamed from addons/mrp_bom_cost/i18n/th.po)0
-rw-r--r--addons/mrp_account/i18n/tr.po (renamed from addons/mrp_bom_cost/i18n/tr.po)0
-rw-r--r--addons/mrp_account/i18n/uk.po (renamed from addons/mrp_bom_cost/i18n/uk.po)0
-rw-r--r--addons/mrp_account/i18n/vi.po (renamed from addons/mrp_bom_cost/i18n/vi.po)0
-rw-r--r--addons/mrp_account/i18n/zh_CN.po (renamed from addons/mrp_bom_cost/i18n/zh_CN.po)0
-rw-r--r--addons/mrp_account/i18n/zh_TW.po (renamed from addons/mrp_bom_cost/i18n/zh_TW.po)0
-rw-r--r--addons/mrp_account/models/__init__.py1
-rw-r--r--addons/mrp_account/models/product.py (renamed from addons/mrp_bom_cost/models/product.py)0
-rw-r--r--addons/mrp_account/tests/__init__.py1
-rw-r--r--addons/mrp_account/tests/test_bom_price.py (renamed from addons/mrp_bom_cost/tests/test_bom_price.py)0
-rw-r--r--addons/mrp_account/views/product_views.xml (renamed from addons/mrp_bom_cost/views/product_views.xml)0
-rw-r--r--addons/mrp_bom_cost/__init__.py4
-rw-r--r--addons/mrp_bom_cost/__manifest__.py20
-rw-r--r--addons/mrp_bom_cost/models/__init__.py4
-rw-r--r--addons/mrp_bom_cost/tests/__init__.py3
84 files changed, 10 insertions, 31 deletions
diff --git a/addons/mrp_account/__manifest__.py b/addons/mrp_account/__manifest__.py
index de72516401a..f16c781339f 100644
--- a/addons/mrp_account/__manifest__.py
+++ b/addons/mrp_account/__manifest__.py
@@ -11,9 +11,17 @@ Analytic Accounting in MRP
==========================
* Cost structure report
+
+Also, allows to compute the cost of the product based on its BoM, using the costs of its components and work center operations.
+It adds a button on the product itself but also an action in the list view of the products.
+If the automated inventory valuation is active, the necessary accounting entries will be created.
+
""",
'website': 'https://www.odoo.com/page/manufacturing',
'depends': ['mrp', 'stock_account'],
+ "init_xml" : [],
+ "demo_xml" : [],
+ "data": ["views/product_views.xml"],
'installable': True,
'auto_install': True,
}
diff --git a/addons/mrp_bom_cost/i18n/af.po b/addons/mrp_account/i18n/af.po
index 2648cad8acc..2648cad8acc 100644
--- a/addons/mrp_bom_cost/i18n/af.po
+++ b/addons/mrp_account/i18n/af.po
diff --git a/addons/mrp_bom_cost/i18n/am.po b/addons/mrp_account/i18n/am.po
index 5d3c5b4170f..5d3c5b4170f 100644
--- a/addons/mrp_bom_cost/i18n/am.po
+++ b/addons/mrp_account/i18n/am.po
diff --git a/addons/mrp_bom_cost/i18n/ar.po b/addons/mrp_account/i18n/ar.po
index 09e8be7c35a..09e8be7c35a 100644
--- a/addons/mrp_bom_cost/i18n/ar.po
+++ b/addons/mrp_account/i18n/ar.po
diff --git a/addons/mrp_bom_cost/i18n/az.po b/addons/mrp_account/i18n/az.po
index 2ff8f213aa0..2ff8f213aa0 100644
--- a/addons/mrp_bom_cost/i18n/az.po
+++ b/addons/mrp_account/i18n/az.po
diff --git a/addons/mrp_bom_cost/i18n/bg.po b/addons/mrp_account/i18n/bg.po
index ef6a85fd4b6..ef6a85fd4b6 100644
--- a/addons/mrp_bom_cost/i18n/bg.po
+++ b/addons/mrp_account/i18n/bg.po
diff --git a/addons/mrp_bom_cost/i18n/bs.po b/addons/mrp_account/i18n/bs.po
index 9b1dcccbc2d..9b1dcccbc2d 100644
--- a/addons/mrp_bom_cost/i18n/bs.po
+++ b/addons/mrp_account/i18n/bs.po
diff --git a/addons/mrp_bom_cost/i18n/ca.po b/addons/mrp_account/i18n/ca.po
index 06e0594ea6f..06e0594ea6f 100644
--- a/addons/mrp_bom_cost/i18n/ca.po
+++ b/addons/mrp_account/i18n/ca.po
diff --git a/addons/mrp_bom_cost/i18n/cs.po b/addons/mrp_account/i18n/cs.po
index 2459893a66f..2459893a66f 100644
--- a/addons/mrp_bom_cost/i18n/cs.po
+++ b/addons/mrp_account/i18n/cs.po
diff --git a/addons/mrp_bom_cost/i18n/da.po b/addons/mrp_account/i18n/da.po
index bb17e8792c1..bb17e8792c1 100644
--- a/addons/mrp_bom_cost/i18n/da.po
+++ b/addons/mrp_account/i18n/da.po
diff --git a/addons/mrp_bom_cost/i18n/de.po b/addons/mrp_account/i18n/de.po
index 2a3baed88ae..2a3baed88ae 100644
--- a/addons/mrp_bom_cost/i18n/de.po
+++ b/addons/mrp_account/i18n/de.po
diff --git a/addons/mrp_bom_cost/i18n/el.po b/addons/mrp_account/i18n/el.po
index 65ea76af878..65ea76af878 100644
--- a/addons/mrp_bom_cost/i18n/el.po
+++ b/addons/mrp_account/i18n/el.po
diff --git a/addons/mrp_bom_cost/i18n/en_AU.po b/addons/mrp_account/i18n/en_AU.po
index 4ca96b5424b..4ca96b5424b 100644
--- a/addons/mrp_bom_cost/i18n/en_AU.po
+++ b/addons/mrp_account/i18n/en_AU.po
diff --git a/addons/mrp_bom_cost/i18n/en_GB.po b/addons/mrp_account/i18n/en_GB.po
index eadce8a6204..eadce8a6204 100644
--- a/addons/mrp_bom_cost/i18n/en_GB.po
+++ b/addons/mrp_account/i18n/en_GB.po
diff --git a/addons/mrp_bom_cost/i18n/es.po b/addons/mrp_account/i18n/es.po
index 8fe536bc26c..8fe536bc26c 100644
--- a/addons/mrp_bom_cost/i18n/es.po
+++ b/addons/mrp_account/i18n/es.po
diff --git a/addons/mrp_bom_cost/i18n/es_AR.po b/addons/mrp_account/i18n/es_AR.po
index 5eb4de4bf8d..5eb4de4bf8d 100644
--- a/addons/mrp_bom_cost/i18n/es_AR.po
+++ b/addons/mrp_account/i18n/es_AR.po
diff --git a/addons/mrp_bom_cost/i18n/es_BO.po b/addons/mrp_account/i18n/es_BO.po
index b3b6bede430..b3b6bede430 100644
--- a/addons/mrp_bom_cost/i18n/es_BO.po
+++ b/addons/mrp_account/i18n/es_BO.po
diff --git a/addons/mrp_bom_cost/i18n/es_CL.po b/addons/mrp_account/i18n/es_CL.po
index 8b70627f8b2..8b70627f8b2 100644
--- a/addons/mrp_bom_cost/i18n/es_CL.po
+++ b/addons/mrp_account/i18n/es_CL.po
diff --git a/addons/mrp_bom_cost/i18n/es_CO.po b/addons/mrp_account/i18n/es_CO.po
index 0d1d6a29ed4..0d1d6a29ed4 100644
--- a/addons/mrp_bom_cost/i18n/es_CO.po
+++ b/addons/mrp_account/i18n/es_CO.po
diff --git a/addons/mrp_bom_cost/i18n/es_CR.po b/addons/mrp_account/i18n/es_CR.po
index 0449a415ade..0449a415ade 100644
--- a/addons/mrp_bom_cost/i18n/es_CR.po
+++ b/addons/mrp_account/i18n/es_CR.po
diff --git a/addons/mrp_bom_cost/i18n/es_DO.po b/addons/mrp_account/i18n/es_DO.po
index f5937b96b78..f5937b96b78 100644
--- a/addons/mrp_bom_cost/i18n/es_DO.po
+++ b/addons/mrp_account/i18n/es_DO.po
diff --git a/addons/mrp_bom_cost/i18n/es_EC.po b/addons/mrp_account/i18n/es_EC.po
index dde4f3fbb6d..dde4f3fbb6d 100644
--- a/addons/mrp_bom_cost/i18n/es_EC.po
+++ b/addons/mrp_account/i18n/es_EC.po
diff --git a/addons/mrp_bom_cost/i18n/es_PA.po b/addons/mrp_account/i18n/es_PA.po
index f47e07a3f46..f47e07a3f46 100644
--- a/addons/mrp_bom_cost/i18n/es_PA.po
+++ b/addons/mrp_account/i18n/es_PA.po
diff --git a/addons/mrp_bom_cost/i18n/es_PE.po b/addons/mrp_account/i18n/es_PE.po
index df0a7f9c587..df0a7f9c587 100644
--- a/addons/mrp_bom_cost/i18n/es_PE.po
+++ b/addons/mrp_account/i18n/es_PE.po
diff --git a/addons/mrp_bom_cost/i18n/es_PY.po b/addons/mrp_account/i18n/es_PY.po
index de478ffc220..de478ffc220 100644
--- a/addons/mrp_bom_cost/i18n/es_PY.po
+++ b/addons/mrp_account/i18n/es_PY.po
diff --git a/addons/mrp_bom_cost/i18n/es_VE.po b/addons/mrp_account/i18n/es_VE.po
index a26a837563d..a26a837563d 100644
--- a/addons/mrp_bom_cost/i18n/es_VE.po
+++ b/addons/mrp_account/i18n/es_VE.po
diff --git a/addons/mrp_bom_cost/i18n/et.po b/addons/mrp_account/i18n/et.po
index 3299ecf10f8..3299ecf10f8 100644
--- a/addons/mrp_bom_cost/i18n/et.po
+++ b/addons/mrp_account/i18n/et.po
diff --git a/addons/mrp_bom_cost/i18n/eu.po b/addons/mrp_account/i18n/eu.po
index 2beb379b1f4..2beb379b1f4 100644
--- a/addons/mrp_bom_cost/i18n/eu.po
+++ b/addons/mrp_account/i18n/eu.po
diff --git a/addons/mrp_bom_cost/i18n/fa.po b/addons/mrp_account/i18n/fa.po
index f48f7a09d56..f48f7a09d56 100644
--- a/addons/mrp_bom_cost/i18n/fa.po
+++ b/addons/mrp_account/i18n/fa.po
diff --git a/addons/mrp_bom_cost/i18n/fi.po b/addons/mrp_account/i18n/fi.po
index d1009cceea2..d1009cceea2 100644
--- a/addons/mrp_bom_cost/i18n/fi.po
+++ b/addons/mrp_account/i18n/fi.po
diff --git a/addons/mrp_bom_cost/i18n/fo.po b/addons/mrp_account/i18n/fo.po
index 7cd21d039ba..7cd21d039ba 100644
--- a/addons/mrp_bom_cost/i18n/fo.po
+++ b/addons/mrp_account/i18n/fo.po
diff --git a/addons/mrp_bom_cost/i18n/fr.po b/addons/mrp_account/i18n/fr.po
index 77139b58ca2..77139b58ca2 100644
--- a/addons/mrp_bom_cost/i18n/fr.po
+++ b/addons/mrp_account/i18n/fr.po
diff --git a/addons/mrp_bom_cost/i18n/fr_BE.po b/addons/mrp_account/i18n/fr_BE.po
index e55fc858917..e55fc858917 100644
--- a/addons/mrp_bom_cost/i18n/fr_BE.po
+++ b/addons/mrp_account/i18n/fr_BE.po
diff --git a/addons/mrp_bom_cost/i18n/fr_CA.po b/addons/mrp_account/i18n/fr_CA.po
index 7fcbfeb4dd0..7fcbfeb4dd0 100644
--- a/addons/mrp_bom_cost/i18n/fr_CA.po
+++ b/addons/mrp_account/i18n/fr_CA.po
diff --git a/addons/mrp_bom_cost/i18n/gl.po b/addons/mrp_account/i18n/gl.po
index 90effc36112..90effc36112 100644
--- a/addons/mrp_bom_cost/i18n/gl.po
+++ b/addons/mrp_account/i18n/gl.po
diff --git a/addons/mrp_bom_cost/i18n/gu.po b/addons/mrp_account/i18n/gu.po
index 5318cab44f7..5318cab44f7 100644
--- a/addons/mrp_bom_cost/i18n/gu.po
+++ b/addons/mrp_account/i18n/gu.po
diff --git a/addons/mrp_bom_cost/i18n/he.po b/addons/mrp_account/i18n/he.po
index e25417b4158..e25417b4158 100644
--- a/addons/mrp_bom_cost/i18n/he.po
+++ b/addons/mrp_account/i18n/he.po
diff --git a/addons/mrp_bom_cost/i18n/hi.po b/addons/mrp_account/i18n/hi.po
index 10f0c6a5d6a..10f0c6a5d6a 100644
--- a/addons/mrp_bom_cost/i18n/hi.po
+++ b/addons/mrp_account/i18n/hi.po
diff --git a/addons/mrp_bom_cost/i18n/hr.po b/addons/mrp_account/i18n/hr.po
index be54899ace0..be54899ace0 100644
--- a/addons/mrp_bom_cost/i18n/hr.po
+++ b/addons/mrp_account/i18n/hr.po
diff --git a/addons/mrp_bom_cost/i18n/hu.po b/addons/mrp_account/i18n/hu.po
index 8dc65f3ac31..8dc65f3ac31 100644
--- a/addons/mrp_bom_cost/i18n/hu.po
+++ b/addons/mrp_account/i18n/hu.po
diff --git a/addons/mrp_bom_cost/i18n/id.po b/addons/mrp_account/i18n/id.po
index 069da6bf236..069da6bf236 100644
--- a/addons/mrp_bom_cost/i18n/id.po
+++ b/addons/mrp_account/i18n/id.po
diff --git a/addons/mrp_bom_cost/i18n/is.po b/addons/mrp_account/i18n/is.po
index 06460d0ddd6..06460d0ddd6 100644
--- a/addons/mrp_bom_cost/i18n/is.po
+++ b/addons/mrp_account/i18n/is.po
diff --git a/addons/mrp_bom_cost/i18n/it.po b/addons/mrp_account/i18n/it.po
index 60e88a9276c..60e88a9276c 100644
--- a/addons/mrp_bom_cost/i18n/it.po
+++ b/addons/mrp_account/i18n/it.po
diff --git a/addons/mrp_bom_cost/i18n/ja.po b/addons/mrp_account/i18n/ja.po
index 1302d0603b3..1302d0603b3 100644
--- a/addons/mrp_bom_cost/i18n/ja.po
+++ b/addons/mrp_account/i18n/ja.po
diff --git a/addons/mrp_bom_cost/i18n/ka.po b/addons/mrp_account/i18n/ka.po
index e45a95db5f7..e45a95db5f7 100644
--- a/addons/mrp_bom_cost/i18n/ka.po
+++ b/addons/mrp_account/i18n/ka.po
diff --git a/addons/mrp_bom_cost/i18n/kab.po b/addons/mrp_account/i18n/kab.po
index 802594a8717..802594a8717 100644
--- a/addons/mrp_bom_cost/i18n/kab.po
+++ b/addons/mrp_account/i18n/kab.po
diff --git a/addons/mrp_bom_cost/i18n/km.po b/addons/mrp_account/i18n/km.po
index 9e98cabb7b8..9e98cabb7b8 100644
--- a/addons/mrp_bom_cost/i18n/km.po
+++ b/addons/mrp_account/i18n/km.po
diff --git a/addons/mrp_bom_cost/i18n/ko.po b/addons/mrp_account/i18n/ko.po
index e9fbd83692b..e9fbd83692b 100644
--- a/addons/mrp_bom_cost/i18n/ko.po
+++ b/addons/mrp_account/i18n/ko.po
diff --git a/addons/mrp_bom_cost/i18n/lt.po b/addons/mrp_account/i18n/lt.po
index 0d690e44141..0d690e44141 100644
--- a/addons/mrp_bom_cost/i18n/lt.po
+++ b/addons/mrp_account/i18n/lt.po
diff --git a/addons/mrp_bom_cost/i18n/lv.po b/addons/mrp_account/i18n/lv.po
index ac89b2377d8..ac89b2377d8 100644
--- a/addons/mrp_bom_cost/i18n/lv.po
+++ b/addons/mrp_account/i18n/lv.po
diff --git a/addons/mrp_bom_cost/i18n/mk.po b/addons/mrp_account/i18n/mk.po
index ac6bce5f893..ac6bce5f893 100644
--- a/addons/mrp_bom_cost/i18n/mk.po
+++ b/addons/mrp_account/i18n/mk.po
diff --git a/addons/mrp_bom_cost/i18n/ml_IN.po b/addons/mrp_account/i18n/ml_IN.po
index 66841650611..66841650611 100644
--- a/addons/mrp_bom_cost/i18n/ml_IN.po
+++ b/addons/mrp_account/i18n/ml_IN.po
diff --git a/addons/mrp_bom_cost/i18n/mn.po b/addons/mrp_account/i18n/mn.po
index 1dfdc49cc02..1dfdc49cc02 100644
--- a/addons/mrp_bom_cost/i18n/mn.po
+++ b/addons/mrp_account/i18n/mn.po
diff --git a/addons/mrp_bom_cost/i18n/mrp_bom_cost.pot b/addons/mrp_account/i18n/mrp_bom_cost.pot
index b68b59bd9b2..b68b59bd9b2 100644
--- a/addons/mrp_bom_cost/i18n/mrp_bom_cost.pot
+++ b/addons/mrp_account/i18n/mrp_bom_cost.pot
diff --git a/addons/mrp_bom_cost/i18n/nb.po b/addons/mrp_account/i18n/nb.po
index d48832e5846..d48832e5846 100644
--- a/addons/mrp_bom_cost/i18n/nb.po
+++ b/addons/mrp_account/i18n/nb.po
diff --git a/addons/mrp_bom_cost/i18n/nl.po b/addons/mrp_account/i18n/nl.po
index 3318c816ac5..3318c816ac5 100644
--- a/addons/mrp_bom_cost/i18n/nl.po
+++ b/addons/mrp_account/i18n/nl.po
diff --git a/addons/mrp_bom_cost/i18n/nl_BE.po b/addons/mrp_account/i18n/nl_BE.po
index ca0515cb886..ca0515cb886 100644
--- a/addons/mrp_bom_cost/i18n/nl_BE.po
+++ b/addons/mrp_account/i18n/nl_BE.po
diff --git a/addons/mrp_bom_cost/i18n/pl.po b/addons/mrp_account/i18n/pl.po
index 6036d13d6a9..6036d13d6a9 100644
--- a/addons/mrp_bom_cost/i18n/pl.po
+++ b/addons/mrp_account/i18n/pl.po
diff --git a/addons/mrp_bom_cost/i18n/pt.po b/addons/mrp_account/i18n/pt.po
index ca48eb938d0..ca48eb938d0 100644
--- a/addons/mrp_bom_cost/i18n/pt.po
+++ b/addons/mrp_account/i18n/pt.po
diff --git a/addons/mrp_bom_cost/i18n/pt_BR.po b/addons/mrp_account/i18n/pt_BR.po
index 7ff346261d4..7ff346261d4 100644
--- a/addons/mrp_bom_cost/i18n/pt_BR.po
+++ b/addons/mrp_account/i18n/pt_BR.po
diff --git a/addons/mrp_bom_cost/i18n/ro.po b/addons/mrp_account/i18n/ro.po
index 2839b4957aa..2839b4957aa 100644
--- a/addons/mrp_bom_cost/i18n/ro.po
+++ b/addons/mrp_account/i18n/ro.po
diff --git a/addons/mrp_bom_cost/i18n/ru.po b/addons/mrp_account/i18n/ru.po
index 619c0355aee..619c0355aee 100644
--- a/addons/mrp_bom_cost/i18n/ru.po
+++ b/addons/mrp_account/i18n/ru.po
diff --git a/addons/mrp_bom_cost/i18n/sk.po b/addons/mrp_account/i18n/sk.po
index 478a4ac4789..478a4ac4789 100644
--- a/addons/mrp_bom_cost/i18n/sk.po
+++ b/addons/mrp_account/i18n/sk.po
diff --git a/addons/mrp_bom_cost/i18n/sl.po b/addons/mrp_account/i18n/sl.po
index 69a95cc1a7a..69a95cc1a7a 100644
--- a/addons/mrp_bom_cost/i18n/sl.po
+++ b/addons/mrp_account/i18n/sl.po
diff --git a/addons/mrp_bom_cost/i18n/sq.po b/addons/mrp_account/i18n/sq.po
index 33f6cf377f5..33f6cf377f5 100644
--- a/addons/mrp_bom_cost/i18n/sq.po
+++ b/addons/mrp_account/i18n/sq.po
diff --git a/addons/mrp_bom_cost/i18n/sr.po b/addons/mrp_account/i18n/sr.po
index 240c19490e4..240c19490e4 100644
--- a/addons/mrp_bom_cost/i18n/sr.po
+++ b/addons/mrp_account/i18n/sr.po
diff --git a/addons/mrp_bom_cost/i18n/sr@latin.po b/addons/mrp_account/i18n/sr@latin.po
index 8c94ffb5128..8c94ffb5128 100644
--- a/addons/mrp_bom_cost/i18n/sr@latin.po
+++ b/addons/mrp_account/i18n/sr@latin.po
diff --git a/addons/mrp_bom_cost/i18n/sv.po b/addons/mrp_account/i18n/sv.po
index 0aa14acc69c..0aa14acc69c 100644
--- a/addons/mrp_bom_cost/i18n/sv.po
+++ b/addons/mrp_account/i18n/sv.po
diff --git a/addons/mrp_bom_cost/i18n/ta.po b/addons/mrp_account/i18n/ta.po
index f3425812132..f3425812132 100644
--- a/addons/mrp_bom_cost/i18n/ta.po
+++ b/addons/mrp_account/i18n/ta.po
diff --git a/addons/mrp_bom_cost/i18n/th.po b/addons/mrp_account/i18n/th.po
index 9827f2a0b60..9827f2a0b60 100644
--- a/addons/mrp_bom_cost/i18n/th.po
+++ b/addons/mrp_account/i18n/th.po
diff --git a/addons/mrp_bom_cost/i18n/tr.po b/addons/mrp_account/i18n/tr.po
index f5c31a3119b..f5c31a3119b 100644
--- a/addons/mrp_bom_cost/i18n/tr.po
+++ b/addons/mrp_account/i18n/tr.po
diff --git a/addons/mrp_bom_cost/i18n/uk.po b/addons/mrp_account/i18n/uk.po
index eb7d8b4d891..eb7d8b4d891 100644
--- a/addons/mrp_bom_cost/i18n/uk.po
+++ b/addons/mrp_account/i18n/uk.po
diff --git a/addons/mrp_bom_cost/i18n/vi.po b/addons/mrp_account/i18n/vi.po
index 50d7c07f525..50d7c07f525 100644
--- a/addons/mrp_bom_cost/i18n/vi.po
+++ b/addons/mrp_account/i18n/vi.po
diff --git a/addons/mrp_bom_cost/i18n/zh_CN.po b/addons/mrp_account/i18n/zh_CN.po
index 49c380d0d11..49c380d0d11 100644
--- a/addons/mrp_bom_cost/i18n/zh_CN.po
+++ b/addons/mrp_account/i18n/zh_CN.po
diff --git a/addons/mrp_bom_cost/i18n/zh_TW.po b/addons/mrp_account/i18n/zh_TW.po
index 5c3e4230a2b..5c3e4230a2b 100644
--- a/addons/mrp_bom_cost/i18n/zh_TW.po
+++ b/addons/mrp_account/i18n/zh_TW.po
diff --git a/addons/mrp_account/models/__init__.py b/addons/mrp_account/models/__init__.py
index 872a43b7fff..348a288235b 100644
--- a/addons/mrp_account/models/__init__.py
+++ b/addons/mrp_account/models/__init__.py
@@ -2,3 +2,4 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import mrp_workcenter
from . import mrp_production
+from . import product
diff --git a/addons/mrp_bom_cost/models/product.py b/addons/mrp_account/models/product.py
index 9af9b84d9d6..9af9b84d9d6 100644
--- a/addons/mrp_bom_cost/models/product.py
+++ b/addons/mrp_account/models/product.py
diff --git a/addons/mrp_account/tests/__init__.py b/addons/mrp_account/tests/__init__.py
index 5b2f06a99ce..349bd9d4fed 100644
--- a/addons/mrp_account/tests/__init__.py
+++ b/addons/mrp_account/tests/__init__.py
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from . import test_mrp_account
+from . import test_bom_price
diff --git a/addons/mrp_bom_cost/tests/test_bom_price.py b/addons/mrp_account/tests/test_bom_price.py
index c91f6203bca..c91f6203bca 100644
--- a/addons/mrp_bom_cost/tests/test_bom_price.py
+++ b/addons/mrp_account/tests/test_bom_price.py
diff --git a/addons/mrp_bom_cost/views/product_views.xml b/addons/mrp_account/views/product_views.xml
index 262a6675198..262a6675198 100644
--- a/addons/mrp_bom_cost/views/product_views.xml
+++ b/addons/mrp_account/views/product_views.xml
diff --git a/addons/mrp_bom_cost/__init__.py b/addons/mrp_bom_cost/__init__.py
deleted file mode 100644
index dc5e6b693d1..00000000000
--- a/addons/mrp_bom_cost/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import models
diff --git a/addons/mrp_bom_cost/__manifest__.py b/addons/mrp_bom_cost/__manifest__.py
deleted file mode 100644
index a8cec0d91b6..00000000000
--- a/addons/mrp_bom_cost/__manifest__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-{
- "name" : "Product Extension: Compute cost from BoM",
- "version" : "1.0",
- "depends" : ["mrp", "stock_account"],
- "category" : "Manufacturing",
- "description": """
-Allows to compute the cost of the product based on its BoM,
-using the costs of its components and work center operations.
-It adds a button on the product itself but also an action in the list view of the products.
-If the automated inventory valuation is active, the necessary accounting entries will be created.
-""",
- "init_xml" : [],
- "demo_xml" : [],
- "data": ["views/product_views.xml"],
- "active": False,
- "installable": True
-}
diff --git a/addons/mrp_bom_cost/models/__init__.py b/addons/mrp_bom_cost/models/__init__.py
deleted file mode 100644
index 06ab2512b72..00000000000
--- a/addons/mrp_bom_cost/models/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from . import product \ No newline at end of file
diff --git a/addons/mrp_bom_cost/tests/__init__.py b/addons/mrp_bom_cost/tests/__init__.py
deleted file mode 100644
index 43274d94946..00000000000
--- a/addons/mrp_bom_cost/tests/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from . import test_bom_price