Merge PR #925 into 15.0

Signed-off-by LoisRForgeFlow
This commit is contained in:
OCA-git-bot
2023-06-06 11:00:26 +00:00
20 changed files with 1223 additions and 0 deletions

View File

@@ -0,0 +1,102 @@
============================
Manufacturing Analytic Items
============================
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github
:target: https://github.com/OCA/manufacture/tree/14.0/mrp_account_analytic
:alt: OCA/manufacture
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/manufacture-14-0/manufacture-14-0-mrp_account_analytic
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/129/14.0
:alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5|
Generates Analytic Items during manufacturing operations.
When raw materials are consumed or work center time is recorded,
Analytic Items are created, capturing the corresponding quantity and cost.
**Table of contents**
.. contents::
:local:
Usage
=====
To use:
* On the *Manufacturing Order*, *Miscellaneous* tab, set the Analytic Account to use.
This may correspond to a Project.
On Manufacturing Orders, Analytic Items are automatically generated when:
* Raw materials are consumed, or
* Time is spent on Operations.
To analyze costs:
* Go to *Manufacturing > Reports > Analytic Items*.
The cost data is available there and can be used for analysis.
Bug Tracker
===========
Bugs are tracked on `GitHub Issues <https://github.com/OCA/manufacture/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/manufacture/issues/new?body=module:%20mrp_account_analytic%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Do not contact contributors directly about support or help with technical issues.
Credits
=======
Authors
~~~~~~~
* Open Source Integrators
Contributors
~~~~~~~~~~~~
* Daniel Reis <dreis@opensourceintegrators.com>
Maintainers
~~~~~~~~~~~
This module is maintained by the OCA.
.. image:: https://odoo-community.org/logo.png
:alt: Odoo Community Association
:target: https://odoo-community.org
OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.
.. |maintainer-dreispt| image:: https://github.com/dreispt.png?size=40px
:target: https://github.com/dreispt
:alt: dreispt
Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
|maintainer-dreispt|
This module is part of the `OCA/manufacture <https://github.com/OCA/manufacture/tree/14.0/mrp_account_analytic>`_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

View File

@@ -0,0 +1,4 @@
# Copyright (C) 2021 Open Source Integrators
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from . import models

View File

@@ -0,0 +1,19 @@
# Copyright (C) 2021 Open Source Integrators
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
"name": "Manufacturing Analytic Items",
"summary": "Consuming raw materials and operations generated Analytic Items",
"version": "15.0.1.0.1",
"category": "Manufacturing",
"author": "Open Source Integrators, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/manufacture",
"license": "AGPL-3",
"depends": ["mrp_analytic"],
"data": [
"views/account_analytic_line_view.xml",
],
"installable": True,
"maintainers": ["dreispt"],
"development_status": "Beta",
}

View File

@@ -0,0 +1,98 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_account_analytic
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2022-08-22 21:07+0000\n"
"Last-Translator: Bole <bole@dajmi5.com>\n"
"Language-Team: none\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 4.3.2\n"
#. module: mrp_account_analytic
#: model:ir.actions.act_window,name:mrp_account_analytic.action_new_mrp_analytic_items
#: model:ir.ui.menu,name:mrp_account_analytic.custom_account_analytic_line_menu
msgid "Analytic Items"
msgstr "Analitičke stavke"
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_account_analytic_line
msgid "Analytic Line"
msgstr "Stavka analitike"
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__display_name
#: model:ir.model.fields,field_description:mrp_account_analytic.field_mrp_workcenter_productivity__display_name
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move__display_name
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move_line__display_name
msgid "Display Name"
msgstr "Prikazani naziv"
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__id
#: model:ir.model.fields,field_description:mrp_account_analytic.field_mrp_workcenter_productivity__id
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move__id
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move_line__id
msgid "ID"
msgstr "ID"
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line____last_update
#: model:ir.model.fields,field_description:mrp_account_analytic.field_mrp_workcenter_productivity____last_update
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move____last_update
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move_line____last_update
msgid "Last Modified on"
msgstr ""
#. module: mrp_account_analytic
#: model_terms:ir.ui.view,arch_db:mrp_account_analytic.custom_account_analytic_line_form_ext
msgid "Manufacture"
msgstr ""
#. module: mrp_account_analytic
#: model_terms:ir.ui.view,arch_db:mrp_account_analytic.custom_account_analytic_line_filter_view
msgid "Manufacturing Order"
msgstr ""
#. module: mrp_account_analytic
#: model_terms:ir.ui.view,arch_db:mrp_account_analytic.custom_account_analytic_line_filter_view
msgid "Manufacturing Orders"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_stock_move_line
msgid "Product Moves (Stock Move Line)"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__manufacturing_order_id
msgid "Related Manufacturing Order"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__stock_move_id
msgid "Related Stock Move"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_stock_move
msgid "Stock Move"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__workorder_id
msgid "Work Order"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_mrp_workcenter_productivity
msgid "Workcenter Productivity Log"
msgstr ""

