[13.0] [IMP] fieldservice_repair: fixed black, prettier and flake8 co…

…nflicts Merge pull request #3 from ursais/13.0-mig-fieldservice_repair
OCA · Oct 14, 2020 · 86daac0 · 86daac0
2 parents 8e5a34e + 2213120
commit 86daac0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/fieldservice/models/fsm_order.py b/fieldservice/models/fsm_order.py
@@ -218,9 +218,9 @@ def _onchange_location_id_customer(self):
     # Equipment used for all other Service Orders
     equipment_ids = fields.Many2many("fsm.equipment", string="Equipments")
     type = fields.Many2one("fsm.order.type", string="Type")
-    internal_type = fields.Selection(string='Internal Type',
-                                     related='type.internal_type')
-
+    internal_type = fields.Selection(
+        string="Internal Type", related="type.internal_type"
+    )
 
     @api.model
     def _read_group_stage_ids(self, stages, domain, order):

diff --git a/fieldservice/models/fsm_order_type.py b/fieldservice/models/fsm_order_type.py
@@ -10,7 +10,5 @@ class FSMOrderType(models.Model):
     name = fields.Char(string="Name")
 
     internal_type = fields.Selection(
-        string="Internal Type",
-        selection=[('fsm', 'FSM')],
-        default='fsm',
+        string="Internal Type", selection=[("fsm", "FSM")], default="fsm",
     )
diff --git a/fieldservice/views/fsm_order.xml b/fieldservice/views/fsm_order.xml
@@ -66,7 +66,7 @@
                                 groups="fieldservice.group_fsm_team"
                             />
                             <field name="person_id" />
-                            <field name="internal_type" invisible="1"/>
+                            <field name="internal_type" invisible="1" />
                             <field
                                 name="equipment_id"
                                 attrs="{'invisible':[('internal_type', 'not in',['repair', 'maintenance'])]}"

diff --git a/fieldservice/views/fsm_order_type.xml b/fieldservice/views/fsm_order_type.xml
@@ -6,7 +6,7 @@
         <field name="arch" type="xml">
             <tree string="Order Types">
                 <field name="name" />
-                <field name="internal_type"/>
+                <field name="internal_type" />
             </tree>
         </field>
     </record>
@@ -22,7 +22,7 @@
                         <field name="name" />
                     </h1>
                     <group>
-                        <field name="internal_type"/>
+                        <field name="internal_type" />
                     </group>
                 </sheet>
             </form>

diff --git a/fieldservice_repair/__manifest__.py b/fieldservice_repair/__manifest__.py
@@ -8,10 +8,10 @@
     "category": "Field Service",
     "author": "Open Source Integrators, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/field-service",
-    "depends": ["fieldservice_stock", "repair",],
+    "depends": ["fieldservice_stock", "repair"],
     "data": ["data/fsm_order_type.xml", "views/fsm_order_view.xml"],
     "license": "AGPL-3",
     "development_status": "Beta",
-    "maintainers": ["smangukiya", "max3903",],
+    "maintainers": ["smangukiya", "max3903"],
     "installable": True,
 }