Skip to content

Commit

Permalink
[14.0][IMP] custom_mrp_descarga: Add new fields in sale report.
Browse files Browse the repository at this point in the history
  • Loading branch information
Berezi committed Jan 30, 2025
1 parent 2fcd6d0 commit bca293c
Show file tree
Hide file tree
Showing 8 changed files with 219 additions and 5 deletions.
3 changes: 2 additions & 1 deletion custom_mrp_descarga/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{
"name": "Custom MRP Descarga",
"version": "14.0.1.0.0",
"version": "14.0.1.1.0",
"category": "MRP",
"license": "AGPL-3",
"author": "AvanzOSC",
Expand Down Expand Up @@ -46,4 +46,5 @@
],
"installable": True,
"auto_install": True,
"pre_init_hook": "pre_init_hook",
}
55 changes: 53 additions & 2 deletions custom_mrp_descarga/i18n/custom_mrp_descarga.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-29 11:09+0000\n"
"PO-Revision-Date: 2024-10-29 11:09+0000\n"
"POT-Creation-Date: 2025-01-30 13:22+0000\n"
"PO-Revision-Date: 2025-01-30 13:22+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -65,6 +65,7 @@ msgid "Assign Serials"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line__lot_average_price
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_move_line__average_price
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_production_lot__average_price
msgid "Average Price"
Expand Down Expand Up @@ -275,6 +276,7 @@ msgstr ""
#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_mrp_production__birth_difference
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_mrp_production__qty_difference
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__difference
msgid "Difference"
msgstr ""

Expand All @@ -293,6 +295,8 @@ msgstr ""
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_quartering_summary_xlsx__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_summary_xlsx__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_saca_line__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_inventory_line__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_move_line__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_production_lot__display_name
Expand Down Expand Up @@ -414,6 +418,8 @@ msgstr ""
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_quartering_summary_xlsx__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_summary_xlsx__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_saca_line__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_inventory_line__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_move_line__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_production_lot__id
Expand Down Expand Up @@ -517,6 +523,8 @@ msgstr ""
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_quartering_summary_xlsx____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_summary_xlsx____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_saca_line____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_inventory_line____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_move_line____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_production_lot____last_update
Expand All @@ -540,10 +548,22 @@ msgid "Last Year"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__lot_id
#: model_terms:ir.ui.view,arch_db:custom_mrp_descarga.view_mrp_production_filter
msgid "Lot"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__lot_average_price
msgid "Lot Average Price"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line__lot_cost
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__lot_cost
msgid "Lot Cost"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model,name:custom_mrp_descarga.model_stock_production_lot
msgid "Lot/Serial"
Expand Down Expand Up @@ -686,6 +706,11 @@ msgstr ""
msgid "Peso medio"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__price_unit
msgid "Price Unit"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_mrp_production__speed_consume_qty
msgid "Produced Kg/Hour"
Expand Down Expand Up @@ -722,6 +747,15 @@ msgstr ""
msgid "Product Unit of Measure"
msgstr ""

#. module: custom_mrp_descarga
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#, python-format
msgid "Product not found, reader information for product code: %(reader)s"
msgstr ""

#. module: custom_mrp_descarga
#: code:addons/custom_mrp_descarga/models/saca_line.py:0
#: code:addons/custom_mrp_descarga/models/saca_line.py:0
Expand Down Expand Up @@ -878,6 +912,16 @@ msgstr ""
msgid "Saca Line"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model,name:custom_mrp_descarga.model_sale_report
msgid "Sales Analysis Report"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model,name:custom_mrp_descarga.model_sale_order_line
msgid "Sales Order Line"
msgstr ""

#. module: custom_mrp_descarga
#: code:addons/custom_mrp_descarga/report/mrp_production_quartering_summary_xlsx.py:0
#: code:addons/custom_mrp_descarga/report/mrp_production_quartering_summary_xlsx.py:0
Expand Down Expand Up @@ -1067,6 +1111,13 @@ msgstr ""
msgid "Unidades"
msgstr ""

#. module: custom_mrp_descarga
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#, python-format
msgid "Unidentified barcode format : %(reader)s"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_mrp_production__unit_difference
msgid "Unit Difference"
Expand Down
55 changes: 53 additions & 2 deletions custom_mrp_descarga/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-10-29 11:09+0000\n"
"PO-Revision-Date: 2024-10-29 11:09+0000\n"
"POT-Creation-Date: 2025-01-30 13:22+0000\n"
"PO-Revision-Date: 2025-01-30 13:22+0000\n"
"Last-Translator: \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -65,6 +65,7 @@ msgid "Assign Serials"
msgstr "Asignar Lotes"

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line__lot_average_price
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_move_line__average_price
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_production_lot__average_price
msgid "Average Price"
Expand Down Expand Up @@ -277,6 +278,7 @@ msgstr ""
#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_mrp_production__birth_difference
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_mrp_production__qty_difference
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__difference
msgid "Difference"
msgstr "Diferencia"

