Skip to content

Commit

Permalink
[MIG] fieldservice_stock: Migration to 18.0
Browse files Browse the repository at this point in the history
  • Loading branch information
EdgarRetes committed Nov 5, 2024
1 parent 778f9e5 commit 122db43
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 23 deletions.
10 changes: 5 additions & 5 deletions fieldservice_stock/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ Field Service - 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%2Ffield--service-lightgray.png?logo=github
:target: https://github.com/OCA/field-service/tree/17.0/fieldservice_stock
:target: https://github.com/OCA/field-service/tree/18.0/fieldservice_stock
:alt: OCA/field-service
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/field-service-17-0/field-service-17-0-fieldservice_stock
:target: https://translation.odoo-community.org/projects/field-service-18-0/field-service-18-0-fieldservice_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/field-service&target_branch=17.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/field-service&target_branch=18.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
Expand Down Expand Up @@ -78,7 +78,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/field-service/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/field-service/issues/new?body=module:%20fieldservice_stock%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/field-service/issues/new?body=module:%20fieldservice_stock%0Aversion:%2018.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 @@ -137,6 +137,6 @@ Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:

|maintainer-brian10048| |maintainer-wolfhall| |maintainer-max3903| |maintainer-smangukiya|

This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/17.0/fieldservice_stock>`_ project on GitHub.
This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/18.0/fieldservice_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 fieldservice_stock/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{
"name": "Field Service - Stock",
"summary": "Integrate the logistics operations with Field Service",
"version": "17.0.1.0.0",
"version": "18.0.1.0.0",
"category": "Field Service",
"author": "Open Source Integrators, "
"Brian McMaster, "
Expand Down
4 changes: 2 additions & 2 deletions fieldservice_stock/models/fsm_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def action_view_delivery(self):
view, if there is only one delivery order to show.
"""
action = self.env["ir.actions.act_window"]._for_xml_id(
"stock.action_picking_tree_all"
"stock.action_picking_list_all"
)
pickings = self.mapped("picking_ids")
delivery_ids = self.picking_ids.filtered(
Expand All @@ -82,7 +82,7 @@ def action_view_returns(self):
view, if there is only one return order to show.
"""
action = self.env["ir.actions.act_window"]._for_xml_id(
"stock.action_picking_tree_all"
"stock.action_picking_list_all"
)
pickings = self.mapped("picking_ids")
return_ids = self.picking_ids.filtered(
Expand Down
17 changes: 10 additions & 7 deletions fieldservice_stock/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@

/*
:Author: David Goodger (goodger@python.org)
: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 @@ -274,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 @@ -300,7 +301,7 @@
span.pre {
white-space: pre }

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

span.section-subtitle {
Expand Down Expand Up @@ -368,7 +369,7 @@ <h1 class="title">Field Service - Stock</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:3e40b0122be66d01675fb140ceb4250cdb6f624cc4e91db02c7d65de17507777
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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/field-service/tree/17.0/fieldservice_stock"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-17-0/field-service-17-0-fieldservice_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/field-service&amp;target_branch=17.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/field-service/tree/18.0/fieldservice_stock"><img alt="OCA/field-service" src="https://img.shields.io/badge/github-OCA%2Ffield--service-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/field-service-18-0/field-service-18-0-fieldservice_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/field-service&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module is an add-on for the Field Service application in Odoo. It
provides a generic framework to allow you to link inventory and stock
operations with your field service operations.</p>
Expand Down Expand Up @@ -425,7 +426,7 @@ <h1><a class="toc-backref" href="#toc-entry-5">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/field-service/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/field-service/issues/new?body=module:%20fieldservice_stock%0Aversion:%2017.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/field-service/issues/new?body=module:%20fieldservice_stock%0Aversion:%2018.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 Down Expand Up @@ -457,13 +458,15 @@ <h2><a class="toc-backref" href="#toc-entry-9">Other credits</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-10">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>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
<p><a class="reference external image-reference" href="https://github.com/brian10048"><img alt="brian10048" src="https://github.com/brian10048.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/wolfhall"><img alt="wolfhall" src="https://github.com/wolfhall.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/max3903"><img alt="max3903" src="https://github.com/max3903.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/smangukiya"><img alt="smangukiya" src="https://github.com/smangukiya.png?size=40px" /></a></p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/17.0/fieldservice_stock">OCA/field-service</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/field-service/tree/18.0/fieldservice_stock">OCA/field-service</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
4 changes: 2 additions & 2 deletions fieldservice_stock/views/fsm_order.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<group id="stock-right" />
</group>
<field name="move_ids" readonly="1" invisible="move_ids == False">
<tree
<list
decoration-muted="state == 'cancel'"
default_order='date, picking_id, sequence'
>
Expand All @@ -65,7 +65,7 @@
<field name="location_dest_id" invisible="1" />
<field name="create_date" invisible="1" />
<field name="state" />
</tree>
</list>
</field>
</page>
</xpath>
Expand Down
6 changes: 3 additions & 3 deletions fieldservice_stock/views/res_territory.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<odoo>
<!-- Territory Tree View -->
<record id="res_territory_wh_tree_view" model="ir.ui.view">
<field name="name">res.territory.warehouse.tree</field>
<record id="res_territory_wh_list_view" model="ir.ui.view">
<field name="name">res.territory.warehouse.list</field>
<field name="model">res.territory</field>
<field name="inherit_id" ref="base_territory.res_territory_tree_view" />
<field name="inherit_id" ref="base_territory.res_territory_list_view" />
<field name="arch" type="xml">
<field name="branch_id" position="after">
<field
Expand Down
6 changes: 3 additions & 3 deletions fieldservice_stock/views/stock_picking.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
</field>
</record>

<record id="fsm_stock_picking_tree" model="ir.ui.view">
<field name="name">stock.picking.fieldservice.stock.tree</field>
<record id="fsm_stock_picking_list" model="ir.ui.view">
<field name="name">stock.picking.fieldservice.stock.list</field>
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.vpicktree" />
<field name="inherit_id" ref="stock.vpicklist" />
<field name="arch" type="xml">
<field name="location_dest_id" position="after">
<field name="fsm_order_id" />
Expand Down

0 comments on commit 122db43

Please sign in to comment.