View File

@@ -0,0 +1,97 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_account_analytic
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2022-12-22 13:44+0000\n"
"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
"Language-Team: none\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.14.1\n"
#. module: mrp_account_analytic
#: model:ir.actions.act_window,name:mrp_account_analytic.action_new_mrp_analytic_items
#: model:ir.ui.menu,name:mrp_account_analytic.custom_account_analytic_line_menu
msgid "Analytic Items"
msgstr "Elementi analitica"
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_account_analytic_line
msgid "Analytic Line"
msgstr "Riga analitica"
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__display_name
#: model:ir.model.fields,field_description:mrp_account_analytic.field_mrp_workcenter_productivity__display_name
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move__display_name
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move_line__display_name
msgid "Display Name"
msgstr "Nome visualizzato"
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__id
#: model:ir.model.fields,field_description:mrp_account_analytic.field_mrp_workcenter_productivity__id
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move__id
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move_line__id
msgid "ID"
msgstr "ID"
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line____last_update
#: model:ir.model.fields,field_description:mrp_account_analytic.field_mrp_workcenter_productivity____last_update
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move____last_update
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move_line____last_update
msgid "Last Modified on"
msgstr "Ultima modifica il"
#. module: mrp_account_analytic
#: model_terms:ir.ui.view,arch_db:mrp_account_analytic.custom_account_analytic_line_form_ext
msgid "Manufacture"
msgstr "Produzione"
#. module: mrp_account_analytic
#: model_terms:ir.ui.view,arch_db:mrp_account_analytic.custom_account_analytic_line_filter_view
msgid "Manufacturing Order"
msgstr "Ordine di produzione"
#. module: mrp_account_analytic
#: model_terms:ir.ui.view,arch_db:mrp_account_analytic.custom_account_analytic_line_filter_view
msgid "Manufacturing Orders"
msgstr "Ordini di produzione"
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_stock_move_line
msgid "Product Moves (Stock Move Line)"
msgstr "Movimenti prodotto (riga movimento di magazzino)"
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__manufacturing_order_id
msgid "Related Manufacturing Order"
msgstr "Ordine di produzione relativo"
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__stock_move_id
msgid "Related Stock Move"
msgstr "Movimento di magazzino relativo"
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_stock_move
msgid "Stock Move"
msgstr "Movimento di magazzino"
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__workorder_id
msgid "Work Order"
msgstr "Ordine di lavoro"
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_mrp_workcenter_productivity
msgid "Workcenter Productivity Log"
msgstr "Registro produttività centro di lavoro"

View File

