Skip to content

Commit

Permalink
[FIX] Migrating required from model to view
Browse files Browse the repository at this point in the history
While migrating ``fieldservice_repair`` (OCA#1209) some unit tests were failing because this module adds ``required`` condition on two new fields on ``fms.equipment`` model. 
To avoid this, the best solution was to migrate the required to the view as we cannot force the installation order on odoo.
  • Loading branch information
ilo committed Sep 11, 2024
1 parent f1e44e9 commit 84c7d1f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
4 changes: 2 additions & 2 deletions fieldservice_equipment_stock/models/fsm_equipment.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
class FSMEquipment(models.Model):
_inherit = "fsm.equipment"

product_id = fields.Many2one("product.product", string="Product", required=True)
lot_id = fields.Many2one("stock.lot", string="Serial #", required=True)
product_id = fields.Many2one("product.product", string="Product")
lot_id = fields.Many2one("stock.lot", string="Serial #")
current_stock_location_id = fields.Many2one(
"stock.location",
string="Current Inventory Location",
Expand Down
11 changes: 4 additions & 7 deletions fieldservice_equipment_stock/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@

/*
:Author: David Goodger (goodger@python.org)
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z 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 +274,7 @@
margin-left: 2em ;
margin-right: 2em }

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

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

span.section-subtitle {
Expand Down Expand Up @@ -461,9 +460,7 @@ <h2><a class="toc-backref" href="#toc-entry-8">Other credits</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-9">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>
Expand Down
3 changes: 2 additions & 1 deletion fieldservice_equipment_stock/views/fsm_equipment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
<field name="arch" type="xml">
<group id="secondary" position="inside">
<group string="Inventory" groups="stock.group_stock_user">
<field name="product_id" />
<field name="product_id" required="1" />
<field
name="lot_id"
domain="[('product_id', '=', product_id)]"
context="{'default_product_id': product_id}"
required="1"
/>
<field name="current_stock_location_id" />
</group>
Expand Down

0 comments on commit 84c7d1f

Please sign in to comment.