[ADD] fieldservice_vehicle_stock

fieldservice_stock/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     'name': 'Field Service - Stock',
-    'summary': 'Inventory and Stock Operations for Field Service',
+    'summary': 'Inventory and Stock Operations for Field Services',
     'version': '11.0.0.0.2',
     'category': 'Field Service',
     'author': "Open Source Integrators, "
@@ -17,7 +17,6 @@
     'data': [
         'data/fsm_stock_data.xml',
         'views/fsm_location.xml',
-        'views/fsm_vehicle.xml',
         'views/fsm_order.xml',
         'views/stock.xml',
     ],

fieldservice_stock/data/fsm_stock_data.xml

@@ -1,148 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-    <data>
 
-        <record id="stock_location_field" model="stock.location">
-            <field name="name">Field</field>
-            <field name="usage">view</field>
-            <field name="company_id"></field>
-        </record>
+    <record id="stock_location_field" model="stock.location">
+        <field name="name">Field</field>
+        <field name="usage">view</field>
+        <field name="company_id"></field>
+    </record>
 
-        <record id="stock_location_vehicle" model="stock.location">
-            <field name="name">Vehicle</field>
-            <field name="usage">view</field>
-            <field name="company_id"></field>
-        </record>
-
-        <record id="stock_location_vehicle_storage" model="stock.location">
-            <field name="name">Storage</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock_location_vehicle"/>
-            <field name="company_id"></field>
-        </record>
-
-    </data>
-
-    <data noupdate="1">
-
-        <!-- Output to Vehicle operations -->
-        <record id="seq_picking_type_output_to_vehicle" model="ir.sequence">
-            <field name="name">Vehicle Loading</field>
-            <field name="prefix">VL</field>
-            <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
-        </record>
-
-        <record id="picking_type_output_to_vehicle" model="stock.picking.type">
-            <field name="name">Vehicle Loading</field>
-            <field name="sequence_id" ref="seq_picking_type_output_to_vehicle"/>
-            <field name="code">internal</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id" ref="stock.stock_location_stock"/>
-            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
-        </record>
-
-        <!-- Vehicle to Location operations -->
-        <record id="seq_picking_type_vehicle_to_location" model="ir.sequence">
-            <field name="name">Location Delivery</field>
-            <field name="prefix">LD</field>
-            <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
-        </record>
-
-        <record id="picking_type_vehicle_to_location" model="stock.picking.type">
-            <field name="name">Location Delivery</field>
-            <field name="sequence_id" ref="seq_picking_type_vehicle_to_location"/>
-            <field name="code">outgoing</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id" ref="stock_location_vehicle"/>
-        </record>
-
-        <record id="route_stock_to_vehicle_to_location" model='stock.location.route'>
-            <field name="name">Stock to Vehicle to Location</field>
-            <field name="sequence">3</field>
-            <field name="company_id"></field>
-        </record>
-
-        <record id="procurement_rule_vehicle_to_location" model="procurement.rule">
-            <field name="name">Vehicle → Location</field>
-            <field name="action">move</field>
-            <field name="location_id" ref="stock.stock_location_customers"/>
-            <field name="location_src_id" ref="stock_location_vehicle_storage"/>
-            <field name="procure_method">make_to_order</field>
-            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
-            <field name="picking_type_id" ref="picking_type_vehicle_to_location"/>
-        </record>
-
-        <record id="procurement_rule_output_to_vehicle" model="procurement.rule">
-            <field name="name">Warehouse → Vehicle</field>
-            <field name="action">move</field>
-            <field name="location_id" ref="stock_location_vehicle_storage"/>
-            <field name="location_src_id" ref="stock.stock_location_stock"/>
-            <field name="procure_method">make_to_stock</field>
-            <field name="route_id" ref="route_stock_to_vehicle_to_location"/>
-            <field name="picking_type_id" ref="picking_type_output_to_vehicle"/>
-        </record>
-
-        <!-- Location Return Operations -->
-        <record id="route_location_return" model='stock.location.route'>
-            <field name="name">Location Return</field>
-            <field name="sequence">3</field>
-            <field name="company_id"></field>
-        </record>
-
-        <!-- Location Return to Vehicle operations -->
-        <record id="seq_picking_type_location_to_vehicle" model="ir.sequence">
-            <field name="name">Location Pickup</field>
-            <field name="prefix">LP</field>
-            <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
-        </record>
-
-        <record id="picking_type_location_to_vehicle" model="stock.picking.type">
-            <field name="name">Location Pickup</field>
-            <field name="sequence_id" ref="seq_picking_type_location_to_vehicle"/>
-            <field name="code">internal</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_dest_id" ref="stock_location_vehicle"/>
-        </record>
-
-        <record id="procurement_rule_location_to_vehicle" model="procurement.rule">
-            <field name="name">Warehouse → Vehicle</field>
-            <field name="action">move</field>
-            <field name="location_id" ref="stock_location_vehicle"/>
-            <field name="location_src_id" ref="stock.stock_location_stock"/>
-            <field name="procure_method">make_to_stock</field>
-            <field name="route_id" ref="route_location_return"/>
-            <field name="picking_type_id" ref="picking_type_location_to_vehicle"/>
-        </record>
-
-
-        <!-- Vehicle to Input -->
-        <record id="seq_picking_type_vehicle_to_input" model="ir.sequence">
-            <field name="name">Vehicle Returns</field>
-            <field name="prefix">VR</field>
-            <field name="padding">5</field>
-            <field name="company_id" eval="False"/>
-        </record>
-
-        <record id="picking_type_vehicle_to_input" model="stock.picking.type">
-            <field name="name">Vehicle Returns</field>
-            <field name="sequence_id" ref="seq_picking_type_vehicle_to_input"/>
-            <field name="code">internal</field>
-            <field name="warehouse_id" eval="False"/>
-            <field name="default_location_src_id" ref="stock_location_vehicle"/>
-            <field name="default_location_dest_id" ref="stock.stock_location_stock"/>
-        </record>
-
-        <record id="stock_location_path_vehicle_to_input" model="stock.location.path">
-            <field name="name">Vehicle → Warehouse</field>
-            <field name="location_from_id" ref="stock_location_vehicle"/>
-            <field name="location_dest_id" ref="stock.stock_location_stock"/>
-            <field name="auto">manual</field>
-            <field name="picking_type_id" ref="picking_type_vehicle_to_input"/>
-            <field name="route_id" ref="route_location_return"/>
-        </record>
-
-    </data>
 </odoo>

