Merge PR #1126 into 16.0

Signed-off-by brian10048

fieldservice_isp_account/README.rst

@@ -0,0 +1,129 @@
+==============================
+Field Service - ISP Accounting
+==============================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:f9d4710a8923a66e10362d2005a41eed6627543f8805e273079edd2474af7d85
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :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/16.0/fieldservice_isp_account
+    :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-16-0/field-service-16-0-fieldservice_isp_account
+    :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=16.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+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.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Installation
+============
+
+No special installation instructions
+
+Configuration
+=============
+
+No special configuration instructions.
+
+Usage
+=====
+
+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.
+
+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_isp_account%0Aversion:%2016.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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Open Source Integrators
+
+Contributors
+~~~~~~~~~~~~
+
+* Michael Allen <[email protected]>
+* Serpent Consulting Services Pvt. Ltd. <[email protected]>
+* Brian McMaster <[email protected]>
+* Freni Patel <[email protected]>
+
+Other credits
+~~~~~~~~~~~~~
+
+The development of this module has been financially supported by:
+
+* Open Source Integrators <https://opensourceintegrators.com>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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.
+
+.. |maintainer-osimallen| image:: https://github.com/osimallen.png?size=40px
+    :target: https://github.com/osimallen
+    :alt: osimallen
+.. |maintainer-brian10048| image:: https://github.com/brian10048.png?size=40px
+    :target: https://github.com/brian10048
+    :alt: brian10048
+.. |maintainer-bodedra| image:: https://github.com/bodedra.png?size=40px
+    :target: https://github.com/bodedra
+    :alt: bodedra
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-osimallen| |maintainer-brian10048| |maintainer-bodedra| 
+
+This module is part of the `OCA/field-service <https://github.com/OCA/field-service/tree/16.0/fieldservice_isp_account>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

fieldservice_isp_account/__init__.py

@@ -0,0 +1,4 @@
+# Copyright (C) 2018 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models

fieldservice_isp_account/__manifest__.py

@@ -0,0 +1,29 @@
+# Copyright (C) 2018 Open Source Integrators
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Field Service - ISP Accounting",
+    "summary": """Invoice Field Service orders based on employee time
+                  or contractor costs""",
+    "version": "16.0.1.0.0",
+    "category": "Field Service",
+    "author": "Open Source Integrators, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/field-service",
+    "depends": [
+        "fieldservice_account_analytic",
+        "fieldservice_project",
+        "hr_timesheet",
+    ],
+    "data": [
+        "security/fsm_order_cost.xml",
+        "security/ir.model.access.csv",
+        "data/time_products.xml",
+        "views/account.xml",
+        "views/fsm_order.xml",
+        "views/fsm_person.xml",
+        "views/hr_timesheet.xml",
+    ],
+    "license": "AGPL-3",
+    "development_status": "Beta",
+    "maintainers": ["osimallen", "brian10048", "bodedra"],
+}

fieldservice_isp_account/data/time_products.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo noupdate="1">
+    <record id="field_service_travel_time" model="product.template">
+        <field name="name">FSM Travel Time</field>
+        <field name="categ_id" ref="product.product_category_all" />
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_hour" />
+        <field name="uom_po_id" ref="uom.product_uom_hour" />
+        <field name="description_sale">Travel time for Field Service
+            Employees
+        </field>
+    </record>
+    <record id="field_service_regular_time" model="product.template">
+        <field name="name">FSM Regular Time</field>
+        <field name="categ_id" ref="product.product_category_all" />
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_hour" />
+        <field name="uom_po_id" ref="uom.product_uom_hour" />
+        <field name="description_sale">Regular time for Field Service
+            Employees
+        </field>
+    </record>
+    <record id="field_service_overtime" model="product.template">
+        <field name="name">FSM Overtime</field>
+        <field name="categ_id" ref="product.product_category_all" />
+        <field name="type">service</field>
+        <field name="uom_id" ref="uom.product_uom_hour" />
+        <field name="uom_po_id" ref="uom.product_uom_hour" />
+        <field name="description_sale">Overtime for Field Service Employees
+        </field>
+    </record>
+</odoo>