@@ -0,0 +1,94 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * mrp_account_analytic
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: mrp_account_analytic
#: model:ir.actions.act_window,name:mrp_account_analytic.action_new_mrp_analytic_items
#: model:ir.ui.menu,name:mrp_account_analytic.custom_account_analytic_line_menu
msgid "Analytic Items"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_account_analytic_line
msgid "Analytic Line"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__display_name
#: model:ir.model.fields,field_description:mrp_account_analytic.field_mrp_workcenter_productivity__display_name
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move__display_name
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move_line__display_name
msgid "Display Name"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__id
#: model:ir.model.fields,field_description:mrp_account_analytic.field_mrp_workcenter_productivity__id
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move__id
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move_line__id
msgid "ID"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line____last_update
#: model:ir.model.fields,field_description:mrp_account_analytic.field_mrp_workcenter_productivity____last_update
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move____last_update
#: model:ir.model.fields,field_description:mrp_account_analytic.field_stock_move_line____last_update
msgid "Last Modified on"
msgstr ""
#. module: mrp_account_analytic
#: model_terms:ir.ui.view,arch_db:mrp_account_analytic.custom_account_analytic_line_form_ext
msgid "Manufacture"
msgstr ""
#. module: mrp_account_analytic
#: model_terms:ir.ui.view,arch_db:mrp_account_analytic.custom_account_analytic_line_filter_view
msgid "Manufacturing Order"
msgstr ""
#. module: mrp_account_analytic
#: model_terms:ir.ui.view,arch_db:mrp_account_analytic.custom_account_analytic_line_filter_view
msgid "Manufacturing Orders"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_stock_move_line
msgid "Product Moves (Stock Move Line)"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__manufacturing_order_id
msgid "Related Manufacturing Order"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__stock_move_id
msgid "Related Stock Move"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_stock_move
msgid "Stock Move"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model.fields,field_description:mrp_account_analytic.field_account_analytic_line__workorder_id
msgid "Work Order"
msgstr ""
#. module: mrp_account_analytic
#: model:ir.model,name:mrp_account_analytic.model_mrp_workcenter_productivity
msgid "Workcenter Productivity Log"
msgstr ""

View File

@@ -0,0 +1,3 @@
from . import account_analytic_line
from . import mrp_workorder
from . import stock_move

View File

@@ -0,0 +1,21 @@
# Copyright (C) 2020 Open Source Integrators
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import fields, models
class AccountAnalyticLine(models.Model):
_inherit = "account.analytic.line"
manufacturing_order_id = fields.Many2one(
"mrp.production",
string="Related Manufacturing Order",
)
stock_move_id = fields.Many2one(
"stock.move",
string="Related Stock Move",
)
workorder_id = fields.Many2one(
"mrp.workorder",
string="Work Order",
)

View File

@@ -0,0 +1,46 @@
# Copyright (C) 2021 Open Source Integrators
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import api, fields, models
class MrpWorkcenterProductivity(models.Model):
_inherit = "mrp.workcenter.productivity"
def _prepare_mrp_workorder_analytic_item(self):
"""
Prepare additional values for Analytic Items created.
For compatibility with analytic_activity_cost
"""
self.ensure_one()
return {
"name": "{} / {}".format(self.production_id.name, self.workorder_id.name),
"account_id": self.production_id.analytic_account_id.id,
"date": fields.Date.today(),
"company_id": self.company_id.id,
"manufacturing_order_id": self.production_id.id,
"workorder_id": self.workorder_id.id,
"unit_amount": self.duration / 60, # convert minutes to hours
"amount": -self.duration / 60 * self.workcenter_id.costs_hour,
}
def generate_mrp_work_analytic_line(self):
AnalyticLine = self.env["account.analytic.line"].sudo()
for timelog in self:
line_vals = timelog._prepare_mrp_workorder_analytic_item()
analytic_line = AnalyticLine.create(line_vals)
analytic_line.on_change_unit_amount()
@api.model
def create(self, vals):
timelog = super().create(vals)
if vals.get("date_end"):
timelog.generate_mrp_work_analytic_line()
return timelog
def write(self, vals):
res = super().write(vals)
if vals.get("date_end"):
self.generate_mrp_work_analytic_line()
return res

View File