fieldservice_stock/models/__init__.py

@@ -3,7 +3,6 @@
 
 from . import (
     fsm_location,
-    fsm_vehicle,
     fsm_order,
     stock,
 )

fieldservice_stock/models/fsm_location.py

@@ -1,10 +1,11 @@
 # Copyright (C) 2018 - TODAY, Brian McMaster
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import fields, models
+from odoo import fields
+from odoo.addons.base_geoengine import geo_model
 
 
-class FSMLocation(models.Model):
+class FSMLocation(geo_model.GeoModel):
     _inherit = 'fsm.location'
 
     inventory_location = fields.Many2one('stock.location',

fieldservice_stock/models/fsm_order.py

@@ -3,7 +3,7 @@
 
 from datetime import datetime, timedelta
 
-from odoo import api, fields, models
+from odoo import api, fields, models, _
 
 from odoo.tools import (DEFAULT_SERVER_DATETIME_FORMAT,
                         float_is_zero, float_compare)
@@ -20,13 +20,42 @@ class FSMOrder(geo_model.GeoModel):
         'fsm.order.line', 'order_id', string="Order Lines",)
     picking_ids = fields.One2many('stock.picking', 'fsm_order_id',
                                   string='Transfers')
+    delivery_count = fields.Integer(string='Delivery Orders',
+                                    compute='_compute_picking_ids')
     procurement_group_id = fields.Many2one(
         'procurement.group', 'Procurement Group', copy=False)