Expand All @@ -295,6 +297,8 @@ msgstr "% diferencia"
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_quartering_summary_xlsx__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_summary_xlsx__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_saca_line__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_inventory_line__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_move_line__display_name
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_production_lot__display_name
Expand Down Expand Up @@ -416,6 +420,8 @@ msgstr "Galllinas"
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_quartering_summary_xlsx__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_summary_xlsx__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_saca_line__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_inventory_line__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_move_line__id
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_production_lot__id
Expand Down Expand Up @@ -519,6 +525,8 @@ msgstr ""
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_quartering_summary_xlsx____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_report_mrp_production_summary_xlsx____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_saca_line____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_inventory_line____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_move_line____last_update
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_stock_production_lot____last_update
Expand All @@ -542,10 +550,22 @@ msgid "Last Year"
msgstr "Último año"

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__lot_id
#: model_terms:ir.ui.view,arch_db:custom_mrp_descarga.view_mrp_production_filter
msgid "Lot"
msgstr "Lote"

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__lot_average_price
msgid "Lot Average Price"
msgstr "Precio medio lote"

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_order_line__lot_cost
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__lot_cost
msgid "Lot Cost"
msgstr "Coste lote"

#. module: custom_mrp_descarga
#: model:ir.model,name:custom_mrp_descarga.model_stock_production_lot
msgid "Lot/Serial"
Expand Down Expand Up @@ -688,6 +708,11 @@ msgstr "Rendimiento"
msgid "Peso medio"
msgstr ""

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_sale_report__price_unit
msgid "Price Unit"
msgstr "Precio unitario"

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_mrp_production__speed_consume_qty
msgid "Produced Kg/Hour"
Expand Down Expand Up @@ -724,6 +749,15 @@ msgstr "Plantilla de producto"
msgid "Product Unit of Measure"
msgstr "UdM de producto"

#. module: custom_mrp_descarga
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#, python-format
msgid "Product not found, reader information for product code: %(reader)s"
msgstr "Producto no encontrado, código de producto del lector: %(reader)s"

#. module: custom_mrp_descarga
#: code:addons/custom_mrp_descarga/models/saca_line.py:0
#: code:addons/custom_mrp_descarga/models/saca_line.py:0
Expand Down Expand Up @@ -880,6 +914,16 @@ msgstr "Fecha de saca"
msgid "Saca Line"
msgstr "Línea de saca"

#. module: custom_mrp_descarga
#: model:ir.model,name:custom_mrp_descarga.model_sale_report
msgid "Sales Analysis Report"
msgstr "Informe de análisis de ventas"

#. module: custom_mrp_descarga
#: model:ir.model,name:custom_mrp_descarga.model_sale_order_line
msgid "Sales Order Line"
msgstr "Línea de pedido de venta"

#. module: custom_mrp_descarga
#: code:addons/custom_mrp_descarga/report/mrp_production_quartering_summary_xlsx.py:0
#: code:addons/custom_mrp_descarga/report/mrp_production_quartering_summary_xlsx.py:0
Expand Down Expand Up @@ -1069,6 +1113,13 @@ msgstr "Importe total"
msgid "Unidades"
msgstr ""

#. module: custom_mrp_descarga
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#: code:addons/custom_mrp_descarga/models/stock_move_line.py:0
#, python-format
msgid "Unidentified barcode format : %(reader)s"
msgstr "Formato de lector indefinido: %(reader)s"

#. module: custom_mrp_descarga
#: model:ir.model.fields,field_description:custom_mrp_descarga.field_mrp_production__unit_difference
msgid "Unit Difference"
Expand Down
42 changes: 42 additions & 0 deletions custom_mrp_descarga/migrations/14.0.1.1.0/pre-migration.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Copyright 2025 Berezi Amubieta - AvanzOSC
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
import logging

from openupgradelib import openupgrade

_logger = logging.getLogger(__name__)


@openupgrade.migrate()
def migrate(env, version):
cr = env.cr
if not openupgrade.column_exists(cr, "sale_order_line", "lot_average_price"):
cr.execute(
"""
ALTER TABLE sale_order_line
ADD COLUMN lot_average_price float;
"""
)
cr.execute(
"""
UPDATE sale_order_line
SET lot_average_price = (SELECT stock_production_lot.average_price
FROM stock_production_lot
WHERE stock_production_lot.id = sale_order_line.lot_id)
"""
)
if not openupgrade.column_exists(cr, "sale_order_line", "lot_cost"):
cr.execute(
"""
ALTER TABLE sale_order_line
ADD COLUMN lot_cost float;
"""
)
cr.execute(
"""
UPDATE sale_order_line
SET lot_cost = (SELECT stock_production_lot.average_price * product_uom_qty
FROM stock_production_lot
WHERE stock_production_lot.id = sale_order_line.lot_id)
"""
)
1 change: 1 addition & 0 deletions custom_mrp_descarga/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@
from . import mrp_bom
from . import stock_inventory_line
from . import mrp_workorder
from . import sale_order_line
19 changes: 19 additions & 0 deletions custom_mrp_descarga/models/sale_order_line.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Copyright 2022 Berezi Amubieta - AvanzOSC
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from odoo import api, fields, models


class SaleOrderLine(models.Model):
_inherit = "sale.order.line"

lot_average_price = fields.Float(
digits="MRP Price Decimal Precision",
related="lot_id.average_price",
store=True,
)
lot_cost = fields.Float(compute="_compute_lot_cost", store=True)

@api.depends("lot_average_price", "product_uom_qty")
def _compute_lot_cost(self):
for line in self:
line.lot_cost = line.lot_average_price * line.product_uom_qty
1 change: 1 addition & 0 deletions custom_mrp_descarga/report/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
from . import mrp_production_summary_xlsx
from . import mrp_production_quartering_summary_xlsx
from . import sale_report
Loading

0 comments on commit bca293c

Please sign in to comment.