@@ -0,0 +1,82 @@
# Copyright (C) 2021 Open Source Integrators
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
from odoo import api, models
class StockMove(models.Model):
_inherit = "stock.move"
def _prepare_mrp_raw_material_analytic_line(self):
"""
Prepare additional values for Analytic Items created.
"""
self.ensure_one()
move = self
mrp_order = move.raw_material_production_id
return {
"date": move.date,
"name": "{} / {}".format(mrp_order.name, move.product_id.display_name),
"ref": mrp_order.name,
"account_id": mrp_order.analytic_account_id.id,
"manufacturing_order_id": mrp_order.id,
"company_id": mrp_order.company_id.id,
"stock_move_id": move.id,
"product_id": move.product_id.id,
"unit_amount": move.quantity_done,
}
def generate_mrp_raw_analytic_line(self):
"""
Generate Analytic Lines.
One Analytic Item for each Stock Move line.
If the Stock Move is updated, the existing Analytic Item is updated.
"""
AnalyticLine = self.env["account.analytic.line"].sudo()
existing_items = AnalyticLine.search([("stock_move_id", "in", self.ids)])
for move in self.filtered("raw_material_production_id.analytic_account_id"):
line_vals = move._prepare_mrp_raw_material_analytic_line()
if move in existing_items.mapped("stock_move_id"):
analytic_line = existing_items.filtered(
lambda x: x.stock_move_id == move
)
analytic_line.write(line_vals)
analytic_line.on_change_unit_amount()
elif line_vals.get("unit_amount"):
analytic_line = AnalyticLine.create(line_vals)
analytic_line.on_change_unit_amount()
def write(self, vals):
"""When material is consumed, generate Analytic Items"""
res = super().write(vals)
if vals.get("quantity_done"):
self.generate_mrp_raw_analytic_line()
return res
@api.model
def create(self, vals):
qty_done = vals.get("quantity_done")
res = super().create(vals)
if qty_done:
res.generate_mrp_raw_analytic_line()
return res
class StockMoveLine(models.Model):
_inherit = "stock.move.line"
def write(self, vals):
qty_done = vals.get("qty_done")
res = super().write(vals)
if qty_done:
self.mapped("move_id").generate_mrp_raw_analytic_line()
return res
@api.model
def create(self, vals):
qty_done = vals.get("qty_done")
res = super().create(vals)
if qty_done:
res.mapped("move_id").generate_mrp_raw_analytic_line()
return res

View File

@@ -0,0 +1 @@
* Daniel Reis <dreis@opensourceintegrators.com>

View File

@@ -0,0 +1,4 @@
Generates Analytic Items during manufacturing operations.
When raw materials are consumed or work center time is recorded,
Analytic Items are created, capturing the corresponding quantity and cost.

View File

@@ -0,0 +1,14 @@
To use:
* On the *Manufacturing Order*, *Miscellaneous* tab, set the Analytic Account to use.
This may correspond to a Project.
On Manufacturing Orders, Analytic Items are automatically generated when:
* Raw materials are consumed, or
* Time is spent on Operations.
To analyze costs:
* Go to *Manufacturing > Reports > Analytic Items*.
The cost data is available there and can be used for analysis.

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

View File