+    warehouse_id = fields.Many2one('stock.warehouse', string='Warehouse',
+                                   help="Warehouse used to ship the materials")
+
+    @api.depends('picking_ids')
+    def _compute_picking_ids(self):
+        for order in self:
+            order.delivery_count = len(order.picking_ids)
 
     def action_confirm(self):
-        self.line_ids._confirm_picking()
-        return super(FSMOrder, self).action_confirm()
+        if self.location_id and self.line_ids and self.warehouse_id:
+            self.line_ids._confirm_picking()
+            return super(FSMOrder, self).action_confirm()
+        else:
+            raise UserError(_('Please select the location, a warehouse and a'
+                              ' product.'))
 
+    @api.multi
+    def action_view_delivery(self):
+        '''
+        This function returns an action that display existing delivery orders
+        of given fsm order ids. It can either be a in a list or in a form
+        view, if there is only one delivery order to show.
+        '''
+        action = self.env.ref('stock.action_picking_tree_all').read()[0]
+
+        pickings = self.mapped('picking_ids')
+        if len(pickings) > 1:
+            action['domain'] = [('id', 'in', pickings.ids)]
+        elif pickings:
+            action['views'] = [(self.env.ref('stock.view_picking_form').id, 'form')]
+            action['res_id'] = pickings.id
+        return action
 
 class FSMOrderLine(models.Model):
     _name = 'fsm.order.line'
