Skip to content

Commit

Permalink
[MIG] hr_personal_equipment_stock: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
anusriNPS committed Nov 11, 2024
1 parent 4e6a7de commit 55036c3
Show file tree
Hide file tree
Showing 12 changed files with 78 additions and 63 deletions.
10 changes: 5 additions & 5 deletions hr_personal_equipment_stock/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ Hr Personal Equipment Stock
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github
:target: https://github.com/OCA/hr/tree/14.0/hr_personal_equipment_stock
:target: https://github.com/OCA/hr/tree/16.0/hr_personal_equipment_stock
:alt: OCA/hr
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_personal_equipment_stock
:target: https://translation.odoo-community.org/projects/hr-16-0/hr-16-0-hr_personal_equipment_stock
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/hr&target_branch=14.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/hr&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
Expand All @@ -50,7 +50,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/hr/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/hr/issues/new?body=module:%20hr_personal_equipment_stock%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/hr/issues/new?body=module:%20hr_personal_equipment_stock%0Aversion:%2016.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.

Expand Down Expand Up @@ -80,6 +80,6 @@ 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.

This module is part of the `OCA/hr <https://github.com/OCA/hr/tree/14.0/hr_personal_equipment_stock>`_ project on GitHub.
This module is part of the `OCA/hr <https://github.com/OCA/hr/tree/16.0/hr_personal_equipment_stock>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion hr_personal_equipment_stock/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "Hr Personal Equipment Stock",
"summary": """
This addon allows to integrate hr_personal_equipment_request with stock""",
"version": "14.0.1.0.0",
"version": "16.0.1.0.0",
"license": "AGPL-3",
"author": "Creu Blanca,Odoo Community Association (OCA)",
"website": "https://github.com/OCA/hr",
Expand Down
3 changes: 2 additions & 1 deletion hr_personal_equipment_stock/models/hr_personal_equipment.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,9 @@ def _action_launch_procurement_rule(self):
return True

def _accept_request(self):
super()._accept_request()
res = super()._accept_request()
self._action_launch_procurement_rule()
return res

def _validate_allocation_vals(self):
res = super()._validate_allocation_vals()
Expand Down
3 changes: 2 additions & 1 deletion hr_personal_equipment_stock/models/stock_move.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ def _prepare_merge_move_sort_method(self, move):
return keys_sorted

def _action_cancel(self):
super()._action_cancel()
res = super()._action_cancel()
for rec in self.sudo():
if not rec.personal_equipment_id.qty_delivered:
rec.personal_equipment_id.update({"state": "cancelled"})
else:
rec.personal_equipment_id.update({"state": "valid"})
return res
3 changes: 2 additions & 1 deletion hr_personal_equipment_stock/models/stock_picking.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class StockPicking(models.Model):
equipment_request_id = fields.Many2one(related="group_id.equipment_request_id")

def _action_done(self):
super()._action_done()
res = super()._action_done()
if self.equipment_request_id:
for move in self.move_ids_without_package:
if move.state == "done":
Expand All @@ -28,3 +28,4 @@ def _action_done(self):
if qty_done:
if qty_initial <= qty_done:
line.validate_allocation()
return res
18 changes: 10 additions & 8 deletions hr_personal_equipment_stock/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?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>
Expand All @@ -9,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* 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 }
Expand All @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -369,7 +369,7 @@ <h1 class="title">Hr Personal Equipment Stock</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:e9bc6ce5958557b4e98dd58142582801580d20a5ffcb89549d5cad0fbe26c14d
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" 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 image-reference" 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 image-reference" href="https://github.com/OCA/hr/tree/14.0/hr_personal_equipment_stock"><img alt="OCA/hr" src="https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-14-0/hr-14-0-hr_personal_equipment_stock"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/hr&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external image-reference" 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 image-reference" 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 image-reference" href="https://github.com/OCA/hr/tree/16.0/hr_personal_equipment_stock"><img alt="OCA/hr" src="https://img.shields.io/badge/github-OCA%2Fhr-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-16-0/hr-16-0-hr_personal_equipment_stock"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/hr&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module integrates stock with hr_personal_equipment_request module.
When the equipment request is accepted, a stock request is generated and a “stock.move” is created for each request line.
If the “stock.move” is marked as done, the corresponding allocations are marked as valid if the quantity_delivered is equal to the requested quantity.
Expand Down Expand Up @@ -397,7 +397,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/hr/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 to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/hr/issues/new?body=module:%20hr_personal_equipment_stock%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/hr/issues/new?body=module:%20hr_personal_equipment_stock%0Aversion:%2016.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">
Expand All @@ -417,11 +417,13 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-6">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>
<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>This module is part of the <a class="reference external" href="https://github.com/OCA/hr/tree/14.0/hr_personal_equipment_stock">OCA/hr</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr/tree/16.0/hr_personal_equipment_stock">OCA/hr</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,112 +6,125 @@


class TestHRPersonalEquipment(TransactionCase):
def setUp(self):
super().setUp()
@classmethod
def setUpClass(cls):
super().setUpClass()

self.warehouse = self.env.ref("stock.warehouse0")
self.company = self.env.ref("base.main_company")
self.ressuply_loc = self.env["stock.location"].create(
cls.warehouse = cls.env.ref("stock.warehouse0")
cls.company = cls.env.ref("base.main_company")
cls.ressuply_loc = cls.env["stock.location"].create(
{
"name": "Warehouse Test",
"location_id": self.warehouse.view_location_id.id,
"location_id": cls.warehouse.view_location_id.id,
}
)
self.location_employee = self.env["stock.location"].create(
cls.location_employee = cls.env["stock.location"].create(
{
"name": "Employee Personal Equipment Virtual Location",
"location_id": self.warehouse.view_location_id.id,
"location_id": cls.warehouse.view_location_id.id,
"usage": "transit",
"is_personal_equipment_location": True,
}
)
self.route = self.env["stock.location.route"].create(
cls.route = cls.env["stock.route"].create(
{
"name": "Employee Personal Equipment Route",
"product_categ_selectable": False,
"product_selectable": True,
"company_id": self.company.id,
"company_id": cls.company.id,
"sequence": 10,
}
)
self.env["stock.rule"].create(
cls.env["stock.rule"].create(
{
"name": "Employee Personal Equipment Rule",
"route_id": self.route.id,
"location_src_id": self.ressuply_loc.id,
"location_id": self.location_employee.id,
"route_id": cls.route.id,
"location_src_id": cls.ressuply_loc.id,
"location_dest_id": cls.location_employee.id,
"action": "pull",
"picking_type_id": self.warehouse.int_type_id.id,
"picking_type_id": cls.warehouse.int_type_id.id,
"procure_method": "make_to_stock",
"warehouse_id": self.warehouse.id,
"company_id": self.company.id,
"warehouse_id": cls.warehouse.id,
"company_id": cls.company.id,
"propagate_cancel": "False",
}
)
self.user = (
self.env["res.users"]
cls.user = (
cls.env["res.users"]
.sudo()
.create(
{
"name": "Test User",
"login": "[email protected]",
"email": "[email protected]",
"groups_id": [
(4, self.env.ref("base.group_user").id),
(4, self.env.ref("hr.group_hr_user").id),
(4, self.env.ref("stock.group_stock_manager").id),
(4, cls.env.ref("base.group_user").id),
(4, cls.env.ref("hr.group_hr_user").id),
(4, cls.env.ref("stock.group_stock_manager").id),
],
}
)
)
self.employee = self.env["hr.employee"].create(
{"name": "Employee Test", "user_id": self.user.id}
cls.employee = cls.env["hr.employee"].create(
{"name": "Employee Test", "user_id": cls.user.id}
)
self.product_personal_equipment_1 = self.env["product.template"].create(
cls.product_personal_equipment_1 = cls.env["product.template"].create(
{
"name": "Product Test Personal Equipment",
"is_personal_equipment": True,
"route_ids": [(6, 0, self.route.ids)],
"route_ids": [(6, 0, cls.route.ids)],
"qty_available": 100,
"type": "product",
"uom_id": self.env.ref("uom.product_uom_unit").id,
"uom_id": cls.env.ref("uom.product_uom_unit").id,
}
)
self.product_personal_equipment_2 = self.env["product.template"].create(
cls.product_personal_equipment_2 = cls.env["product.template"].create(
{
"name": "Service Test Personal Equipment 2",
"is_personal_equipment": True,
"type": "service",
"uom_id": self.env.ref("uom.product_uom_unit").id,
"uom_id": cls.env.ref("uom.product_uom_unit").id,
}
)
lines = [
{
"name": "Personal Equipment 1",
"product_id": self.product_personal_equipment_1.product_variant_id.id,
"product_id": cls.product_personal_equipment_1.product_variant_id.id,
"quantity": 3,
"product_uom_id": self.env.ref("uom.product_uom_unit").id,
"product_uom_id": cls.env.ref("uom.product_uom_unit").id,
},
{
"name": "Personal Equipment 2",
"product_id": self.product_personal_equipment_2.product_variant_id.id,
"product_id": cls.product_personal_equipment_2.product_variant_id.id,
"quantity": 2,
"product_uom_id": self.env.ref("uom.product_uom_unit").id,
"product_uom_id": cls.env.ref("uom.product_uom_unit").id,
},
]

self.personal_equipment_request = (
self.env["hr.personal.equipment.request"]
.with_user(self.user.id)
cls.personal_equipment_request = (
cls.env["hr.personal.equipment.request"]
.with_user(cls.user.id)
.create(
{
"name": "Personal Equipment Request Test",
"line_ids": [(0, 0, line) for line in lines],
"location_id": self.location_employee.id,
"location_id": cls.location_employee.id,
}
)
)

# cls.personal_equipment_request_2 = (
# cls.env["hr.personal.equipment.request"]
# .with_user(cls.user.id)
# .create(
# {
# "name": "Personal Equipment Request Test 2",
# "line_ids": [(0, 0, lines[0])],
# "location_id": cls.location_employee.id,
# }
# )
# )

# hr.personal.equipment.request

def test_get_procurement_group_without_group_set(self):
Expand Down
4 changes: 2 additions & 2 deletions hr_personal_equipment_stock/views/hr_personal_equipment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<field name="qty_delivered" />
</field>
<field name="quantity" position="attributes">
<attributes name="invisible">1</attributes>
<attribute name="invisible">1</attribute>
</field>
</field>
</record>
Expand All @@ -44,7 +44,7 @@
<field name="qty_delivered" />
</field>
<field name="quantity" position="attributes">
<attributes name="invisible">1</attributes>
<attribute name="invisible">1</attribute>
</field>
</field>
</record>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
name="inherit_id"
ref="hr_personal_equipment_request.hr_personal_equipment_request_form_view"
/>
<field name="groups_id" eval="[(4,ref('stock.group_stock_user'))]" />
<field name="arch" type="xml">
<xpath expr="//div[@name='button_box']" position="inside">
<button
Expand All @@ -48,6 +47,7 @@
class="oe_stat_button"
icon="fa-truck"
attrs="{'invisible': [('picking_count','&lt;','1')]}"
groups="stock.group_stock_user"
>
<field name="picking_count" widget="statinfo" string="Pickings" />
</button>
Expand Down
3 changes: 1 addition & 2 deletions hr_personal_equipment_stock/views/procurement_group.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
>procurement.group.form (in hr_personal_equipment_stock)</field>
<field name="model">procurement.group</field>
<field name="inherit_id" ref="stock.procurement_group_form_view" />
<field name="groups_id" eval="[(4,ref('stock.group_stock_user'))]" />
<field name="arch" type="xml">
<xpath expr="//field[@name='move_type']" position="after">
<field name="equipment_request_id" />
<field name="equipment_request_id" groups="stock.group_stock_user" />
</xpath>
</field>
</record>
Expand Down
3 changes: 1 addition & 2 deletions hr_personal_equipment_stock/views/stock_move.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
<field name="name">stock.move.form (in hr_personal_equipment_stock)</field>
<field name="model">stock.move</field>
<field name="inherit_id" ref="stock.view_move_form" />
<field name="groups_id" eval="[(4,ref('stock.group_stock_user'))]" />
<field name="arch" type="xml">
<field name="reference" position="after">
<field name="personal_equipment_id" />
<field name="personal_equipment_id" groups="stock.group_stock_user" />
</field>
</field>
</record>
Expand Down
Loading

0 comments on commit 55036c3

Please sign in to comment.