@@ -0,0 +1,444 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
<title>Manufacturing Analytic Items</title>
<style type="text/css">
/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/
/* used to remove borders from tables and images */
.borderless, table.borderless td, table.borderless th {
border: 0 }
table.borderless td, table.borderless th {
/* Override padding for "table.docutils td" with "! important".
The right padding separates the table cells. */
padding: 0 0.5em 0 0 ! important }
.first {
/* Override more specific margin styles with "! important". */
margin-top: 0 ! important }
.last, .with-subtitle {
margin-bottom: 0 ! important }
.hidden {
display: none }
.subscript {
vertical-align: sub;
font-size: smaller }
.superscript {
vertical-align: super;
font-size: smaller }
a.toc-backref {
text-decoration: none ;
color: black }
blockquote.epigraph {
margin: 2em 5em ; }
dl.docutils dd {
margin-bottom: 0.5em }
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
overflow: hidden;
}
/* Uncomment (and remove this text!) to get bold-faced definition list terms
dl.docutils dt {
font-weight: bold }
*/
div.abstract {
margin: 2em 5em }
div.abstract p.topic-title {
font-weight: bold ;
text-align: center }
div.admonition, div.attention, div.caution, div.danger, div.error,
div.hint, div.important, div.note, div.tip, div.warning {
margin: 2em ;
border: medium outset ;
padding: 1em }
div.admonition p.admonition-title, div.hint p.admonition-title,
div.important p.admonition-title, div.note p.admonition-title,
div.tip p.admonition-title {
font-weight: bold ;
font-family: sans-serif }
div.attention p.admonition-title, div.caution p.admonition-title,
div.danger p.admonition-title, div.error p.admonition-title,
div.warning p.admonition-title, .code .error {
color: red ;
font-weight: bold ;
font-family: sans-serif }
/* Uncomment (and remove this text!) to get reduced vertical space in
compound paragraphs.
div.compound .compound-first, div.compound .compound-middle {
margin-bottom: 0.5em }
div.compound .compound-last, div.compound .compound-middle {
margin-top: 0.5em }
*/
div.dedication {
margin: 2em 5em ;
text-align: center ;
font-style: italic }
div.dedication p.topic-title {
font-weight: bold ;
font-style: normal }
div.figure {
margin-left: 2em ;
margin-right: 2em }
div.footer, div.header {
clear: both;
font-size: smaller }
div.line-block {
display: block ;
margin-top: 1em ;
margin-bottom: 1em }
div.line-block div.line-block {
margin-top: 0 ;
margin-bottom: 0 ;
margin-left: 1.5em }
div.sidebar {
margin: 0 0 0.5em 1em ;
border: medium outset ;
padding: 1em ;
background-color: #ffffee ;
width: 40% ;
float: right ;
clear: right }
div.sidebar p.rubric {
font-family: sans-serif ;
font-size: medium }
div.system-messages {
margin: 5em }
div.system-messages h1 {
color: red }
div.system-message {
border: medium outset ;
padding: 1em }
div.system-message p.system-message-title {
color: red ;
font-weight: bold }
div.topic {
margin: 2em }
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
margin-top: 0.4em }
h1.title {
text-align: center }
h2.subtitle {
text-align: center }
hr.docutils {
width: 75% }
img.align-left, .figure.align-left, object.align-left, table.align-left {
clear: left ;
float: left ;
margin-right: 1em }
img.align-right, .figure.align-right, object.align-right, table.align-right {
clear: right ;
float: right ;
margin-left: 1em }
img.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
}
table.align-center {
margin-left: auto;
margin-right: auto;
}
.align-left {
text-align: left }
.align-center {
clear: both ;
text-align: center }
.align-right {
text-align: right }
/* reset inner alignment in figures */
div.align-right {
text-align: inherit }
/* div.align-center * { */
/* text-align: left } */
.align-top {
vertical-align: top }
.align-middle {
vertical-align: middle }
.align-bottom {
vertical-align: bottom }
ol.simple, ul.simple {
margin-bottom: 1em }
ol.arabic {
list-style: decimal }
ol.loweralpha {
list-style: lower-alpha }
ol.upperalpha {
list-style: upper-alpha }
ol.lowerroman {
list-style: lower-roman }
ol.upperroman {
list-style: upper-roman }
p.attribution {
text-align: right ;
margin-left: 50% }
p.caption {
font-style: italic }
p.credits {
font-style: italic ;
font-size: smaller }
p.label {
white-space: nowrap }
p.rubric {
font-weight: bold ;
font-size: larger ;
color: maroon ;
text-align: center }
p.sidebar-title {
font-family: sans-serif ;
font-weight: bold ;
font-size: larger }
p.sidebar-subtitle {
font-family: sans-serif ;
font-weight: bold }
p.topic-title {
font-weight: bold }
pre.address {
margin-bottom: 0 ;
margin-top: 0 ;
font: inherit }
pre.literal-block, pre.doctest-block, pre.math, pre.code {
margin-left: 2em ;
margin-right: 2em }
pre.code .ln { color: grey; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
pre.code .literal.string, code .literal.string { color: #0C5404 }
pre.code .name.builtin, code .name.builtin { color: #352B84 }
pre.code .deleted, code .deleted { background-color: #DEB0A1}
pre.code .inserted, code .inserted { background-color: #A3D289}
span.classifier {
font-family: sans-serif ;
font-style: oblique }
span.classifier-delimiter {
font-family: sans-serif ;
font-weight: bold }
span.interpreted {
font-family: sans-serif }
span.option {
white-space: nowrap }
span.pre {
white-space: pre }
span.problematic {
color: red }
span.section-subtitle {
/* font-size relative to parent (h1..h6 element) */
font-size: 80% }
table.citation {
border-left: solid 1px gray;
margin-left: 1px }
table.docinfo {
margin: 2em 4em }
table.docutils {
margin-top: 0.5em ;
margin-bottom: 0.5em }
table.footnote {
border-left: solid 1px black;
margin-left: 1px }
table.docutils td, table.docutils th,
table.docinfo td, table.docinfo th {
padding-left: 0.5em ;
padding-right: 0.5em ;
vertical-align: top }
table.docutils th.field-name, table.docinfo th.docinfo-name {
font-weight: bold ;
text-align: left ;
white-space: nowrap ;
padding-left: 0 }
/* "booktabs" style (no vertical lines) */
table.docutils.booktabs {
border: 0px;
border-top: 2px solid;
border-bottom: 2px solid;
border-collapse: collapse;
}
table.docutils.booktabs * {
border: 0px;
}
table.docutils.booktabs th {
border-bottom: thin solid;
text-align: left;
}
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
font-size: 100% }
ul.auto-toc {
list-style-type: none }
</style>
</head>
<body>
<div class="document" id="manufacturing-analytic-items">
<h1 class="title">Manufacturing Analytic Items</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/manufacture/tree/14.0/mrp_account_analytic"><img alt="OCA/manufacture" src="https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/manufacture-14-0/manufacture-14-0-mrp_account_analytic"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/129/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>Generates Analytic Items during manufacturing operations.</p>
<p>When raw materials are consumed or work center time is recorded,
Analytic Items are created, capturing the corresponding quantity and cost.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#id1">Usage</a></h1>
<p>To use:</p>
<ul class="simple">
<li>On the <em>Manufacturing Order</em>, <em>Miscellaneous</em> tab, set the Analytic Account to use.
This may correspond to a Project.</li>
</ul>
<p>On Manufacturing Orders, Analytic Items are automatically generated when:</p>
<blockquote>
<ul class="simple">
<li>Raw materials are consumed, or</li>
<li>Time is spent on Operations.</li>
</ul>
</blockquote>
<p>To analyze costs:</p>
<ul class="simple">
<li>Go to <em>Manufacturing &gt; Reports &gt; Analytic Items</em>.
The cost data is available there and can be used for analysis.</li>
</ul>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/manufacture/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/manufacture/issues/new?body=module:%20mrp_account_analytic%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id3">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id4">Authors</a></h2>
<ul class="simple">
<li>Open Source Integrators</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<ul class="simple">
<li>Daniel Reis &lt;<a class="reference external" href="mailto:dreis&#64;opensourceintegrators.com">dreis&#64;opensourceintegrators.com</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
mission is to support the collaborative development of Odoo features and
promote its widespread use.</p>
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
<p><a class="reference external" href="https://github.com/dreispt"><img alt="dreispt" src="https://github.com/dreispt.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/manufacture/tree/14.0/mrp_account_analytic">OCA/manufacture</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
</div>
</body>
</html>

View File

@@ -0,0 +1 @@
from . import test_mrp_analytic

View File

@@ -0,0 +1,116 @@
from odoo.tests import Form, common
class TestMRP(common.TransactionCase):
"""
Create a Manufacturing Order, with Raw Materials and Operations.
Consuming raw materials generates or updates Analytic Items.
Working on Operations generates or updates Analytic Items.
"""
def setUp(self):
super().setUp()
# Analytic Account
self.analytic_1 = self.env["account.analytic.account"].create({"name": "Job 1"})
# Work Center
self.mrp_workcenter_1 = self.env["mrp.workcenter"].create(
{
"name": "Assembly Line",
"costs_hour": 40,
}
)
# Products
self.product_lemonade = self.env["product.product"].create(
{
"name": "Lemonade",
"type": "product",
"standard_price": 20,
}
)
self.product_lemon = self.env["product.product"].create(
{
"name": "Lemon",
"type": "product",
"standard_price": 1,
}
)
# BOM
self.mrp_bom_lemonade = self.env["mrp.bom"].create(
{
"product_tmpl_id": self.product_lemonade.product_tmpl_id.id,
"operation_ids": [
(
0,
0,
{
"workcenter_id": self.mrp_workcenter_1.id,
"name": "Squeeze Lemons",
"time_cycle": 15,
},
),
],
}
)
self.mrp_bom_lemonade.write(
{
"bom_line_ids": [
(
0,
0,
{
"product_id": self.product_lemon.id,
"product_qty": 4,
},
)
]
}
)
# MO
mo_create_form = Form(self.env["mrp.production"])
mo_create_form.product_id = self.product_lemonade
mo_create_form.bom_id = self.mrp_bom_lemonade
mo_create_form.product_qty = 1
self.mo_lemonade = mo_create_form.save()
self.mo_lemonade.analytic_account_id = self.analytic_1
self.mo_lemonade.action_confirm()
def test_100_one_step_produce(self):
# Form edit the MO and Save
mo_form = Form(self.mo_lemonade)
mo_form.qty_producing = 1
mo_lemonade = mo_form.save()
# Set 15 minutes to work time and "Mark As Done"
mo_lemonade.workorder_ids.duration = 15
mo_lemonade.button_mark_done()
analytic_items = self.env["account.analytic.line"].search(
[("manufacturing_order_id", "=", mo_lemonade.id)]
)
# Expected (4 * 1.00) + (0.25 * 40.00) => 14.00
analytic_qty = sum(analytic_items.mapped("unit_amount"))
self.assertEqual(analytic_qty, 4.25, "Expected Analytic Items total quantity")
analytic_amount = sum(analytic_items.mapped("amount"))
self.assertEqual(
analytic_amount, -14.00, "Expected Analytic Items total amount"
)
def test_110_two_step_produce(self):
# Consume some raw material
self.mo_lemonade.move_raw_ids.write({"quantity_done": 1})
self.mo_lemonade.move_raw_ids.write({"quantity_done": 2})
self.mo_lemonade.move_raw_ids.write({"quantity_done": 4})
# Work on operations up to 15 minutes
self.mo_lemonade.workorder_ids.write({"duration": 5})
self.mo_lemonade.workorder_ids.write({"duration": 10})
self.mo_lemonade.workorder_ids.write({"duration": 15})
analytic_items = self.env["account.analytic.line"].search(
[("manufacturing_order_id", "=", self.mo_lemonade.id)]
)
# Expected (4 * 1.00) + (0.25 * 40.00) => 14.00
analytic_qty = sum(analytic_items.mapped("unit_amount"))
self.assertEqual(analytic_qty, 4.25, "Expected Analytic Items total quantity")
analytic_amount = sum(analytic_items.mapped("amount"))
self.assertEqual(
analytic_amount, -14.00, "Expected Analytic Items total amount"
)

View File

@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="custom_account_analytic_line_tree_ext" model="ir.ui.view">
<field name="name">account.analytic.line.custom.tree</field>
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="analytic.view_account_analytic_line_tree" />
<field name="arch" type="xml">
<field name="account_id" position="after">
<field name="manufacturing_order_id" optional="show" />
<field name="stock_move_id" optional="hide" />
<field name="workorder_id" optional="hide" />
</field>
</field>
</record>
<record id="custom_account_analytic_line_form_ext" model="ir.ui.view">
<field name="name">account.analytic.line.custom.form</field>
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="analytic.view_account_analytic_line_form" />
<field name="arch" type="xml">
<group name="amount" position="after">
<group name="manufacture" string="Manufacture">
<field name="stock_move_id" />
<field name="manufacturing_order_id" />
</group>
</group>
</field>
</record>
<record id="custom_account_analytic_line_filter_view" model="ir.ui.view">
<field name="name">account.analytic.line.custom.filter</field>
<field name="model">account.analytic.line</field>
<field name="inherit_id" ref="analytic.view_account_analytic_line_filter" />
<field name="arch" type="xml">
<filter name="date" position="after">
<filter
name="filter_is_related_to_mo"
string="Manufacturing Orders"
domain="[('manufacturing_order_id','!=',False)]"
/>
<filter
string="Manufacturing Order"
name="group_by_mo"
domain="[]"
context="{'group_by': 'manufacturing_order_id'}"
/>
</filter>
</field>
</record>
<record id="action_new_mrp_analytic_items" model="ir.actions.act_window">
<field name="name">Analytic Items</field>
<field name="res_model">account.analytic.line</field>
<field name="view_mode">tree,kanban,form,graph,pivot</field>
<field name="view_id" ref="analytic.view_account_analytic_line_tree" />
<field name="search_view_id" ref="analytic.view_account_analytic_line_filter" />
<field name="context">{'search_default_filter_is_related_to_mo': True}</field>
</record>
<menuitem
id="custom_account_analytic_line_menu"
name="Analytic Items"
parent="mrp.menu_mrp_reporting"
action="action_new_mrp_analytic_items"
sequence="30"
/>
</odoo>

View File

@@ -0,0 +1 @@
../../../../mrp_account_analytic

View File

@@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)