@@ -42,7 +71,7 @@ class FSMOrderLine(models.Model):
     sequence = fields.Integer(string='Sequence', default=10, readonly=True,
                               states={'draft': [('readonly', False)]})
     product_id = fields.Many2one(
-        'product.product', string="Product", required=True,
+        'product.product', string="Product",
         domain=[('type', '=', 'product')], ondelete='restrict',
         readonly=True, states={'draft': [('readonly', False)]})
     product_uom_id = fields.Many2one(
@@ -119,15 +148,15 @@ def _prepare_procurement_values(self, group_id=False):
         self.ensure_one()
         values = {}
         date_planned = (self.order_id.scheduled_date_start
-                        or self.order_id.requested_date
+                        or self.order_id.request_early
+                        or self.order_id.request_late
                         or (datetime.now() + timedelta(days=1)).strftime(
                             DEFAULT_SERVER_DATETIME_FORMAT))
         values.update({
             'group_id': group_id,
             'fsm_order_line_id': self.id,
             'date_planned': date_planned,
-            'route_ids': self.env.ref(
-                'fieldservice_stock.route_stock_to_vehicle_to_location'),
+            'route_ids': self.order_id.warehouse_id.delivery_route_id,
             'partner_dest_id': self.order_id.customer_id
         })
         return values
@@ -170,6 +199,7 @@ def _confirm_picking(self):
             procurement_uom = line.product_uom_id
             quant_uom = line.product_id.uom_id
             get_param = self.env['ir.config_parameter'].sudo().get_param
+            import pdb;pdb.set_trace()
             if (procurement_uom.id != quant_uom.id
                     and get_param('stock.propagate_uom') != '1'):
                 qty_needed = line.product_uom_id._compute_quantity(
@@ -178,7 +208,7 @@ def _confirm_picking(self):
             try:
                 self.env['procurement.group'].run(
                     line.product_id, qty_needed, procurement_uom,
-                    line.order_id.fsm_location_id.inventory_location,
+                    line.order_id.location_id.inventory_location,
                     line.name, line.order_id.name, values)
             except UserError as error:
                 errors.append(error.name)

fieldservice_stock/readme/CONFIGURE.rst

@@ -1,4 +1,4 @@
 To configure this module, you need to:
 
-* Set Inventory Locations for FSM Locations and FSM Vehicles
-* Verify procurement routes
+* Go to Field Service > Master Data > Locations
+* Create or select a location and set the inventory location

fieldservice_stock/readme/INSTALL.rst

@@ -1,6 +1,4 @@
-You will first need to install:
+To install Field Service and have the mapping features, you need to install GeoEngine.
 
-* fieldservice
-
-Then go to Field Service > Configuration > Settings
-Enable the 'Use Odoo Stock Logistics' option under Integrations
+Please refer to the installation instructions available at:
+https://github.com/OCA/geospatial/tree/11.0/base_geoengine

fieldservice_stock/readme/USAGE.rst

@@ -1,7 +1,7 @@
 To use this module, you need to:
 
-* Create a new field service order
-* Under the Materials tab, add products with quantity
-* Confirm an order to create stock moves
-* Validate stock moves in the Inventory app
-* Quantities Delivered on FSM Order Line will be updated based on move
+* Create a new service order
+* Under the Inventory tab, select the warehouse and add products with quantity
+* Confirm the order to create the delivery orders
+* Validate the transfers in the Inventory app. Quantities delivered on FSM
+  Order Line will be updated.

fieldservice_stock/views/fsm_location.xml

@@ -6,7 +6,8 @@
         <field name="inherit_id" ref="fieldservice.fsm_location_form_view"/>
         <field name="arch" type="xml">
             <xpath expr="//form/sheet/group/group[2]" position="inside">
-                <field name="inventory_location" domain="[('usage', 'in', ['internal','supplier','customer'])]"/>
+                <field name="inventory_location"
+                       domain="[('usage', 'in', ['internal', 'supplier', 'customer'])]"/>
             </xpath>
         </field>
     </record>

fieldservice_stock/views/fsm_order.xml

@@ -6,31 +6,46 @@
         <field name="model">fsm.order</field>
         <field name="inherit_id" ref="fieldservice.fsm_order_form"/>
         <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <field name="picking_ids" invisible="1"/>
+                <button type="object"
+                        name="action_view_delivery"
+                        class="oe_stat_button"
+                        icon="fa-truck"
+                        attrs="{'invisible': [('delivery_count', '=', 0)]}" groups="base.group_user">
+                    <field name="delivery_count" widget="statinfo" string="Delivery"/>
+                </button>
+            </div>
             <xpath expr="//notebook/page[1]" position="after">
-                <page string="Materials">
-                    <field name="line_ids" mode="tree">
-                        <tree string="Material Order Lines" editable="bottom">
+                <page string="Inventory">
+                    <group>
+                        <group>
+                            <field name="Warehouse"/>
+                        </group>
+                        <group></group>
+                    </group>
+                    <field name="line_ids" nolabel="1">
+                        <tree editable="bottom">
                             <field name="sequence" widget="handle"/>
                             <field name="product_id"
-                                context="{
-                                    'quantity':qty_ordered,
-                                    'uom':product_uom_id,
+                                   context="{
+                                    'quantity': qty_ordered,
+                                    'uom': product_uom_id,
                                 }"
                             />
                             <field name="name"/>
                             <field name="qty_ordered"
-                                string="Ordered Qty"
-                                context="{
-                                    'quantity':qty_ordered,
-                                    'uom':product_uom_id,
+                                   string="Ordered Qty"
+                                   context="{
+                                    'quantity': qty_ordered,
+                                    'uom': product_uom_id,
                                 }"
                             />
-                            <field name="qty_delivered"
-                                 />
+                            <field name="qty_delivered"/>
                             <field name="product_uom_id"
-                                attrs="{'readonly': [('state', 'in', ('sale','done', 'cancel'))]}"
-                                options='{"no_open": True, "no_create": True}'
-                                groups="product.group_uom"/>
+                                   attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
+                                   options='{"no_open": True, "no_create": True}'
+                                   groups="product.group_uom"/>
                             <field name="state" invisible="1"/>
                         </tree>
                     </field>

fieldservice_stock/views/stock.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
+    <menuitem id="menu_fsm_product"
+              name="Products"
+              action="stock.product_template_action_product"
+              parent="fieldservice.data"
+              sequence="90"/>
+
     <menuitem id="menu_fsm_stock_inventory"
               name="Inventory"
               action="stock.quantsact"