Skip to content

Commit

Permalink
[MIG] mrp_subcontracting_purchase: Adapt to OCA guidelines + initial …
Browse files Browse the repository at this point in the history
…work
  • Loading branch information
geomer198 committed Oct 13, 2023
1 parent d59b6b6 commit 89fd156
Show file tree
Hide file tree
Showing 12 changed files with 118 additions and 73 deletions.
Empty file.
1 change: 0 additions & 1 deletion mrp_subcontracting_purchase/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

from . import models
25 changes: 13 additions & 12 deletions mrp_subcontracting_purchase/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

{
'name': 'Purchase and Subcontracting Management',
'version': '0.1',
'category': 'Manufacturing/Purchase',
'description': """
"name": "Purchase and Subcontracting Management",
"version": "14.0.1.0.0",
"category": "Manufacturing/Purchase",
"summary": """
This bridge module adds some smart buttons between Purchase and Subcontracting
""",
'depends': ['mrp_subcontracting', 'purchase'],
'data': [
'views/purchase_order_views.xml',
'views/stock_picking_views.xml',
"author": "Odoo S.A., Odoo Community Association (OCA)",
"website": "https://github.com/OCA/manufacture",
"depends": ["mrp_subcontracting", "purchase"],
"data": [
"views/purchase_order_views.xml",
"views/stock_picking_views.xml",
],
'installable': True,
'auto_install': True,
'license': 'LGPL-3',
"installable": True,
"auto_install": True,
"license": "LGPL-3",
}
1 change: 0 additions & 1 deletion mrp_subcontracting_purchase/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

from . import stock_picking
Expand Down
21 changes: 13 additions & 8 deletions mrp_subcontracting_purchase/models/purchase_order.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

from odoo import models, fields, api
from odoo import api, fields, models


class PurchaseOrder(models.Model):
_inherit = 'purchase.order'
_inherit = "purchase.order"

subcontracting_resupply_picking_count = fields.Integer(
"Count of Subcontracting Resupply", compute='_compute_subcontracting_resupply_picking_count',
help="Count of Subcontracting Resupply for component")
"Count of Subcontracting Resupply",
compute="_compute_subcontracting_resupply_picking_count",
help="Count of Subcontracting Resupply for component",
)

@api.depends('order_line.move_ids')
@api.depends("order_line.move_ids")
def _compute_subcontracting_resupply_picking_count(self):
for purchase in self:
purchase.subcontracting_resupply_picking_count = len(purchase._get_subcontracting_resupplies())
purchase.subcontracting_resupply_picking_count = len(
purchase._get_subcontracting_resupplies()
)

def action_view_subcontracting_resupply(self):
return self._get_action_view_picking(self._get_subcontracting_resupplies())

def _get_subcontracting_resupplies(self):
moves_subcontracted = self.order_line.move_ids.filtered(lambda m: m.is_subcontract)
moves_subcontracted = self.order_line.move_ids.filtered(
lambda m: m.is_subcontract
)
subcontracted_productions = moves_subcontracted.move_orig_ids.production_id
return subcontracted_productions.picking_ids
47 changes: 28 additions & 19 deletions mrp_subcontracting_purchase/models/stock_picking.py
Original file line number Diff line number Diff line change
@@ -1,40 +1,49 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

from odoo import models, fields, api, _
from odoo import _, api, fields, models


class StockPicking(models.Model):
_inherit = 'stock.picking'
_inherit = "stock.picking"

subcontracting_source_purchase_count = fields.Integer(
"Number of subcontracting PO Source", compute='_compute_subcontracting_source_purchase_count',
help="Number of subcontracting Purchase Order Source")
"Number of subcontracting PO Source",
compute="_compute_subcontracting_source_purchase_count",
help="Number of subcontracting Purchase Order Source",
)

@api.depends('move_lines.move_dest_ids.raw_material_production_id')
@api.depends("move_lines.move_dest_ids.raw_material_production_id")
def _compute_subcontracting_source_purchase_count(self):
for picking in self:
picking.subcontracting_source_purchase_count = len(picking._get_subcontracting_source_purchase())
picking.subcontracting_source_purchase_count = len(
picking._get_subcontracting_source_purchase()
)

def action_view_subcontracting_source_purchase(self):
purchase_order_ids = self._get_subcontracting_source_purchase().ids
action = {
'res_model': 'purchase.order',
'type': 'ir.actions.act_window',
"res_model": "purchase.order",
"type": "ir.actions.act_window",
}
if len(purchase_order_ids) == 1:
action.update({
'view_mode': 'form',
'res_id': purchase_order_ids[0],
})
action.update(
{
"view_mode": "form",
"res_id": purchase_order_ids[0],
}
)
else:
action.update({
'name': _("Source PO of %s", self.name),
'domain': [('id', 'in', purchase_order_ids)],
'view_mode': 'tree,form',
})
action.update(
{
"name": _("Source PO of %s", self.name),
"domain": [("id", "in", purchase_order_ids)],
"view_mode": "tree,form",
}
)
return action

def _get_subcontracting_source_purchase(self):
moves_subcontracted = self.move_lines.move_dest_ids.raw_material_production_id.move_finished_ids.move_dest_ids.filtered(lambda m: m.is_subcontract)
moves_subcontracted = self.move_lines.move_dest_ids.raw_material_production_id.move_finished_ids.move_dest_ids.filtered( # noqa
lambda m: m.is_subcontract
)
return moves_subcontracted.purchase_line_id.order_id
2 changes: 0 additions & 2 deletions mrp_subcontracting_purchase/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
# -*- coding: utf-8 -*-

from . import test_mrp_subcontracting_purchase
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.

from odoo import Command
Expand All @@ -7,29 +6,38 @@


class MrpSubcontractingPurchaseTest(TestMrpSubcontractingCommon):

def test_count_smart_buttons(self):
resupply_sub_on_order_route = self.env['stock.location.route'].search([('name', '=', 'Resupply Subcontractor on Order')])
(self.comp1 + self.comp2).write({'route_ids': [Command.link(resupply_sub_on_order_route.id)]})
resupply_sub_on_order_route = self.env["stock.location.route"].search(
[("name", "=", "Resupply Subcontractor on Order")]
)
(self.comp1 + self.comp2).write(
{"route_ids": [Command.link(resupply_sub_on_order_route.id)]}
)

# I create a draft Purchase Order for first in move for 10 kg at 50 euro
po = self.env['purchase.order'].create({
'partner_id': self.subcontractor_partner1.id,
'order_line': [Command.create({
'name': 'finished',
'product_id': self.finished.id,
'product_qty': 1.0,
'product_uom': self.finished.uom_id.id,
'price_unit': 50.0}
)],
})
po = self.env["purchase.order"].create(
{
"partner_id": self.subcontractor_partner1.id,
"order_line": [
Command.create(
{
"name": "finished",
"product_id": self.finished.id,
"product_qty": 1.0,
"product_uom": self.finished.uom_id.id,
"price_unit": 50.0,
}
)
],
}
)

po.button_confirm()

self.assertEqual(po.subcontracting_resupply_picking_count, 1)
action1 = po.action_view_subcontracting_resupply()
picking = self.env[action1['res_model']].browse(action1['res_id'])
picking = self.env[action1["res_model"]].browse(action1["res_id"])
self.assertEqual(picking.subcontracting_source_purchase_count, 1)
action2 = picking.action_view_subcontracting_source_purchase()
po_action2 = self.env[action2['res_model']].browse(action2['res_id'])
po_action2 = self.env[action2["res_model"]].browse(action2["res_id"])
self.assertEqual(po_action2, po)
28 changes: 20 additions & 8 deletions mrp_subcontracting_purchase/views/purchase_order_views.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="purchase_order_form_mrp_subcontracting_purchase" model="ir.ui.view">
<field name="name">purchase.order.inherited.form.mrp.subcontracting.purchase</field>
<field
name="name"
>purchase.order.inherited.form.mrp.subcontracting.purchase</field>
<field name="model">purchase.order</field>
<field name="inherit_id" ref="purchase.purchase_order_form"/>
<field name="inherit_id" ref="purchase.purchase_order_form" />
<field name="arch" type="xml">
<xpath expr="//div[hasclass('oe_button_box')]/button[@name='action_view_picking']" position="before">
<button
class="oe_stat_button" name="action_view_subcontracting_resupply"
type="object" icon="fa-truck" attrs="{'invisible': [('subcontracting_resupply_picking_count', '=', 0)]}" groups="stock.group_stock_user">
<xpath
expr="//div[hasclass('oe_button_box')]/button[@name='action_view_picking']"
position="before"
>
<button
class="oe_stat_button"
name="action_view_subcontracting_resupply"
type="object"
icon="fa-truck"
attrs="{'invisible': [('subcontracting_resupply_picking_count', '=', 0)]}"
groups="stock.group_stock_user"
>
<div class="o_field_widget o_stat_info">
<span class="o_stat_value"><field name="subcontracting_resupply_picking_count"/></span>
<span class="o_stat_value"><field
name="subcontracting_resupply_picking_count"
/></span>
<span class="o_stat_text">Resupply</span>
</div>
</button>
Expand Down
19 changes: 13 additions & 6 deletions mrp_subcontracting_purchase/views/stock_picking_views.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<record id="stock_picking_form_mrp_subcontracting" model="ir.ui.view">
<field name="name">stock.picking.inherited.form.mrp.subcontracting</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_form"/>
<field name="inherit_id" ref="stock.view_picking_form" />
<field name="arch" type="xml">
<xpath expr="//div[hasclass('oe_button_box')]" position="inside">
<button
class="oe_stat_button" name="action_view_subcontracting_source_purchase"
type="object" icon="fa-shopping-cart" attrs="{'invisible': [('subcontracting_source_purchase_count', '=', 0)]}" groups="stock.group_stock_user">
<button
class="oe_stat_button"
name="action_view_subcontracting_source_purchase"
type="object"
icon="fa-shopping-cart"
attrs="{'invisible': [('subcontracting_source_purchase_count', '=', 0)]}"
groups="stock.group_stock_user"
>
<div class="o_field_widget o_stat_info">
<span class="o_stat_value"><field name="subcontracting_source_purchase_count"/></span>
<span class="o_stat_value"><field
name="subcontracting_source_purchase_count"
/></span>
<span class="o_stat_text">Source PO</span>
</div>
</button>
Expand Down
6 changes: 6 additions & 0 deletions setup/mrp_subcontracting_purchase/setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import setuptools

setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

0 comments on commit 89fd156

Please sign in to comment.