[IMP] fieldservice_account: Simplify module

- This change removes most of the invoicing logic from fieldservice_account and puts it into its own module

Author: brian10048

fieldservice_account/__manifest__.py

@@ -3,30 +3,23 @@
 
 {
     'name': 'Field Service - Accounting',
-    'summary': 'Track employee time and invoice Field Service orders',
+    'summary': 'Track invoices linked to Field Service orders',
     'version': '12.0.2.0.1',
     'category': 'Field Service',
     'author': 'Open Source Integrators, Odoo Community Association (OCA)',
     'website': 'https://github.com/OCA/field-service',
     'depends': [
         'fieldservice',
-        'hr_timesheet',
-        'analytic',
         'account',
-        'product',
     ],
     'data': [
-        'data/time_products.xml',
-        'data/ir_rule.xml',
         'security/ir.model.access.csv',
         'report/fsm_order_report_template.xml',
-        'views/account.xml',
         'views/fsm_location.xml',
         'views/fsm_order.xml',
         'views/fsm_person.xml',
         'views/fsm_route.xml',
         'views/account_invoice_view.xml',
-        'views/hr_timesheet.xml'
     ],
     'demo': [
         'demo/fsm_location.xml',

fieldservice_account/models/account_invoice.py

@@ -1,8 +1,7 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import api, fields, models, _
-from odoo.exceptions import ValidationError
+from odoo import fields, models
 
 
 class AccountInvoice(models.Model):
@@ -15,40 +14,3 @@ class AccountInvoiceLine(models.Model):
     _inherit = "account.invoice.line"
 
     fsm_order_id = fields.Many2one('fsm.order', string='FSM Order')
-
-    @api.model
-    def create(self, vals):
-        order = self.env['fsm.order'].browse(vals.get('fsm_order_id'))
-        if order:
-            if order.location_id.analytic_account_id:
-                vals['account_analytic_id'] = order.location_id.\
-                    analytic_account_id.id
-            else:
-                raise ValidationError(_("No analytic account "
-                                        "set on the order's Location."))
-        return super(AccountInvoiceLine, self).create(vals)
-
-    @api.onchange('product_id', 'quantity')
-    def onchange_product_id(self):
-        for line in self:
-            if line.fsm_order_id:
-                partner = line.fsm_order_id.person_id and\
-                    line.fsm_order_id.person_id.partner_id or False
-                if not partner:
-                    raise ValidationError(
-                        _("Please set the field service worker."))
-                fpos = partner.property_account_position_id
-                tmpl = line.product_id.product_tmpl_id
-                if line.product_id:
-                    accounts = tmpl.get_product_accounts()
-                    supinfo = self.env['product.supplierinfo'].search(
-                        [('name', '=', partner.id),
-                         ('product_tmpl_id', '=', tmpl.id),
-                         ('min_qty', '<=', line.quantity)],
-                        order='min_qty DESC')
-                    line.price_unit = \
-                        supinfo and supinfo[0].price or tmpl.standard_price
-                    line.account_id = accounts.get('expense', False)
-                    line.invoice_line_tax_ids = fpos.\
-                        map_tax(tmpl.supplier_taxes_id)
-                    line.name = line.product_id.name

fieldservice_account/models/fsm_location.py

@@ -7,8 +7,6 @@
 class FSMLocation(models.Model):
     _inherit = 'fsm.location'
 
-    analytic_account_id = fields.Many2one('account.analytic.account',
-                                          string='Analytic Account')
     customer_id = fields.Many2one(
         'res.partner', string='Billed Customer', required=True,
         ondelete='restrict', auto_join=True, track_visibility='onchange')

fieldservice_account/models/fsm_order.py

@@ -1,35 +1,14 @@
 # Copyright (C) 2018 - TODAY, Open Source Integrators
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
-from odoo.exceptions import ValidationError
-
-
-ACCOUNT_STAGES = [('draft', 'Draft'),
-                  ('review', 'Needs Review'),
-                  ('confirmed', 'Confirmed'),
-                  ('invoiced', 'Fully Invoiced'),
-                  ('no', 'Nothing Invoiced')]
+from odoo import api, fields, models
 
 
 class FSMOrder(models.Model):
     _inherit = 'fsm.order'
 
-    contractor_cost_ids = fields.One2many('account.invoice.line',
-                                          'fsm_order_id',
-                                          string='Contractor Costs')
-    employee_timesheet_ids = fields.One2many('account.analytic.line',
-                                             "fsm_order_id",
-                                             string='Employee Timesheets')
     total_cost = fields.Float(compute='_compute_total_cost',
                               string='Total Cost')
-    employee = fields.Boolean(compute='_compute_employee')
-    contractor_total = fields.Float(compute='_compute_contractor_cost',
-                                    string='Contractor Cost Estimate')
-    employee_time_total = fields.Float(compute='_compute_employee_hours',
-                                       string='Total Employee Hours')
-    account_stage = fields.Selection(ACCOUNT_STAGES, string='Accounting Stage',
-                                     default='draft')
     bill_to = fields.Selection([('location', 'Bill Location'),
                                 ('contact', 'Bill Contact')],
                                string="Bill to",
@@ -41,158 +20,10 @@ class FSMOrder(models.Model):
                                   index=True,
                                   track_visibility='always')
 
-    def _compute_employee(self):
-        user = self.env['res.users'].browse(self.env.uid)
-        for order in self:
-            if user.employee_ids:
-                order.employee = True
-
-    @api.depends('employee_timesheet_ids', 'contractor_cost_ids')
     def _compute_total_cost(self):
+        """ To be overridden as needed from other modules """
         for order in self:
             order.total_cost = 0.0
-            rate = 0
-            for line in order.employee_timesheet_ids:
-                rate = line.employee_id.timesheet_cost
-                order.total_cost += line.unit_amount * rate
-            for cost in order.contractor_cost_ids:
-                order.total_cost += cost.price_unit * cost.quantity
-
-    @api.depends('employee_timesheet_ids')
-    def _compute_employee_hours(self):
-        for order in self:
-            order.employee_time_total = 0.0
-            for line in order.employee_timesheet_ids:
-                order.employee_time_total += line.unit_amount
-
-    @api.depends('contractor_cost_ids')
-    def _compute_contractor_cost(self):
-        for order in self:
-            order.contractor_total = 0.0
-            for cost in order.contractor_cost_ids:
-                order.contractor_total += cost.price_unit * cost.quantity
-
-    def action_complete(self):
-        for order in self:
-            order.account_stage = 'review'
-        if self.person_id.supplier and not self.contractor_cost_ids:
-            raise ValidationError(_("Cannot move to Complete " +
-                                    "until 'Contractor Costs' is filled in"))
-        if not self.person_id.supplier and not self.employee_timesheet_ids:
-            raise ValidationError(_("Cannot move to Complete until " +
-                                    "'Employee Timesheets' is filled in"))
-        return super(FSMOrder, self).action_complete()
-
-    def create_bills(self):
-        jrnl = self.env['account.journal'].search([
-            ('company_id', '=', self.env.user.company_id.id),
-            ('type', '=', 'purchase'),
-            ('active', '=', True)],
-            limit=1)
-        fpos = self.customer_id.property_account_position_id
-        vals = {
-            'partner_id': self.person_id.partner_id.id,
-            'type': 'in_invoice',
-            'journal_id': jrnl.id or False,
-            'fiscal_position_id': fpos.id or False,
-            'fsm_order_id': self.id
-        }
-        bill = self.env['account.invoice'].sudo().create(vals)
-        for line in self.contractor_cost_ids:
-            line.invoice_id = bill
-        bill.compute_taxes()
-
-    def account_confirm(self):
-        for order in self:
-            contractor = order.person_id.partner_id.supplier
-            if order.contractor_cost_ids:
-                if contractor:
-                    order.create_bills()
-                    order.account_stage = 'confirmed'
-                else:
-                    raise ValidationError(_("The worker assigned to this order"
-                                            " is not a supplier"))
-            if order.employee_timesheet_ids:
-                order.account_stage = 'confirmed'
-
-    def account_create_invoice(self):
-        jrnl = self.env['account.journal'].search([
-            ('company_id', '=', self.env.user.company_id.id),
-            ('type', '=', 'sale'),
-            ('active', '=', True)],
-            limit=1)
-        if self.bill_to == 'contact':
-            if not self.customer_id:
-                raise ValidationError(_("Contact empty"))
-            fpos = self.customer_id.property_account_position_id
-            vals = {
-                'partner_id': self.customer_id.id,
-                'type': 'out_invoice',
-                'journal_id': jrnl.id or False,
-                'fiscal_position_id': fpos.id or False,
-                'fsm_order_id': self.id
-            }
-            invoice = self.env['account.invoice'].sudo().create(vals)
-            price_list = invoice.partner_id.property_product_pricelist
-        else:
-            fpos = self.location_id.customer_id.property_account_position_id
-            vals = {
-                'partner_id': self.location_id.customer_id.id,
-                'type': 'out_invoice',
-                'journal_id': jrnl.id or False,
-                'fiscal_position_id': fpos.id or False,
-                'fsm_order_id': self.id
-            }
-            invoice = self.env['account.invoice'].sudo().create(vals)
-            price_list = invoice.partner_id.property_product_pricelist
-        for line in self.employee_timesheet_ids:
-            price = price_list.get_product_price(product=line.product_id,
-                                                 quantity=line.unit_amount,
-                                                 partner=invoice.partner_id,
-                                                 date=False,
-                                                 uom_id=False)
-            template = line.product_id.product_tmpl_id
-            accounts = template.get_product_accounts()
-            account = accounts['income']
-            vals = {
-                'product_id': line.product_id.id,
-                'account_analytic_id': line.account_id.id,
-                'quantity': line.unit_amount,
-                'name': line.name,
-                'price_unit': price,
-                'account_id': account.id,
-                'invoice_id': invoice.id
-            }
-            time_cost = self.env['account.invoice.line'].create(vals)
-            taxes = template.taxes_id
-            time_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
-        for cost in self.contractor_cost_ids:
-            price = price_list.get_product_price(product=cost.product_id,
-                                                 quantity=cost.quantity,
-                                                 partner=invoice.partner_id,
-                                                 date=False,
-                                                 uom_id=False)
-            template = cost.product_id.product_tmpl_id
-            accounts = template.get_product_accounts()
-            account = accounts['income']
-            vals = {
-                'product_id': cost.product_id.id,
-                'account_analytic_id': cost.account_analytic_id.id,
-                'quantity': cost.quantity,
-                'name': cost.name,
-                'price_unit': price,
-                'account_id': account.id,
-                'invoice_id': invoice.id
-            }
-            con_cost = self.env['account.invoice.line'].create(vals)
-            taxes = template.taxes_id
-            con_cost.invoice_line_tax_ids = fpos.map_tax(taxes)
-        invoice.compute_taxes()
-        self.account_stage = 'invoiced'
-        return invoice
-
-    def account_no_invoice(self):
-        self.account_stage = 'no'
 
     @api.onchange('location_id')
     def _onchange_location_id_customer_account(self):

fieldservice_account/readme/CONFIGURE.rst

@@ -1,4 +1 @@
-To configure this module, you need to:
-
-* Go to Field Service > Master Data > Locations
-* Create or select a location and set their analytic account
+No special configuration instructions.

fieldservice_account/readme/DESCRIPTION.rst

@@ -1,4 +1,3 @@
-This module adds the ability to track employee time and contractor
-costs for Field Service Orders. It also adds functionality to create
-a customer invoice and a vendor bill when a Field Service Order is
-completed.
+This module adds the ability to link field service orders to invoices.
+It also adds the option to track the billing partner for field service
+locations and orders.

fieldservice_account/readme/USAGE.rst

@@ -1,12 +1 @@
-To use the module:
-
-On a field service order, open the "Accounting" tab. Depending on 
-whether the logged in user or an employee or not, they will see 
-either a place to enter timesheet records or contractor costs.
-
-The total cost of the order is calculated based on the entries in 
-the employee timesheet entries and contractor costs.
-
-When an order is completed, a customer invoice will be generated for
-the employee time and the contractor costs. A vendor bill will be 
-created for the contractor costs.
+No specific usage instructions.

fieldservice_account/security/ir.model.access.csv

@@ -1,6 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_account_invoice_line_fsm_user,account.invoice.line.fsm.user,model_account_invoice_line,fieldservice.group_fsm_user,1,1,1,1
-access_account_analytic_line_fsm_manager,account.analytic.line.manager,model_account_analytic_line,fieldservice.group_fsm_manager,1,1,1,1
-access_account_analytic_line_fsm_dispatcher,account.analytic.line.dispatcher,model_account_analytic_line,fieldservice.group_fsm_dispatcher,1,1,1,0
-access_analytic_account_fsm_manager,account.analytic.account.manager,analytic.model_account_analytic_account,fieldservice.group_fsm_manager,1,1,1,1
-access_analytic_account_fsm_dispatcher,account.analytic.account.dispatcher,analytic.model_account_analytic_account,fieldservice.group_fsm_dispatcher,1,1,1,0