Compare commits
2 Commits
18.0
...
8ab14340f1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8ab14340f1 | ||
|
|
9192465ca2 |
@@ -1 +1,2 @@
|
|||||||
|
|
||||||
from . import models, controllers
|
from . import models, controllers
|
||||||
|
|||||||
@@ -5,13 +5,17 @@
|
|||||||
"name": "project_average_acceptable_time",
|
"name": "project_average_acceptable_time",
|
||||||
"version": "18.0.1.0.0",
|
"version": "18.0.1.0.0",
|
||||||
"author": "Elabore",
|
"author": "Elabore",
|
||||||
"website": "https://git.elabore.coop/elabore/project-tools",
|
"website": "https://github.com/elabore-coop/project-tools",
|
||||||
"maintainer": "Clément Thomas",
|
"maintainer": "Clément Thomas",
|
||||||
"license": "AGPL-3",
|
"license": "AGPL-3",
|
||||||
"category": "Tools",
|
"category": "Tools",
|
||||||
"summary": "Task validation without customer agreement",
|
"summary": "Task validation without customer agreement",
|
||||||
# any module necessary for this one to work correctly
|
# any module necessary for this one to work correctly
|
||||||
"depends": ["base", "project", "project_user_default_project"],
|
"depends": [
|
||||||
|
"base",
|
||||||
|
"project",
|
||||||
|
"project_user_default_project"
|
||||||
|
],
|
||||||
"qweb": [
|
"qweb": [
|
||||||
# "static/src/xml/*.xml",
|
# "static/src/xml/*.xml",
|
||||||
],
|
],
|
||||||
@@ -19,7 +23,10 @@
|
|||||||
"python": [],
|
"python": [],
|
||||||
},
|
},
|
||||||
# always loaded
|
# always loaded
|
||||||
"data": ["views/project_project.xml", "views/portal_home_template.xml"],
|
"data": [
|
||||||
|
"views/project_project.xml",
|
||||||
|
"views/portal_home_template.xml"
|
||||||
|
],
|
||||||
# only loaded in demonstration mode
|
# only loaded in demonstration mode
|
||||||
"demo": [],
|
"demo": [],
|
||||||
"js": [],
|
"js": [],
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
|
|
||||||
from . import custom_portal
|
from . import custom_portal
|
||||||
@@ -1,26 +1,21 @@
|
|||||||
# Copyright 2020 Lokavaluto ()
|
# Copyright 2020 Lokavaluto ()
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||||
from odoo.http import request, route
|
from odoo.http import request, route
|
||||||
|
|
||||||
from odoo.addons.portal.controllers.portal import CustomerPortal
|
from odoo.addons.portal.controllers.portal import CustomerPortal
|
||||||
|
|
||||||
|
|
||||||
class CustomCustomerPortal(CustomerPortal):
|
class CustomCustomerPortal(CustomerPortal):
|
||||||
@route(["/my/account"], type="http", auth="user", website=True)
|
@route(["/my/account"], type="http", auth="user", website=True)
|
||||||
def account(self, redirect=None, **post):
|
def account(self, redirect=None, **post):
|
||||||
self.OPTIONAL_BILLING_FIELDS.append(
|
self.OPTIONAL_BILLING_FIELDS.append("average_acceptable_time") #unecessary save in res partner, but necessary to avoid error on form post
|
||||||
"average_acceptable_time"
|
|
||||||
) # unecessary save in res partner, but necessary to avoid error on form post
|
|
||||||
|
|
||||||
response = super().account(redirect, **post)
|
response = super(CustomCustomerPortal, self).account(redirect, **post)
|
||||||
|
|
||||||
if post and request.httprequest.method == "POST":
|
if post and request.httprequest.method == "POST":
|
||||||
error, error_message = self.details_form_validate(post)
|
error, error_message = self.details_form_validate(post)
|
||||||
if not error:
|
if not error:
|
||||||
user = request.env.user
|
user = request.env.user
|
||||||
if user.default_project_id and post["average_acceptable_time"]:
|
if user.default_project_id and post["average_acceptable_time"]:
|
||||||
user.default_project_id.average_acceptable_time = post[
|
user.default_project_id.average_acceptable_time = post["average_acceptable_time"]
|
||||||
"average_acceptable_time"
|
|
||||||
]
|
|
||||||
|
|
||||||
return response
|
return response
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
|
|
||||||
from . import project_project
|
from . import project_project
|
||||||
from . import res_partner
|
from . import res_partner
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
from odoo import fields, models
|
|
||||||
|
from odoo import models, fields, _, api
|
||||||
|
|
||||||
|
|
||||||
class Project(models.Model):
|
class Project(models.Model):
|
||||||
_inherit = "project.project"
|
_inherit = "project.project"
|
||||||
|
|
||||||
average_acceptable_time = fields.Float("Average acceptable time")
|
average_acceptable_time = fields.Float('Average acceptable time')
|
||||||
|
|
||||||
|
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
from odoo import fields, models
|
|
||||||
|
from odoo import models, fields, _, api
|
||||||
|
|
||||||
|
|
||||||
class ResPartner(models.Model):
|
class ResPartner(models.Model):
|
||||||
_inherit = "res.partner"
|
_inherit = "res.partner"
|
||||||
|
|
||||||
average_acceptable_time = fields.Float(
|
average_acceptable_time = fields.Float('Average acceptable time') # not used, but necessary to post custom field from /my/account
|
||||||
"Average acceptable time"
|
|
||||||
) # not used, but necessary to post custom field from /my/account
|
|
||||||
@@ -1,42 +1,25 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<!-- Template /my/home -->
|
<!-- Template /my/home -->
|
||||||
<template
|
<template id="portal_my_home_average_acceptable_time" name="Portal My Home: Average acceptable time" inherit_id="portal.side_content" priority="40">
|
||||||
id="portal_my_home_average_acceptable_time"
|
|
||||||
name="Portal My Home: Average acceptable time"
|
|
||||||
inherit_id="portal.side_content"
|
|
||||||
priority="40"
|
|
||||||
>
|
|
||||||
<xpath expr="//div[@class='o_portal_my_details']" position="inside">
|
<xpath expr="//div[@class='o_portal_my_details']" position="inside">
|
||||||
<hr class="mt-1 mb-0" />
|
<hr class="mt-1 mb-0"/>
|
||||||
<b>Average acceptable time</b>: <t
|
<b>Average acceptable time</b>: <t t-esc="user_id.default_project_id.average_acceptable_time" t-options="{'widget': 'float_time'}"/>
|
||||||
t-esc="user_id.default_project_id.average_acceptable_time"
|
|
||||||
t-options="{'widget': 'float_time'}"
|
|
||||||
/>
|
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- Template /my/account -->
|
<!-- Template /my/account -->
|
||||||
<template
|
<template id="portal_my_details_average_acceptable_time" name="Portal My details: Average acceptable time" inherit_id="portal.portal_my_details_fields">
|
||||||
id="portal_my_details_average_acceptable_time"
|
|
||||||
name="Portal My details: Average acceptable time"
|
|
||||||
inherit_id="portal.portal_my_details_fields"
|
|
||||||
>
|
|
||||||
<xpath expr="//input[@name='csrf_token']/.." position="inside">
|
<xpath expr="//input[@name='csrf_token']/.." position="inside">
|
||||||
<div
|
<div t-attf-class="form-group #{error.get('average_acceptable_time') and 'o_has_error' or ''} col-xl-6">
|
||||||
t-attf-class="form-group #{error.get('average_acceptable_time') and 'o_has_error' or ''} col-xl-6"
|
<label class="col-form-label" for="average_acceptable_time">Average acceptable time (h)</label>
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="col-form-label"
|
|
||||||
for="average_acceptable_time"
|
|
||||||
>Average acceptable time (h)</label>
|
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
name="average_acceptable_time"
|
name="average_acceptable_time"
|
||||||
t-attf-class="form-control #{error.get('average_acceptable_time') and 'is-invalid' or ''}"
|
t-attf-class="form-control #{error.get('average_acceptable_time') and 'is-invalid' or ''}"
|
||||||
t-att-value="average_acceptable_time or user_id.default_project_id.average_acceptable_time"
|
t-att-value="average_acceptable_time or user_id.default_project_id.average_acceptable_time"
|
||||||
t-options="{'widget': 'float_time'}"
|
t-options="{'widget': 'float_time'}"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</xpath>
|
</xpath>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,44 +1,33 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<odoo>
|
<odoo>
|
||||||
|
|
||||||
<!--Project KANBAN -->
|
<!--Project KANBAN -->
|
||||||
<record
|
<record id="project_project_view_kanban_inherit_average_acceptable_time" model="ir.ui.view">
|
||||||
id="project_project_view_kanban_inherit_average_acceptable_time"
|
<field name="name">project.project.kanban.inherit.average.acceptable.time</field>
|
||||||
model="ir.ui.view"
|
|
||||||
>
|
|
||||||
<field
|
|
||||||
name="name"
|
|
||||||
>project.project.kanban.inherit.average.acceptable.time</field>
|
|
||||||
<field name="model">project.project</field>
|
<field name="model">project.project</field>
|
||||||
<field name="inherit_id" ref="project.view_project_kanban" />
|
<field name="inherit_id" ref="project.view_project_kanban"/>
|
||||||
<field name="priority">999</field>
|
<field name="priority">999</field>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//div[hasclass('o_project_kanban_main')]" position="inside">
|
<xpath expr="//div[hasclass('o_project_kanban_main')]" position="inside">
|
||||||
<div class="o_project_kanban_boxes">
|
<div class="o_project_kanban_boxes">
|
||||||
<span>Average acceptable time:<![CDATA[ ]]></span>
|
<span>Average acceptable time:<![CDATA[ ]]></span>
|
||||||
<field name="average_acceptable_time" widget="float_time" />
|
<field name="average_acceptable_time" widget="float_time"/>
|
||||||
</div>
|
</div>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
<!-- Project FORM -->
|
<!-- Project FORM -->
|
||||||
<record
|
<record id="project_project_form_inherit_average_acceptable_time" model="ir.ui.view">
|
||||||
id="project_project_form_inherit_average_acceptable_time"
|
|
||||||
model="ir.ui.view"
|
|
||||||
>
|
|
||||||
<field name="name">project.project.form.inherit.average.acceptable.time</field>
|
<field name="name">project.project.form.inherit.average.acceptable.time</field>
|
||||||
<field name="model">project.project</field>
|
<field name="model">project.project</field>
|
||||||
<field name="inherit_id" ref="project.edit_project" />
|
<field name="inherit_id" ref="project.edit_project"/>
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//group[@name='extra_settings']" position="inside">
|
<xpath expr="//group[@name='extra_settings']" position="inside">
|
||||||
<div
|
<div class="o_settings_average_acceptable_time" style="margin-top:10px;">
|
||||||
class="o_settings_average_acceptable_time"
|
|
||||||
style="margin-top:10px;"
|
|
||||||
>
|
|
||||||
<!-- <span>Average acceptable time:<![CDATA[ ]]></span> -->
|
<!-- <span>Average acceptable time:<![CDATA[ ]]></span> -->
|
||||||
<label for="average_acceptable_time" />
|
<label for="average_acceptable_time"/>
|
||||||
<field name="average_acceptable_time" widget="float_time" />
|
<field name="average_acceptable_time" widget="float_time"/>
|
||||||
</div>
|
</div>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
|
|||||||
@@ -1,60 +0,0 @@
|
|||||||
# Project Link From Invoice
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
Easily access your projects directly from invoices:
|
|
||||||
|
|
||||||
- Displays project name(s) in the invoice list view.
|
|
||||||
- Adds a smart button on invoice form view to open the related project(s).
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
This module depends on:
|
|
||||||
|
|
||||||
- `project` (Odoo core)
|
|
||||||
- `account` (Odoo core)
|
|
||||||
- `sale_project` (Odoo core)
|
|
||||||
|
|
||||||
Use Odoo's normal procedure to install add-ons.
|
|
||||||
|
|
||||||
## Configuration
|
|
||||||
|
|
||||||
No specific configuration is required.
|
|
||||||
|
|
||||||
## Usage
|
|
||||||
|
|
||||||
Open an invoice that is linked to a sale order. If the sale order has tasks
|
|
||||||
in a project, a "Project(s)" button appears in the header of the invoice form.
|
|
||||||
Clicking it opens the related project(s) in form or list view.
|
|
||||||
|
|
||||||
The invoice list view also displays the project name(s) in a dedicated column.
|
|
||||||
|
|
||||||
## Known issues / Roadmap
|
|
||||||
|
|
||||||
None yet.
|
|
||||||
|
|
||||||
## Bug Tracker
|
|
||||||
|
|
||||||
Bugs are tracked on [our issues website](https://github.com/elabore-coop/project-tools/issues).
|
|
||||||
In case of trouble, please check there if your issue has already been reported.
|
|
||||||
If you spotted it first, help us smash it by providing detailed and welcomed feedback.
|
|
||||||
|
|
||||||
## Credits
|
|
||||||
|
|
||||||
### Images
|
|
||||||
|
|
||||||
- Elabore: [Icon](https://elabore.coop/web/image/res.company/1/logo)
|
|
||||||
|
|
||||||
### Contributors
|
|
||||||
|
|
||||||
- Clément Thomas
|
|
||||||
|
|
||||||
### Funders
|
|
||||||
|
|
||||||
The development of this module has been financially supported by:
|
|
||||||
|
|
||||||
- Elabore (<https://elabore.coop>)
|
|
||||||
|
|
||||||
### Maintainer
|
|
||||||
|
|
||||||
This module is maintained by Elabore.
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
|
|
||||||
from . import models
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
# Copyright 2022 Stéphan Sainléger (Elabore)
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "project_link_from_invoice",
|
|
||||||
"version": "18.0.1.0.0",
|
|
||||||
"author": "Elabore",
|
|
||||||
"website": "https://git.elabore.coop/elabore/project-tools",
|
|
||||||
"maintainer": "Clément Thomas",
|
|
||||||
"license": "AGPL-3",
|
|
||||||
"category": "Tools",
|
|
||||||
"summary": "Add link from invoice to project",
|
|
||||||
# any module necessary for this one to work correctly
|
|
||||||
"depends": [
|
|
||||||
"base",
|
|
||||||
"project",
|
|
||||||
"account",
|
|
||||||
"sale_project",
|
|
||||||
],
|
|
||||||
"external_dependencies": {
|
|
||||||
"python": [],
|
|
||||||
},
|
|
||||||
# always loaded
|
|
||||||
"data": [
|
|
||||||
"views/account_move_view.xml",
|
|
||||||
],
|
|
||||||
# only loaded in demonstration mode
|
|
||||||
"demo": [],
|
|
||||||
"installable": True,
|
|
||||||
# Install this module automatically if all dependency have been previously
|
|
||||||
# and independently installed. Used for synergetic or glue modules.
|
|
||||||
"auto_install": False,
|
|
||||||
"application": False,
|
|
||||||
}
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
# Translation of Odoo Server.
|
|
||||||
# This file contains the translation of the following modules:
|
|
||||||
# * project_link_from_invoice
|
|
||||||
#
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: Odoo Server 14.0\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2023-04-27 12:47+0000\n"
|
|
||||||
"PO-Revision-Date: 2023-04-27 12:47+0000\n"
|
|
||||||
"Last-Translator: \n"
|
|
||||||
"Language-Team: \n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
|
||||||
"Content-Transfer-Encoding: \n"
|
|
||||||
"Plural-Forms: \n"
|
|
||||||
|
|
||||||
#. module: project_link_from_invoice
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_move__display_name
|
|
||||||
msgid "Display Name"
|
|
||||||
msgstr "Nom affiché"
|
|
||||||
|
|
||||||
#. module: project_link_from_invoice
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_move__id
|
|
||||||
msgid "ID"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_link_from_invoice
|
|
||||||
#: model:ir.model,name:project_link_from_invoice.model_account_move
|
|
||||||
msgid "Journal Entry"
|
|
||||||
msgstr "Pièce comptable"
|
|
||||||
|
|
||||||
#. module: project_link_from_invoice
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_move____last_update
|
|
||||||
msgid "Last Modified on"
|
|
||||||
msgstr "Dernière modification le"
|
|
||||||
|
|
||||||
#. module: project_link_from_invoice
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_bank_statement_line__project_ids
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_move__project_ids
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_payment__project_ids
|
|
||||||
msgid "Project"
|
|
||||||
msgstr "Projet"
|
|
||||||
|
|
||||||
#. module: project_link_from_invoice
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_bank_statement_line__project_count
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_move__project_count
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_payment__project_count
|
|
||||||
msgid "Project Count"
|
|
||||||
msgstr "Numbre de projets"
|
|
||||||
|
|
||||||
#. module: project_link_from_invoice
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_link_from_invoice.view_move_form_project_link_from_invoice_inherit
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_bank_statement_line__projects_name
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_move__projects_name
|
|
||||||
#: model:ir.model.fields,field_description:project_link_from_invoice.field_account_payment__projects_name
|
|
||||||
msgid "Project(s)"
|
|
||||||
msgstr "Projet(s)"
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
|
|
||||||
from . import account_move
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
# Copyright 2022 Stéphan Sainléger (Elabore)
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
|
||||||
|
|
||||||
from odoo import api, fields, models
|
|
||||||
|
|
||||||
|
|
||||||
class AccountMove(models.Model):
|
|
||||||
_inherit = "account.move"
|
|
||||||
|
|
||||||
project_ids = fields.Many2many(
|
|
||||||
"project.project", string="Projects", compute="_get_related_project_ids"
|
|
||||||
)
|
|
||||||
project_count = fields.Integer("Project Count", compute="_get_related_project_ids")
|
|
||||||
projects_name = fields.Char("Project(s)", compute="_get_related_project_ids")
|
|
||||||
|
|
||||||
def action_open_projects(self):
|
|
||||||
"""Open related projects, in form or list view depending on project numbers."""
|
|
||||||
project_ids = self.project_ids.ids
|
|
||||||
action = self.env["ir.actions.actions"]._for_xml_id(
|
|
||||||
"project.open_view_project_all"
|
|
||||||
)
|
|
||||||
|
|
||||||
if self.project_count == 1:
|
|
||||||
action["res_id"] = project_ids[0]
|
|
||||||
action["views"] = [[False, "form"]]
|
|
||||||
else:
|
|
||||||
action["views"] = [[False, "list"], [False, "form"]]
|
|
||||||
|
|
||||||
action["domain"] = [("id", "in", project_ids)]
|
|
||||||
|
|
||||||
del action["target"] # to display breadcrumbs
|
|
||||||
|
|
||||||
return action
|
|
||||||
|
|
||||||
@api.depends("line_ids.sale_line_ids")
|
|
||||||
def _get_related_project_ids(self):
|
|
||||||
for move in self:
|
|
||||||
projects = self.env["project.task"].search(
|
|
||||||
[
|
|
||||||
(
|
|
||||||
"sale_order_id",
|
|
||||||
"in",
|
|
||||||
move.line_ids.sale_line_ids.order_id.ids,
|
|
||||||
)
|
|
||||||
]
|
|
||||||
).project_id
|
|
||||||
move.project_ids = projects.ids
|
|
||||||
move.projects_name = " ; ".join([p.name for p in projects])
|
|
||||||
move.project_count = len(projects)
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
# Copyright 2022 Stéphan Sainléger (Elabore)
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
|
||||||
|
|
||||||
from . import test_account_move
|
|
||||||
@@ -1,193 +0,0 @@
|
|||||||
# Copyright 2022 Stéphan Sainléger (Elabore)
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
|
||||||
|
|
||||||
from odoo import Command
|
|
||||||
from odoo.tests import tagged
|
|
||||||
from odoo.addons.sale_project.tests.common import TestSaleProjectCommon
|
|
||||||
|
|
||||||
|
|
||||||
@tagged("post_install", "-at_install")
|
|
||||||
class TestProjectLinkFromInvoice(TestSaleProjectCommon):
|
|
||||||
"""Tests for the project_link_from_invoice module.
|
|
||||||
|
|
||||||
Verifies that invoices correctly expose related project(s) via
|
|
||||||
the computed fields project_ids, project_count and projects_name.
|
|
||||||
"""
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def setUpClass(cls):
|
|
||||||
super().setUpClass()
|
|
||||||
cls.env = cls.env(context=dict(cls.env.context, tracking_disable=True))
|
|
||||||
|
|
||||||
# Service product that creates a task in a new project on SO confirmation
|
|
||||||
cls.service_product = cls.env["product.product"].create(
|
|
||||||
{
|
|
||||||
"name": "Service with Project",
|
|
||||||
"type": "service",
|
|
||||||
"invoice_policy": "order",
|
|
||||||
"service_tracking": "task_in_project",
|
|
||||||
}
|
|
||||||
)
|
|
||||||
|
|
||||||
# Partner used for orders and invoices
|
|
||||||
cls.partner = cls.env["res.partner"].create({"name": "Test Partner"})
|
|
||||||
|
|
||||||
def _confirm_sale_order(self, product, qty=1):
|
|
||||||
"""Create and confirm a sale order with one service line."""
|
|
||||||
so = self.env["sale.order"].create(
|
|
||||||
{
|
|
||||||
"partner_id": self.partner.id,
|
|
||||||
"order_line": [
|
|
||||||
Command.create(
|
|
||||||
{
|
|
||||||
"product_id": product.id,
|
|
||||||
"product_uom_qty": qty,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
],
|
|
||||||
}
|
|
||||||
)
|
|
||||||
so.action_confirm()
|
|
||||||
return so
|
|
||||||
|
|
||||||
def _invoice_sale_order(self, sale_order):
|
|
||||||
"""Create and post an invoice from a confirmed sale order."""
|
|
||||||
invoice_wizard = (
|
|
||||||
self.env["sale.advance.payment.inv"]
|
|
||||||
.with_context(
|
|
||||||
active_model="sale.order",
|
|
||||||
active_ids=sale_order.ids,
|
|
||||||
active_id=sale_order.id,
|
|
||||||
)
|
|
||||||
.create({"advance_payment_method": "delivered"})
|
|
||||||
)
|
|
||||||
invoices = invoice_wizard._create_invoices(sale_order)
|
|
||||||
invoices.action_post()
|
|
||||||
return invoices
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------
|
|
||||||
# Tests
|
|
||||||
# ------------------------------------------------------------------
|
|
||||||
|
|
||||||
def test_no_project_on_unrelated_invoice(self):
|
|
||||||
"""An invoice not linked to any sale order has no related project."""
|
|
||||||
invoice = self.env["account.move"].create(
|
|
||||||
{
|
|
||||||
"move_type": "out_invoice",
|
|
||||||
"partner_id": self.partner.id,
|
|
||||||
"invoice_line_ids": [
|
|
||||||
Command.create(
|
|
||||||
{
|
|
||||||
"name": "Manual line",
|
|
||||||
"quantity": 1,
|
|
||||||
"price_unit": 100.0,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
],
|
|
||||||
}
|
|
||||||
)
|
|
||||||
self.assertEqual(invoice.project_count, 0)
|
|
||||||
self.assertFalse(invoice.project_ids)
|
|
||||||
self.assertEqual(invoice.projects_name, "")
|
|
||||||
|
|
||||||
def test_single_project_linked_to_invoice(self):
|
|
||||||
"""An invoice from a SO that created a task has one related project."""
|
|
||||||
so = self._confirm_sale_order(self.service_product)
|
|
||||||
# The SO must have generated a task in a project
|
|
||||||
task = so.tasks_ids[:1]
|
|
||||||
self.assertTrue(task, "Sale order confirmation should have created a task")
|
|
||||||
project = task.project_id
|
|
||||||
self.assertTrue(project, "Task should belong to a project")
|
|
||||||
|
|
||||||
invoice = self._invoice_sale_order(so)
|
|
||||||
self.assertEqual(len(invoice), 1)
|
|
||||||
self.assertEqual(invoice.project_count, 1)
|
|
||||||
self.assertIn(project, invoice.project_ids)
|
|
||||||
self.assertIn(project.name, invoice.projects_name)
|
|
||||||
|
|
||||||
def test_multiple_projects_linked_to_invoice(self):
|
|
||||||
"""An invoice from two SOs with different projects shows both projects."""
|
|
||||||
so1 = self._confirm_sale_order(self.service_product)
|
|
||||||
so2 = self._confirm_sale_order(self.service_product)
|
|
||||||
|
|
||||||
project1 = so1.tasks_ids[:1].project_id
|
|
||||||
project2 = so2.tasks_ids[:1].project_id
|
|
||||||
self.assertTrue(project1 and project2)
|
|
||||||
# Ensure the two SOs created different projects
|
|
||||||
self.assertNotEqual(project1, project2)
|
|
||||||
|
|
||||||
# Create a single invoice covering both sale orders
|
|
||||||
invoice_wizard = (
|
|
||||||
self.env["sale.advance.payment.inv"]
|
|
||||||
.with_context(
|
|
||||||
active_model="sale.order",
|
|
||||||
active_ids=(so1 + so2).ids,
|
|
||||||
)
|
|
||||||
.create({"advance_payment_method": "delivered"})
|
|
||||||
)
|
|
||||||
invoices = invoice_wizard._create_invoices(so1 + so2)
|
|
||||||
invoices.action_post()
|
|
||||||
|
|
||||||
# Find the invoice that covers both SO lines
|
|
||||||
combined_invoice = invoices[:1]
|
|
||||||
self.assertGreaterEqual(combined_invoice.project_count, 2)
|
|
||||||
self.assertIn(project1, combined_invoice.project_ids)
|
|
||||||
self.assertIn(project2, combined_invoice.project_ids)
|
|
||||||
|
|
||||||
def test_action_open_projects_single(self):
|
|
||||||
"""action_open_projects returns a form view when there is one project."""
|
|
||||||
so = self._confirm_sale_order(self.service_product)
|
|
||||||
invoice = self._invoice_sale_order(so)
|
|
||||||
self.assertEqual(invoice.project_count, 1)
|
|
||||||
|
|
||||||
action = invoice.action_open_projects()
|
|
||||||
self.assertEqual(action["res_id"], invoice.project_ids.id)
|
|
||||||
view_types = [v[1] for v in action["views"]]
|
|
||||||
self.assertIn("form", view_types)
|
|
||||||
self.assertNotIn("list", view_types)
|
|
||||||
|
|
||||||
def test_action_open_projects_multiple(self):
|
|
||||||
"""action_open_projects returns a list view when there are multiple projects."""
|
|
||||||
so1 = self._confirm_sale_order(self.service_product)
|
|
||||||
so2 = self._confirm_sale_order(self.service_product)
|
|
||||||
|
|
||||||
invoice_wizard = (
|
|
||||||
self.env["sale.advance.payment.inv"]
|
|
||||||
.with_context(
|
|
||||||
active_model="sale.order",
|
|
||||||
active_ids=(so1 + so2).ids,
|
|
||||||
)
|
|
||||||
.create({"advance_payment_method": "delivered"})
|
|
||||||
)
|
|
||||||
invoices = invoice_wizard._create_invoices(so1 + so2)
|
|
||||||
invoices.action_post()
|
|
||||||
|
|
||||||
combined_invoice = invoices[:1]
|
|
||||||
if combined_invoice.project_count < 2:
|
|
||||||
self.skipTest("Combined invoice does not span multiple projects")
|
|
||||||
|
|
||||||
action = combined_invoice.action_open_projects()
|
|
||||||
view_types = [v[1] for v in action["views"]]
|
|
||||||
self.assertIn("list", view_types)
|
|
||||||
self.assertIn("form", view_types)
|
|
||||||
self.assertNotIn("target", action)
|
|
||||||
|
|
||||||
def test_projects_name_separator(self):
|
|
||||||
"""projects_name joins multiple project names with ' ; '."""
|
|
||||||
so1 = self._confirm_sale_order(self.service_product)
|
|
||||||
so2 = self._confirm_sale_order(self.service_product)
|
|
||||||
|
|
||||||
invoice_wizard = (
|
|
||||||
self.env["sale.advance.payment.inv"]
|
|
||||||
.with_context(
|
|
||||||
active_model="sale.order",
|
|
||||||
active_ids=(so1 + so2).ids,
|
|
||||||
)
|
|
||||||
.create({"advance_payment_method": "delivered"})
|
|
||||||
)
|
|
||||||
invoices = invoice_wizard._create_invoices(so1 + so2)
|
|
||||||
invoices.action_post()
|
|
||||||
|
|
||||||
combined_invoice = invoices[:1]
|
|
||||||
if combined_invoice.project_count >= 2:
|
|
||||||
self.assertIn(" ; ", combined_invoice.projects_name)
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<odoo>
|
|
||||||
<record id="view_move_form_project_link_from_invoice_inherit" model="ir.ui.view">
|
|
||||||
<field name="name">account.move.form.project.link</field>
|
|
||||||
<field name="model">account.move</field>
|
|
||||||
<field name="inherit_id" ref="account.view_move_form" />
|
|
||||||
<field name="priority" eval="99" />
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//div[@name='button_box']" position="inside">
|
|
||||||
<button
|
|
||||||
name="action_open_projects"
|
|
||||||
class="oe_stat_button"
|
|
||||||
icon="fa-puzzle-piece"
|
|
||||||
type="object"
|
|
||||||
invisible="project_count == 0"
|
|
||||||
>
|
|
||||||
<field name="project_count" widget="statinfo" string="Project(s)" />
|
|
||||||
</button>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
<record id="view_invoice_tree_project_link_from_invoice_inherit" model="ir.ui.view">
|
|
||||||
<field name="name">account.invoice.list.project.link</field>
|
|
||||||
<field name="model">account.move</field>
|
|
||||||
<field name="inherit_id" ref="account.view_invoice_tree"/>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//list/field[@name='invoice_date']" position="before">
|
|
||||||
<field name="projects_name" />
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
</odoo>
|
|
||||||
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
============================================
|
|
||||||
project_only_current_project_tasks_as_parent
|
|
||||||
============================================
|
|
||||||
|
|
||||||
when selecting a parent task in a task, display only tasks from the current project
|
|
||||||
|
|
||||||
Installation
|
|
||||||
============
|
|
||||||
|
|
||||||
Use Odoo normal module installation procedure to install ``project_only_current_project_tasks_as_parent``.
|
|
||||||
|
|
||||||
Known issues / Roadmap
|
|
||||||
======================
|
|
||||||
|
|
||||||
None yet.
|
|
||||||
|
|
||||||
Bug Tracker
|
|
||||||
===========
|
|
||||||
|
|
||||||
Bugs are tracked on `our issues website <https://github.com/elabore-coop/project-tools/issues>`_. In case of
|
|
||||||
trouble, please check there if your issue has already been
|
|
||||||
reported. If you spotted it first, help us smashing it by providing a
|
|
||||||
detailed and welcomed feedback.
|
|
||||||
|
|
||||||
Credits
|
|
||||||
=======
|
|
||||||
|
|
||||||
Contributors
|
|
||||||
------------
|
|
||||||
|
|
||||||
* Laetitia Da Costa (https://github.com/LaetitiaElabore)
|
|
||||||
* Stéphan Sainléger (https://github.com/stephansainleger)
|
|
||||||
|
|
||||||
Funders
|
|
||||||
-------
|
|
||||||
|
|
||||||
The development of this module has been financially supported by:
|
|
||||||
* Elabore (https://elabore.coop)
|
|
||||||
|
|
||||||
|
|
||||||
Maintainer
|
|
||||||
----------
|
|
||||||
|
|
||||||
This module is maintained by Elabore.
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
# Copyright 2022 Laetitia Da Costa (Elabore)
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "project_only_current_project_tasks_as_parent",
|
|
||||||
"version": "18.0.1.0.0",
|
|
||||||
"author": "Elabore",
|
|
||||||
"website": "https://git.elabore.coop/elabore/project-tools",
|
|
||||||
"maintainer": "Laetitia Da Costa",
|
|
||||||
"license": "AGPL-3",
|
|
||||||
"category": "Project",
|
|
||||||
"summary": "In parent's tasks dropdown field, show only tasks from the current projet",
|
|
||||||
# any module necessary for this one to work correctly
|
|
||||||
"depends": [
|
|
||||||
"base",
|
|
||||||
"project",
|
|
||||||
],
|
|
||||||
"qweb": [
|
|
||||||
# "static/src/xml/*.xml",
|
|
||||||
],
|
|
||||||
"external_dependencies": {
|
|
||||||
"python": [],
|
|
||||||
},
|
|
||||||
# always loaded
|
|
||||||
"data": [
|
|
||||||
"views/project_task.xml",
|
|
||||||
],
|
|
||||||
# only loaded in demonstration mode
|
|
||||||
"demo": [],
|
|
||||||
"js": [],
|
|
||||||
"css": [],
|
|
||||||
"installable": True,
|
|
||||||
# Install this module automatically if all dependency have been previously
|
|
||||||
# and independently installed. Used for synergetic or glue modules.
|
|
||||||
"auto_install": False,
|
|
||||||
"application": False,
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<odoo>
|
|
||||||
<record model="ir.ui.view" id="view_tasks_form2_parent_project_inherited">
|
|
||||||
<field name="name">view.tasks.form2.parent.project.inherited</field>
|
|
||||||
<field name="model">project.task</field>
|
|
||||||
<field name="inherit_id" ref="project.view_task_form2" />
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath
|
|
||||||
expr="//page[@name='extra_info']//field[@name='parent_id']"
|
|
||||||
position="attributes"
|
|
||||||
>
|
|
||||||
<attribute
|
|
||||||
name="domain"
|
|
||||||
>[('project_id','=', project_id), ('stage_id.fold', '=', False)]</attribute>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
</odoo>
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
====================
|
|
||||||
project_request_data
|
|
||||||
====================
|
|
||||||
|
|
||||||
Add several fields in tasks, that provide several data on the request
|
|
||||||
Installation
|
|
||||||
============
|
|
||||||
|
|
||||||
Use Odoo normal module installation procedure to install ``project_request_data``.
|
|
||||||
- To configure the services, go to Project > Configuration > Task Services
|
|
||||||
- To configure the request types, go to Project > Configuration > Request Types
|
|
||||||
|
|
||||||
|
|
||||||
Known issues / Roadmap
|
|
||||||
======================
|
|
||||||
|
|
||||||
None yet.
|
|
||||||
|
|
||||||
Bug Tracker
|
|
||||||
===========
|
|
||||||
|
|
||||||
Bugs are tracked on `our issues website <https://github.com/elabore-coop/project-tools/issues>`_. In case of
|
|
||||||
trouble, please check there if your issue has already been
|
|
||||||
reported. If you spotted it first, help us smashing it by providing a
|
|
||||||
detailed and welcomed feedback.
|
|
||||||
|
|
||||||
Credits
|
|
||||||
=======
|
|
||||||
|
|
||||||
Contributors
|
|
||||||
------------
|
|
||||||
|
|
||||||
* Stéphan Sainléger (https://github.com/stephansainleger)
|
|
||||||
|
|
||||||
Funders
|
|
||||||
-------
|
|
||||||
|
|
||||||
The development of this module has been financially supported by:
|
|
||||||
* Elabore (https://elabore.coop)
|
|
||||||
|
|
||||||
|
|
||||||
Maintainer
|
|
||||||
----------
|
|
||||||
|
|
||||||
This module is maintained by Elabore.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
from . import models
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
# Copyright 2022 Stéphan Sainléger (Elabore)
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "project_request_data",
|
|
||||||
"version": "18.0.1.0.0",
|
|
||||||
"author": "Elabore",
|
|
||||||
"website": "https://git.elabore.coop/elabore/project-tools",
|
|
||||||
"maintainer": "Stéphan Sainléger",
|
|
||||||
"license": "AGPL-3",
|
|
||||||
"category": "Project",
|
|
||||||
"summary": "Add several fields in tasks, that provide several data on the request",
|
|
||||||
"description": """
|
|
||||||
:image: https://img.shields.io/badge/licence-AGPL--3-blue.svg
|
|
||||||
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
|
|
||||||
:alt: License: AGPL-3
|
|
||||||
====================
|
|
||||||
project_request_data
|
|
||||||
====================
|
|
||||||
|
|
||||||
Add several fields in tasks, that provide several data on the request
|
|
||||||
Installation
|
|
||||||
============
|
|
||||||
|
|
||||||
Use Odoo normal module installation procedure to install ``project_request_data``.
|
|
||||||
- To configure the services, go to Project > Configuration > Task Services
|
|
||||||
- To configure the request types, go to Project > Configuration > Request Types
|
|
||||||
|
|
||||||
|
|
||||||
Known issues / Roadmap
|
|
||||||
======================
|
|
||||||
|
|
||||||
None yet.
|
|
||||||
|
|
||||||
Bug Tracker
|
|
||||||
===========
|
|
||||||
|
|
||||||
Bugs are tracked on `our issues website <https://github.com/elabore-coop/project-tools/issues>`_. In case of
|
|
||||||
trouble, please check there if your issue has already been
|
|
||||||
reported. If you spotted it first, help us smashing it by providing a
|
|
||||||
detailed and welcomed feedback.
|
|
||||||
|
|
||||||
Credits
|
|
||||||
=======
|
|
||||||
|
|
||||||
Contributors
|
|
||||||
------------
|
|
||||||
|
|
||||||
* Stéphan Sainléger (https://github.com/stephansainleger)
|
|
||||||
|
|
||||||
Funders
|
|
||||||
-------
|
|
||||||
|
|
||||||
The development of this module has been financially supported by:
|
|
||||||
* Elabore (https://elabore.coop)
|
|
||||||
|
|
||||||
|
|
||||||
Maintainer
|
|
||||||
----------
|
|
||||||
|
|
||||||
This module is maintained by Elabore.
|
|
||||||
|
|
||||||
""",
|
|
||||||
# any module necessary for this one to work correctly
|
|
||||||
"depends": [
|
|
||||||
"base",
|
|
||||||
"project",
|
|
||||||
],
|
|
||||||
"qweb": [
|
|
||||||
# "static/src/xml/*.xml",
|
|
||||||
],
|
|
||||||
"external_dependencies": {
|
|
||||||
"python": [],
|
|
||||||
},
|
|
||||||
# always loaded
|
|
||||||
"data": [
|
|
||||||
"security/ir.model.access.csv",
|
|
||||||
"views/project_task.xml",
|
|
||||||
"views/request_type.xml",
|
|
||||||
"views/task_service.xml",
|
|
||||||
"views/portal_template.xml",
|
|
||||||
],
|
|
||||||
# only loaded in demonstration mode
|
|
||||||
"demo": [],
|
|
||||||
"js": [],
|
|
||||||
"css": [],
|
|
||||||
"installable": True,
|
|
||||||
# Install this module automatically if all dependency have been previously
|
|
||||||
# and independently installed. Used for synergetic or glue modules.
|
|
||||||
"auto_install": False,
|
|
||||||
"application": False,
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
This directory should contain the *.po for Odoo translation.
|
|
||||||
@@ -1,116 +0,0 @@
|
|||||||
# Translation of Odoo Server.
|
|
||||||
# This file contains the translation of the following modules:
|
|
||||||
# * project_request_data
|
|
||||||
#
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: Odoo Server 14.0\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2022-08-26 12:51+0000\n"
|
|
||||||
"PO-Revision-Date: 2022-08-26 12:51+0000\n"
|
|
||||||
"Last-Translator: <>\n"
|
|
||||||
"Language-Team: \n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
|
||||||
"Content-Transfer-Encoding: \n"
|
|
||||||
"Plural-Forms: \n"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_request_data.portal_my_task_request_data
|
|
||||||
msgid "<strong>Request type:</strong>"
|
|
||||||
msgstr "<strong>Type de demande :</strong>"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_request_data.portal_my_task_request_data
|
|
||||||
msgid "<strong>Service:</strong>"
|
|
||||||
msgstr "<strong>Service :</strong>"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_request_type__create_uid
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_task_service__create_uid
|
|
||||||
msgid "Created by"
|
|
||||||
msgstr "Créé par"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_request_type__create_date
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_task_service__create_date
|
|
||||||
msgid "Created on"
|
|
||||||
msgstr "Créé le"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_request_type__display_name
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_task_service__display_name
|
|
||||||
msgid "Display Name"
|
|
||||||
msgstr "Nom affiché"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_request_type__id
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_task_service__id
|
|
||||||
msgid "ID"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_request_type____last_update
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_task_service____last_update
|
|
||||||
msgid "Last Modified on"
|
|
||||||
msgstr "Dernière modification le"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_request_type__write_uid
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_task_service__write_uid
|
|
||||||
msgid "Last Updated by"
|
|
||||||
msgstr "Dernière mise à jour par"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_request_type__write_date
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_task_service__write_date
|
|
||||||
msgid "Last Updated on"
|
|
||||||
msgstr "Dernière mise à jour le"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model,name:project_request_data.model_request_type
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_project_task__request_type_id
|
|
||||||
msgid "Request Type"
|
|
||||||
msgstr "Type de demande"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.actions.act_window,name:project_request_data.act_request_types_list
|
|
||||||
#: model:ir.ui.menu,name:project_request_data.menu_request_types
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_request_data.request_type_view_tree
|
|
||||||
msgid "Request Types"
|
|
||||||
msgstr "Types de demande"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_request_type__sequence
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_task_service__sequence
|
|
||||||
msgid "Sequence"
|
|
||||||
msgstr "Séquence"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_project_task__service_id
|
|
||||||
msgid "Service"
|
|
||||||
msgstr "Service"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model,name:project_request_data.model_project_task
|
|
||||||
msgid "Task"
|
|
||||||
msgstr "Tâche"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.actions.act_window,name:project_request_data.act_task_services_list
|
|
||||||
#: model:ir.ui.menu,name:project_request_data.menu_task_services
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_request_data.task_service_view_tree
|
|
||||||
msgid "Task Services"
|
|
||||||
msgstr "Services"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model,name:project_request_data.model_task_service
|
|
||||||
msgid "Task service"
|
|
||||||
msgstr "Service"
|
|
||||||
|
|
||||||
#. module: project_request_data
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_request_type__name
|
|
||||||
#: model:ir.model.fields,field_description:project_request_data.field_task_service__name
|
|
||||||
msgid "name"
|
|
||||||
msgstr "nom"
|
|
||||||
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
from . import task_service
|
|
||||||
from . import request_type
|
|
||||||
from . import project_task
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
from odoo import fields, models
|
|
||||||
|
|
||||||
|
|
||||||
class Task(models.Model):
|
|
||||||
_inherit = "project.task"
|
|
||||||
|
|
||||||
service_id = fields.Many2one("task.service", string="Service")
|
|
||||||
request_type_id = fields.Many2one("request.type", string="Request Type")
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
from odoo import fields, models
|
|
||||||
|
|
||||||
|
|
||||||
class RequestType(models.Model):
|
|
||||||
_name = "request.type"
|
|
||||||
_description = "Request Type"
|
|
||||||
|
|
||||||
name = fields.Char("name", required=True)
|
|
||||||
sequence = fields.Integer()
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
from odoo import fields, models
|
|
||||||
|
|
||||||
|
|
||||||
class TaskService(models.Model):
|
|
||||||
_name = "task.service"
|
|
||||||
_description = "Task service"
|
|
||||||
|
|
||||||
name = fields.Char("name", required=True)
|
|
||||||
sequence = fields.Integer()
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
|
|
||||||
access_task_service_user,project.task_service.user,model_task_service,,1,0,0,0
|
|
||||||
access_task_service_manager,project.task_service.manager,model_task_service,project.group_project_manager,1,1,1,1
|
|
||||||
access_request_type_user,project.request_type.user,model_request_type,,1,0,0,0
|
|
||||||
access_request_type_manager,project.request_type.manager,model_request_type,project.group_project_manager,1,1,1,1
|
|
||||||
|
@@ -1,25 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<odoo>
|
|
||||||
<template
|
|
||||||
id="portal_my_task_request_data"
|
|
||||||
name="My Task: Request Data"
|
|
||||||
inherit_id="project.portal_my_task"
|
|
||||||
priority="40"
|
|
||||||
>
|
|
||||||
<xpath
|
|
||||||
expr="//div[@id='card_body']/div[hasclass('row','mb-4','container')]"
|
|
||||||
position="after"
|
|
||||||
>
|
|
||||||
<div id="request_data" class="row mb-4">
|
|
||||||
<div class="col-12 col-md-6" t-if="task.service_id">
|
|
||||||
<strong>Service:</strong>
|
|
||||||
<span t-field="task.service_id" />
|
|
||||||
</div>
|
|
||||||
<div class="col-12 col-md-6" t-if="task.request_type_id">
|
|
||||||
<strong>Request type:</strong>
|
|
||||||
<span t-field="task.request_type_id" />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</xpath>
|
|
||||||
</template>
|
|
||||||
</odoo>
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<odoo>
|
|
||||||
<record id="view_task_form2_request_data" model="ir.ui.view">
|
|
||||||
<field name="name">project.task.form.request.data</field>
|
|
||||||
<field name="model">project.task</field>
|
|
||||||
<field name="inherit_id" ref="project.view_task_form2" />
|
|
||||||
<field name="priority" eval="99" />
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//field[@name='tag_ids']" position="before">
|
|
||||||
<field name="service_id" widget="selection" />
|
|
||||||
<field name="request_type_id" widget="selection" />
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
<record id="view_task_kanban_request_data" model="ir.ui.view">
|
|
||||||
<field name="name">project.task.kanban.request.data</field>
|
|
||||||
<field name="inherit_id" ref="project.view_task_kanban" />
|
|
||||||
<field name="model">project.task</field>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//field[@name='name']" position="before">
|
|
||||||
<div style="font-size:11px; margin-bottom: 8px;"><field
|
|
||||||
name="create_date"
|
|
||||||
widget="date"
|
|
||||||
/></div>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//field[@name='tag_ids']" position="before">
|
|
||||||
<span style="background:lightblue; font-size:11px"><field
|
|
||||||
name="service_id"
|
|
||||||
/></span>
|
|
||||||
<span style="background:lightsteelblue; font-size:11px"><field
|
|
||||||
name="request_type_id"
|
|
||||||
/></span>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
</odoo>
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<odoo>
|
|
||||||
|
|
||||||
<record id="request_type_view_tree" model="ir.ui.view">
|
|
||||||
<field name="name">request.type.view.list</field>
|
|
||||||
<field name="model">request.type</field>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<list editable="top" default_order="sequence">
|
|
||||||
<field name="sequence" widget="handle" />
|
|
||||||
<field name="name" />
|
|
||||||
</list>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
<record id="act_request_types_list" model="ir.actions.act_window">
|
|
||||||
<field name="name">Request Types</field>
|
|
||||||
<field name="res_model">request.type</field>
|
|
||||||
<field name="view_mode">list</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
<menuitem
|
|
||||||
id="menu_request_types"
|
|
||||||
action="act_request_types_list"
|
|
||||||
parent="project.menu_project_config"
|
|
||||||
sequence="99"
|
|
||||||
name="Request Types"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</odoo>
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<odoo>
|
|
||||||
|
|
||||||
<record id="task_service_view_tree" model="ir.ui.view">
|
|
||||||
<field name="name">task.service.view.list</field>
|
|
||||||
<field name="model">task.service</field>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<list editable="top" default_order="sequence">
|
|
||||||
<field name="sequence" widget="handle" />
|
|
||||||
<field name="name" />
|
|
||||||
</list>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
<record id="act_task_services_list" model="ir.actions.act_window">
|
|
||||||
<field name="name">Task Services</field>
|
|
||||||
<field name="res_model">task.service</field>
|
|
||||||
<field name="view_mode">list</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
<menuitem
|
|
||||||
id="menu_task_services"
|
|
||||||
action="act_task_services_list"
|
|
||||||
parent="project.menu_project_config"
|
|
||||||
sequence="99"
|
|
||||||
name="Task Services"
|
|
||||||
/>
|
|
||||||
|
|
||||||
</odoo>
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
# Copyright 2022 Elabore
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "Project task billable hours",
|
|
||||||
"version": "18.0.1.0.0",
|
|
||||||
"author": "Elabore",
|
|
||||||
"website": "https://git.elabore.coop/elabore/project-tools",
|
|
||||||
"maintainer": "Laetitia Da Costa",
|
|
||||||
"license": "AGPL-3",
|
|
||||||
"category": "Tools",
|
|
||||||
"summary": "In task kanban view, display remaining billable hours instead of remaining hours",
|
|
||||||
"description": "",
|
|
||||||
"depends": ["project", "hr_timesheet", "project_working_time_task_portal"],
|
|
||||||
"data": [
|
|
||||||
"views/project_task_views.xml",
|
|
||||||
],
|
|
||||||
"installable": True,
|
|
||||||
"application": False,
|
|
||||||
}
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<odoo>
|
|
||||||
<!-- Replace remaining hours by billable remaining hours in kanban view -->
|
|
||||||
<record id="view_task_kanban_billable_remaining_hours_inherit" model="ir.ui.view">
|
|
||||||
<field name="name">project.task.kanban.billable.remaining.hours.inherit</field>
|
|
||||||
<field name="model">project.task</field>
|
|
||||||
<field
|
|
||||||
name="inherit_id"
|
|
||||||
ref="hr_timesheet.view_task_kanban_inherited_progress"
|
|
||||||
/>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//t[@name='allocated_hours']" position="replace">
|
|
||||||
<t t-set="badge" t-value="" />
|
|
||||||
<t
|
|
||||||
t-set="badge"
|
|
||||||
t-value="'badge-warning'"
|
|
||||||
t-if="record.billable_progress >= 80 and record.billable_progress <= 100"
|
|
||||||
/>
|
|
||||||
<t
|
|
||||||
t-set="badge"
|
|
||||||
t-value="'badge-danger'"
|
|
||||||
t-if="record.billable_remaining_hours.raw_value < 0"
|
|
||||||
/>
|
|
||||||
<t
|
|
||||||
t-set="title"
|
|
||||||
t-value="'Remaining days'"
|
|
||||||
t-if="record.encode_uom_in_days.raw_value"
|
|
||||||
/>
|
|
||||||
<t t-set="title" t-value="'Billable remaining hours'" t-else="" />
|
|
||||||
<div
|
|
||||||
t-attf-class="oe_kanban_align badge {{ badge }}"
|
|
||||||
t-att-title="title"
|
|
||||||
>
|
|
||||||
<field name="billable_remaining_hours" widget="timesheet_uom" />
|
|
||||||
</div>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
</odoo>
|
|
||||||
@@ -1 +1,2 @@
|
|||||||
|
|
||||||
from . import models
|
from . import models
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
"name": "project_user_default_project",
|
"name": "project_user_default_project",
|
||||||
"version": "18.0.1.0.0",
|
"version": "18.0.1.0.0",
|
||||||
"author": "Elabore",
|
"author": "Elabore",
|
||||||
"website": "https://git.elabore.coop/elabore/project-tools",
|
"website": "https://elabore.coop",
|
||||||
"maintainer": "Stéphan Sainléger",
|
"maintainer": "Stéphan Sainléger",
|
||||||
"license": "AGPL-3",
|
"license": "AGPL-3",
|
||||||
"category": "Tools",
|
"category": "Tools",
|
||||||
@@ -62,8 +62,7 @@ This module is maintained by Elabore.
|
|||||||
""",
|
""",
|
||||||
# any module necessary for this one to work correctly
|
# any module necessary for this one to work correctly
|
||||||
"depends": [
|
"depends": [
|
||||||
"base",
|
"base", "project",
|
||||||
"project",
|
|
||||||
],
|
],
|
||||||
"qweb": [
|
"qweb": [
|
||||||
# "static/src/xml/*.xml",
|
# "static/src/xml/*.xml",
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
from odoo import fields, models
|
from odoo import _, api, fields, models
|
||||||
|
|
||||||
|
|
||||||
class Users(models.Model):
|
class Users(models.Model):
|
||||||
_inherit = "res.users"
|
_inherit = "res.users"
|
||||||
|
|
||||||
default_project_id = fields.Many2one("project.project", string="Default Project")
|
default_project_id = fields.Many2one('project.project', string='Default Project')
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<record id="view_users_form_inherit_default_project" model="ir.ui.view">
|
<record id="view_users_form_inherit_default_project" model="ir.ui.view">
|
||||||
<field name="name">view.users.form.inherit.default.project</field>
|
<field name="name">view.users.form.inherit.default.project</field>
|
||||||
|
|||||||
2
project_working_time_task_portal/.gitignore
vendored
2
project_working_time_task_portal/.gitignore
vendored
@@ -1,2 +0,0 @@
|
|||||||
*.*~
|
|
||||||
*pyc
|
|
||||||
@@ -1,661 +0,0 @@
|
|||||||
GNU AFFERO GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 19 November 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU Affero General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works, specifically designed to ensure
|
|
||||||
cooperation with the community in the case of network server software.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
our General Public Licenses are intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
Developers that use our General Public Licenses protect your rights
|
|
||||||
with two steps: (1) assert copyright on the software, and (2) offer
|
|
||||||
you this License which gives you legal permission to copy, distribute
|
|
||||||
and/or modify the software.
|
|
||||||
|
|
||||||
A secondary benefit of defending all users' freedom is that
|
|
||||||
improvements made in alternate versions of the program, if they
|
|
||||||
receive widespread use, become available for other developers to
|
|
||||||
incorporate. Many developers of free software are heartened and
|
|
||||||
encouraged by the resulting cooperation. However, in the case of
|
|
||||||
software used on network servers, this result may fail to come about.
|
|
||||||
The GNU General Public License permits making a modified version and
|
|
||||||
letting the public access it on a server without ever releasing its
|
|
||||||
source code to the public.
|
|
||||||
|
|
||||||
The GNU Affero General Public License is designed specifically to
|
|
||||||
ensure that, in such cases, the modified source code becomes available
|
|
||||||
to the community. It requires the operator of a network server to
|
|
||||||
provide the source code of the modified version running there to the
|
|
||||||
users of that server. Therefore, public use of a modified version, on
|
|
||||||
a publicly accessible server, gives the public access to the source
|
|
||||||
code of the modified version.
|
|
||||||
|
|
||||||
An older license, called the Affero General Public License and
|
|
||||||
published by Affero, was designed to accomplish similar goals. This is
|
|
||||||
a different license, not a version of the Affero GPL, but Affero has
|
|
||||||
released a new version of the Affero GPL which permits relicensing under
|
|
||||||
this license.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU Affero General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Remote Network Interaction; Use with the GNU General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, if you modify the
|
|
||||||
Program, your modified version must prominently offer all users
|
|
||||||
interacting with it remotely through a computer network (if your version
|
|
||||||
supports such interaction) an opportunity to receive the Corresponding
|
|
||||||
Source of your version by providing access to the Corresponding Source
|
|
||||||
from a network server at no charge, through some standard or customary
|
|
||||||
means of facilitating copying of software. This Corresponding Source
|
|
||||||
shall include the Corresponding Source for any work covered by version 3
|
|
||||||
of the GNU General Public License that is incorporated pursuant to the
|
|
||||||
following paragraph.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the work with which it is combined will remain governed by version
|
|
||||||
3 of the GNU General Public License.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU Affero General Public License from time to time. Such new versions
|
|
||||||
will be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU Affero General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU Affero General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU Affero General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If your software can interact with users remotely through a computer
|
|
||||||
network, you should also make sure that it provides a way for users to
|
|
||||||
get its source. For example, if your program is a web application, its
|
|
||||||
interface could display a "Source" link that leads users to an archive
|
|
||||||
of the code. There are many ways you could offer source, and different
|
|
||||||
solutions will be better for different programs; see section 13 for the
|
|
||||||
specific requirements.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU AGPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
================================
|
|
||||||
project_working_time_task_portal
|
|
||||||
================================
|
|
||||||
|
|
||||||
add billable planned hours and billable remaining hours in the task portal view so the portal user only see billable timesheet lines
|
|
||||||
|
|
||||||
Installation
|
|
||||||
============
|
|
||||||
|
|
||||||
Use Odoo normal module installation procedure to install
|
|
||||||
``project_working_time_task_portal``.
|
|
||||||
|
|
||||||
Known issues / Roadmap
|
|
||||||
======================
|
|
||||||
|
|
||||||
None yet.
|
|
||||||
|
|
||||||
Bug Tracker
|
|
||||||
===========
|
|
||||||
|
|
||||||
Bugs are tracked on `our issues website <https://github.com/elabore-coop/project-tool/issues>`_. In case of
|
|
||||||
trouble, please check there if your issue has already been
|
|
||||||
reported. If you spotted it first, help us smashing it by providing a
|
|
||||||
detailed and welcomed feedback.
|
|
||||||
|
|
||||||
Credits
|
|
||||||
=======
|
|
||||||
|
|
||||||
Contributors
|
|
||||||
------------
|
|
||||||
|
|
||||||
* Boris Gallet - `Email<mailto:boris.gallet@elabore.coop>` - `Github<https://github.com/b0g>`
|
|
||||||
|
|
||||||
Funders
|
|
||||||
-------
|
|
||||||
|
|
||||||
The development of this module has been financially supported by:
|
|
||||||
* Elabore (https://elabore.coop)
|
|
||||||
|
|
||||||
|
|
||||||
Maintainer
|
|
||||||
----------
|
|
||||||
|
|
||||||
This module is maintained by Elabore.
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
from . import models
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
# Copyright 2022 Boris Gallet ()
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "project_working_time_task_portal",
|
|
||||||
"version": "18.0.1.0.0",
|
|
||||||
"author": "Elabore",
|
|
||||||
"website": "https://git.elabore.coop/elabore/project-tools",
|
|
||||||
"maintainer": "Boris Gallet",
|
|
||||||
"license": "AGPL-3",
|
|
||||||
"category": "tools",
|
|
||||||
"summary": "add billable planned hours and billable remaining hours in the task portal view so the portal user only see billable timesheet lines",
|
|
||||||
# any module necessary for this one to work correctly
|
|
||||||
"depends": [
|
|
||||||
"base",
|
|
||||||
"project",
|
|
||||||
"sale_timesheet_line_exclude",
|
|
||||||
"hr_timesheet",
|
|
||||||
],
|
|
||||||
"qweb": [],
|
|
||||||
"external_dependencies": {
|
|
||||||
"python": [],
|
|
||||||
},
|
|
||||||
# always loaded
|
|
||||||
"data": [
|
|
||||||
# views/hr_timesheet_portal.xml",
|
|
||||||
"views/hr_timesheet_view_task_form2.xml",
|
|
||||||
"views/portal_tasks_list.xml",
|
|
||||||
],
|
|
||||||
"assets": {
|
|
||||||
"web.assets_frontend": [
|
|
||||||
"project_working_time_task_portal/static/src/css/main.css",
|
|
||||||
]
|
|
||||||
},
|
|
||||||
# only loaded in demonstration mode
|
|
||||||
"demo": [],
|
|
||||||
"js": [],
|
|
||||||
"css": ["static/src/css/main.css"],
|
|
||||||
"installable": True,
|
|
||||||
# Install this module automatically if all dependency have been previously
|
|
||||||
# and independently installed. Used for synergetic or glue modules.
|
|
||||||
"auto_install": False,
|
|
||||||
"application": False,
|
|
||||||
}
|
|
||||||
@@ -1,165 +0,0 @@
|
|||||||
# Translation of Odoo Server.
|
|
||||||
# This file contains the translation of the following modules:
|
|
||||||
# * project_working_time_task_portal
|
|
||||||
#
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: Odoo Server 16.0\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2025-11-18 16:44+0000\n"
|
|
||||||
"PO-Revision-Date: 2025-11-18 16:44+0000\n"
|
|
||||||
"Last-Translator: \n"
|
|
||||||
"Language-Team: \n"
|
|
||||||
"MIME-Version: 1.0\n"
|
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
|
||||||
"Content-Transfer-Encoding: \n"
|
|
||||||
"Plural-Forms: \n"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.portal_my_task_allocatedd_hours
|
|
||||||
msgid "<span style=\"font-weight:bold;\">Planned Hours: </span>"
|
|
||||||
msgstr "<span style=\"font-weight:bold;\">Heures Planifiées: </span>"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.portal_my_task_allocated_hours
|
|
||||||
msgid "<strong>Progress: </strong>"
|
|
||||||
msgstr "<strong>En cours: </strong>"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.portal_my_task_allocated_hours
|
|
||||||
msgid "<strong>Subtask Planned Hours: </strong>"
|
|
||||||
msgstr "<strong>Heures Planifiées Sous-tâches: </strong>"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model,name:project_working_time_task_portal.model_account_analytic_line
|
|
||||||
msgid "Analytic Line"
|
|
||||||
msgstr "Ligne analytique"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Billable Effective Days"
|
|
||||||
msgstr "Jours passés facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__billable_effective_hours
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Billable Effective Hours"
|
|
||||||
msgstr "Heures passées facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.portal_tasks_list_inherit
|
|
||||||
msgid "Billable Hours"
|
|
||||||
msgstr "Heures facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__billable_progress
|
|
||||||
msgid "Billable Progress"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Billable Remaining Days"
|
|
||||||
msgstr "Jours restants facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__billable_remaining_hours
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Billable Remaining Hours"
|
|
||||||
msgstr "Heures restantes facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,help:project_working_time_task_portal.field_project_task__total_billable_hours_spent
|
|
||||||
msgid ""
|
|
||||||
"Billable time spent on this task and its sub-tasks (and their own sub-"
|
|
||||||
"tasks)."
|
|
||||||
msgstr ""
|
|
||||||
"Temps facturable passé sur cette tâche et ses sous-tâches (et leurs propres sous-"
|
|
||||||
"tâches)."
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Non Billable Effective Days"
|
|
||||||
msgstr "Jours passés non facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__non_billable_effective_hours
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Non Billable Effective Hours"
|
|
||||||
msgstr "Heures passées non facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,help:project_working_time_task_portal.field_project_task__total_non_billable_hours_spent
|
|
||||||
msgid ""
|
|
||||||
"Non billable time spent on this task and its sub-tasks (and their own sub-"
|
|
||||||
"tasks)."
|
|
||||||
msgstr ""
|
|
||||||
"Temps non facturable passé sur cette tâche et ses sous-tâches (et leurs propres sous-"
|
|
||||||
"tâches)."
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.portal_my_task_remaining_hours
|
|
||||||
msgid "Remaining Hours:"
|
|
||||||
msgstr "Heures restantes:"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_account_analytic_line__smart_search
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__smart_search
|
|
||||||
msgid "Smart Search"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Subtask Billable Effective Days"
|
|
||||||
msgstr "Sous-tâches jours passés facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__subtask_billable_effective_hours
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Subtask Billable Effective Hours"
|
|
||||||
msgstr "Sous-tâches heures passées facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Subtask Non Billable Effective Days"
|
|
||||||
msgstr "Sous-tâches jours passés non facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__subtask_non_billable_effective_hours
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Subtask Non Billable Effective Hours"
|
|
||||||
msgstr "Sous-tâches heures passées non facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model,name:project_working_time_task_portal.model_project_task
|
|
||||||
msgid "Task"
|
|
||||||
msgstr "Tâche"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Total Billable Days"
|
|
||||||
msgstr "Total des jours facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__total_billable_hours_spent
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Total Billable Hours"
|
|
||||||
msgstr "Total des heures facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,help:project_working_time_task_portal.field_project_task__billable_remaining_hours
|
|
||||||
msgid ""
|
|
||||||
"Total Billable remaining time (without exclude_from_sale_order timesheet "
|
|
||||||
"lines), can be re-estimated periodically by the assignee of the task."
|
|
||||||
msgstr ""
|
|
||||||
"Nombre d'heures allouées moins le nombre d'heures passées facturées."
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Total Non Billable Days"
|
|
||||||
msgstr "Total des jours non facturables"
|
|
||||||
|
|
||||||
#. module: project_working_time_task_portal
|
|
||||||
#: model:ir.model.fields,field_description:project_working_time_task_portal.field_project_task__total_non_billable_hours_spent
|
|
||||||
#: model_terms:ir.ui.view,arch_db:project_working_time_task_portal.project_working_time_view_task_form
|
|
||||||
msgid "Total Non Billable Hours"
|
|
||||||
msgstr "Total des heures non facturables"
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
from . import project_task
|
|
||||||
from . import account_analytic_line
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
||||||
|
|
||||||
|
|
||||||
from odoo import models
|
|
||||||
from odoo.osv import expression
|
|
||||||
|
|
||||||
|
|
||||||
class AccountAnalyticLine(models.Model):
|
|
||||||
_inherit = "account.analytic.line"
|
|
||||||
|
|
||||||
def _timesheet_get_portal_domain(self):
|
|
||||||
domain = super()._timesheet_get_portal_domain()
|
|
||||||
return expression.AND([domain, [("exclude_from_sale_order", "=", False)]])
|
|
||||||
@@ -1,172 +0,0 @@
|
|||||||
from odoo import api, fields, models
|
|
||||||
from odoo.tools.float_utils import float_compare
|
|
||||||
|
|
||||||
|
|
||||||
class Task(models.Model):
|
|
||||||
_inherit = "project.task"
|
|
||||||
|
|
||||||
billable_effective_hours = fields.Float(
|
|
||||||
compute="_compute_billable_effective_hours",
|
|
||||||
string="Billable Effective Hours",
|
|
||||||
store=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
non_billable_effective_hours = fields.Float(
|
|
||||||
compute="_compute_non_billable_effective_hours",
|
|
||||||
string="Non Billable Effective Hours",
|
|
||||||
store=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
billable_remaining_hours = fields.Float(
|
|
||||||
compute="_compute_billable_remaining_hours",
|
|
||||||
string="Billable Remaining Hours",
|
|
||||||
store=True,
|
|
||||||
help="Total Billable remaining time (without exclude_from_sale_order timesheet lines), can be re-estimated periodically by the assignee of the task.",
|
|
||||||
)
|
|
||||||
|
|
||||||
billable_progress = fields.Float(
|
|
||||||
compute="_compute_billable_progress_hours",
|
|
||||||
string="Billable Progress",
|
|
||||||
store=True,
|
|
||||||
group_operator="avg",
|
|
||||||
)
|
|
||||||
|
|
||||||
subtask_billable_effective_hours = fields.Float(
|
|
||||||
compute="_compute_subtask_billable_effective_hours",
|
|
||||||
string="Subtask Billable Effective Hours",
|
|
||||||
store=True,
|
|
||||||
recursive=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
subtask_non_billable_effective_hours = fields.Float(
|
|
||||||
compute="_compute_subtask_non_billable_effective_hours",
|
|
||||||
string="Subtask Non Billable Effective Hours",
|
|
||||||
store=True,
|
|
||||||
recursive=True,
|
|
||||||
)
|
|
||||||
|
|
||||||
total_billable_hours_spent = fields.Float(
|
|
||||||
"Total Billable Hours",
|
|
||||||
compute="_compute_total_billable_hours_spent",
|
|
||||||
store=True,
|
|
||||||
help="Billable time spent on this task and its sub-tasks (and their own sub-tasks).",
|
|
||||||
)
|
|
||||||
|
|
||||||
total_non_billable_hours_spent = fields.Float(
|
|
||||||
"Total Non Billable Hours",
|
|
||||||
compute="_compute_total_non_billable_hours_spent",
|
|
||||||
store=True,
|
|
||||||
help="Non billable time spent on this task and its sub-tasks (and their own sub-tasks).",
|
|
||||||
)
|
|
||||||
|
|
||||||
@api.depends("timesheet_ids.unit_amount", "timesheet_ids.exclude_from_sale_order")
|
|
||||||
def _compute_billable_effective_hours(self):
|
|
||||||
if not any(self._ids):
|
|
||||||
for task in self:
|
|
||||||
filtered_timesheets = task.timesheet_ids.filtered(
|
|
||||||
lambda t: not t.exclude_from_sale_order
|
|
||||||
)
|
|
||||||
task.billable_effective_hours = sum(
|
|
||||||
filtered_timesheets.mapped("unit_amount")
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
timesheet_read_group = self.env["account.analytic.line"]._read_group(
|
|
||||||
[
|
|
||||||
("task_id", "in", self.ids),
|
|
||||||
("exclude_from_sale_order", "=", False),
|
|
||||||
], # We exclude the lines (timesheet) which are excluded from billing
|
|
||||||
["task_id"],
|
|
||||||
["unit_amount:sum"],
|
|
||||||
)
|
|
||||||
|
|
||||||
timesheets_per_task = {
|
|
||||||
task.id: unit_amount for task, unit_amount in timesheet_read_group
|
|
||||||
}
|
|
||||||
for task in self:
|
|
||||||
task.billable_effective_hours = timesheets_per_task.get(task.id, 0.0)
|
|
||||||
|
|
||||||
@api.depends("effective_hours", "billable_effective_hours")
|
|
||||||
def _compute_non_billable_effective_hours(self):
|
|
||||||
for task in self:
|
|
||||||
task.non_billable_effective_hours = (
|
|
||||||
task.effective_hours - task.billable_effective_hours
|
|
||||||
)
|
|
||||||
|
|
||||||
@api.depends(
|
|
||||||
"billable_effective_hours",
|
|
||||||
"subtask_billable_effective_hours",
|
|
||||||
"allocated_hours",
|
|
||||||
)
|
|
||||||
def _compute_billable_remaining_hours(self):
|
|
||||||
for task in self:
|
|
||||||
task.billable_remaining_hours = (
|
|
||||||
task.allocated_hours
|
|
||||||
- task.billable_effective_hours
|
|
||||||
- task.subtask_billable_effective_hours
|
|
||||||
)
|
|
||||||
|
|
||||||
@api.depends(
|
|
||||||
"child_ids.billable_effective_hours",
|
|
||||||
"child_ids.subtask_billable_effective_hours",
|
|
||||||
)
|
|
||||||
def _compute_subtask_billable_effective_hours(self):
|
|
||||||
for task in self:
|
|
||||||
task.subtask_billable_effective_hours = sum(
|
|
||||||
child_task.billable_effective_hours
|
|
||||||
+ child_task.subtask_billable_effective_hours
|
|
||||||
for child_task in task.child_ids
|
|
||||||
)
|
|
||||||
|
|
||||||
@api.depends(
|
|
||||||
"child_ids.non_billable_effective_hours",
|
|
||||||
"child_ids.subtask_non_billable_effective_hours",
|
|
||||||
)
|
|
||||||
def _compute_subtask_non_billable_effective_hours(self):
|
|
||||||
for task in self:
|
|
||||||
task.subtask_non_billable_effective_hours = sum(
|
|
||||||
child_task.non_billable_effective_hours
|
|
||||||
+ child_task.subtask_non_billable_effective_hours
|
|
||||||
for child_task in task.child_ids
|
|
||||||
)
|
|
||||||
|
|
||||||
@api.depends(
|
|
||||||
"billable_effective_hours",
|
|
||||||
"subtask_billable_effective_hours",
|
|
||||||
"allocated_hours",
|
|
||||||
)
|
|
||||||
def _compute_billable_progress_hours(self):
|
|
||||||
for task in self:
|
|
||||||
if task.allocated_hours > 0.0:
|
|
||||||
task_total_hours = (
|
|
||||||
task.billable_effective_hours
|
|
||||||
+ task.subtask_billable_effective_hours
|
|
||||||
)
|
|
||||||
if (
|
|
||||||
float_compare(
|
|
||||||
task_total_hours, task.allocated_hours, precision_digits=2
|
|
||||||
)
|
|
||||||
>= 0
|
|
||||||
):
|
|
||||||
task.billable_progress = 100
|
|
||||||
else:
|
|
||||||
task.billable_progress = round(
|
|
||||||
100.0 * task_total_hours / task.allocated_hours, 2
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
task.billable_progress = 0.0
|
|
||||||
|
|
||||||
@api.depends("billable_effective_hours", "subtask_billable_effective_hours")
|
|
||||||
def _compute_total_billable_hours_spent(self):
|
|
||||||
for task in self:
|
|
||||||
task.total_billable_hours_spent = (
|
|
||||||
task.billable_effective_hours + task.subtask_billable_effective_hours
|
|
||||||
)
|
|
||||||
|
|
||||||
@api.depends("non_billable_effective_hours", "subtask_non_billable_effective_hours")
|
|
||||||
def _compute_total_non_billable_hours_spent(self):
|
|
||||||
for task in self:
|
|
||||||
task.total_non_billable_hours_spent = (
|
|
||||||
task.non_billable_effective_hours
|
|
||||||
+ task.subtask_non_billable_effective_hours
|
|
||||||
)
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
/**
|
|
||||||
* Main
|
|
||||||
*/
|
|
||||||
|
|
||||||
.oe-project_working_time_task_portal.progressbar {
|
|
||||||
height: 20px;
|
|
||||||
background-color: #7c7cac; /* Couleur de la barre de progression */
|
|
||||||
text-align: center;
|
|
||||||
color: white; /* Couleur du texte dans la barre de progression */
|
|
||||||
line-height: 20px; /* Aligner le texte verticalement */
|
|
||||||
}
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<odoo>
|
|
||||||
<template
|
|
||||||
id="portal_my_task_allocated_hours"
|
|
||||||
name="My Task: planned hours"
|
|
||||||
inherit_id="hr_timesheet.portal_my_task"
|
|
||||||
priority="40"
|
|
||||||
>
|
|
||||||
<xpath
|
|
||||||
expr="//t[@t-call='hr_timesheet.portal_timesheet_table']"
|
|
||||||
position="before"
|
|
||||||
>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-12 col-md-6 pb-2">
|
|
||||||
<span style="font-weight:bold;">Planned Hours: </span>
|
|
||||||
<span
|
|
||||||
t-field="task.allocated_hours"
|
|
||||||
t-options="{"widget": "timesheet_uom_no_toggle"}"
|
|
||||||
/>
|
|
||||||
<t t-if="task.allow_subtasks and task.subtask_count > 0">
|
|
||||||
<div>
|
|
||||||
<strong>Subtask Planned Hours: </strong>
|
|
||||||
<span
|
|
||||||
t-field="task.subtask_allocated_hours"
|
|
||||||
t-options="{"widget": "timesheet_uom_no_toggle"}"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</t>
|
|
||||||
</div>
|
|
||||||
<t t-if="task.billable_progress > 0">
|
|
||||||
<div class="col-12 col-md-6 pb-2">
|
|
||||||
<strong>Progress: </strong>
|
|
||||||
<t t-set="progress" t-value="task.billable_progress" />
|
|
||||||
<div
|
|
||||||
class="oe-project_working_time_task_portal progressbar"
|
|
||||||
t-attf-style="width: #{progress}%;"
|
|
||||||
>
|
|
||||||
<t t-esc="progress" />%
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</t>
|
|
||||||
</div>
|
|
||||||
</xpath>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<template
|
|
||||||
id="portal_my_task_remaining_hours"
|
|
||||||
name="My Task: remaining hours"
|
|
||||||
inherit_id="hr_timesheet.portal_timesheet_table"
|
|
||||||
priority="40"
|
|
||||||
>
|
|
||||||
<xpath expr="//tr[@t-foreach='timesheets']" position="attributes">
|
|
||||||
<attribute name="t-if">not timesheet.exclude_from_sale_order</attribute>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//tfoot/tr/th[last()]" position="replace">
|
|
||||||
<th class="text-end">
|
|
||||||
<div
|
|
||||||
t-esc="round(sum(timesheets.filtered(lambda t: not t.exclude_from_sale_order).mapped('unit_amount')), 2)"
|
|
||||||
t-options="{"widget": "float_time"}"
|
|
||||||
/>
|
|
||||||
<div t-if="task.allocated_hours > 0">Remaining Hours: <span
|
|
||||||
t-field="task.billable_remaining_hours"
|
|
||||||
t-options="{"widget": "float_time"}"
|
|
||||||
/></div>
|
|
||||||
</th>
|
|
||||||
</xpath>
|
|
||||||
</template>
|
|
||||||
</odoo>
|
|
||||||
@@ -1,175 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
|
||||||
<odoo>
|
|
||||||
|
|
||||||
<record id="project_working_time_view_task_form" model="ir.ui.view">
|
|
||||||
<field name="name">project.working.time.view.task.form</field>
|
|
||||||
<field name="model">project.task</field>
|
|
||||||
<field name="inherit_id" ref="hr_timesheet.view_task_form2_inherited" />
|
|
||||||
<field name="priority" eval="99" />
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//field[@name='effective_hours']" position="after">
|
|
||||||
<span>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="billable_effective_hours"
|
|
||||||
string="Billable Effective Hours"
|
|
||||||
invisible="non_billable_effective_hours == 0.0 or encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="billable_effective_hours"
|
|
||||||
string="Billable Effective Days"
|
|
||||||
invisible="non_billable_effective_hours == 0.0 or not encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<field
|
|
||||||
name="billable_effective_hours"
|
|
||||||
widget="timesheet_uom"
|
|
||||||
class="mt-2"
|
|
||||||
invisible="non_billable_effective_hours == 0.0"
|
|
||||||
nolabel="1"
|
|
||||||
/>
|
|
||||||
<span>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="non_billable_effective_hours"
|
|
||||||
string="Non Billable Effective Hours"
|
|
||||||
invisible="non_billable_effective_hours == 0.0 or encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="non_billable_effective_hours"
|
|
||||||
string="Non Billable Effective Days"
|
|
||||||
invisible="non_billable_effective_hours == 0.0 or not encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<field
|
|
||||||
name="non_billable_effective_hours"
|
|
||||||
widget="timesheet_uom"
|
|
||||||
class="mt-2"
|
|
||||||
invisible="non_billable_effective_hours == 0.0"
|
|
||||||
nolabel="1"
|
|
||||||
/>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//field[@name='subtask_effective_hours']" position="after">
|
|
||||||
<span>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="subtask_billable_effective_hours"
|
|
||||||
string="Subtask Billable Effective Hours"
|
|
||||||
invisible="subtask_effective_hours == 0.0 or encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="subtask_billable_effective_hours"
|
|
||||||
string="Subtask Billable Effective Days"
|
|
||||||
invisible="subtask_effective_hours == 0.0 or not encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<field
|
|
||||||
name="subtask_billable_effective_hours"
|
|
||||||
widget="timesheet_uom"
|
|
||||||
class="mt-2"
|
|
||||||
invisible="subtask_effective_hours == 0.0"
|
|
||||||
nolabel="1"
|
|
||||||
/>
|
|
||||||
<span>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="subtask_non_billable_effective_hours"
|
|
||||||
string="Subtask Non Billable Effective Hours"
|
|
||||||
invisible="subtask_effective_hours == 0.0 or encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="subtask_non_billable_effective_hours"
|
|
||||||
string="Subtask Non Billable Effective Days"
|
|
||||||
invisible="subtask_effective_hours == 0.0 or not encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<field
|
|
||||||
name="subtask_non_billable_effective_hours"
|
|
||||||
widget="timesheet_uom"
|
|
||||||
class="mt-2"
|
|
||||||
invisible="subtask_effective_hours == 0.0"
|
|
||||||
nolabel="1"
|
|
||||||
/>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//field[@name='total_hours_spent']" position="after">
|
|
||||||
<span invisible="subtask_effective_hours == 0.0">
|
|
||||||
<label
|
|
||||||
for="total_billable_hours_spent"
|
|
||||||
string="Total Billable Hours"
|
|
||||||
invisible="encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
for="total_billable_hours_spent"
|
|
||||||
string="Total Billable Days"
|
|
||||||
invisible="not encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<field
|
|
||||||
name="total_billable_hours_spent"
|
|
||||||
widget="timesheet_uom"
|
|
||||||
nolabel="1"
|
|
||||||
invisible="subtask_effective_hours == 0.0"
|
|
||||||
/>
|
|
||||||
<span invisible="subtask_effective_hours == 0.0">
|
|
||||||
<label
|
|
||||||
for="total_non_billable_hours_spent"
|
|
||||||
string="Total Non Billable Hours"
|
|
||||||
invisible="encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
for="total_non_billable_hours_spent"
|
|
||||||
string="Total Non Billable Days"
|
|
||||||
invisible="not encode_uom_in_days"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<field
|
|
||||||
name="total_non_billable_hours_spent"
|
|
||||||
widget="timesheet_uom"
|
|
||||||
nolabel="1"
|
|
||||||
invisible="subtask_effective_hours == 0.0"
|
|
||||||
/>
|
|
||||||
</xpath>
|
|
||||||
<xpath expr="//field[@name='remaining_hours']" position="after">
|
|
||||||
<span>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold text-danger"
|
|
||||||
for="billable_remaining_hours"
|
|
||||||
string="Billable Remaining Hours"
|
|
||||||
invisible="allocated_hours == 0.0 or encode_uom_in_days or billable_remaining_hours >= 0"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="billable_remaining_hours"
|
|
||||||
string="Billable Remaining Hours"
|
|
||||||
invisible="allocated_hours == 0.0 or encode_uom_in_days or billable_remaining_hours < 0"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold text-danger"
|
|
||||||
for="billable_remaining_hours"
|
|
||||||
string="Billable Remaining Days"
|
|
||||||
invisible="allocated_hours == 0.0 or not encode_uom_in_days or billable_remaining_hours >= 0"
|
|
||||||
/>
|
|
||||||
<label
|
|
||||||
class="font-weight-bold"
|
|
||||||
for="billable_remaining_hours"
|
|
||||||
string="Billable Remaining Days"
|
|
||||||
invisible="allocated_hours == 0.0 or not encode_uom_in_days or billable_remaining_hours < 0"
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
<field
|
|
||||||
name="billable_remaining_hours"
|
|
||||||
widget="timesheet_uom"
|
|
||||||
class="oe_subtotal_footer_separator"
|
|
||||||
invisible="allocated_hours == 0.0"
|
|
||||||
decoration-danger="billable_remaining_hours < 0"
|
|
||||||
nolabel="1"
|
|
||||||
/>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
</odoo>
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<odoo>
|
|
||||||
<template
|
|
||||||
id="portal_tasks_list_inherit"
|
|
||||||
inherit_id="hr_timesheet.portal_tasks_list_inherit"
|
|
||||||
>
|
|
||||||
<xpath
|
|
||||||
expr="//thead//t[@t-if='not project or project.allow_timesheets']/th[@class='text-end']"
|
|
||||||
position="replace"
|
|
||||||
>
|
|
||||||
<th class="text-end">Billable hours</th>
|
|
||||||
</xpath>
|
|
||||||
<xpath
|
|
||||||
expr="//tbody//td[@t-if='not project or project.allow_timesheets']"
|
|
||||||
position="replace"
|
|
||||||
>
|
|
||||||
<td t-if="not project or project.allow_timesheets" class="text-end">
|
|
||||||
<t t-if="task.allow_timesheets and not is_uom_day">
|
|
||||||
<span
|
|
||||||
t-field="task.billable_effective_hours"
|
|
||||||
t-options='{"widget": "float_time"}'
|
|
||||||
/>
|
|
||||||
<t t-if="task.allocated_hours > 0"> / <span
|
|
||||||
t-field="task.allocated_hours"
|
|
||||||
t-options='{"widget": "float_time"}'
|
|
||||||
/>
|
|
||||||
</t>
|
|
||||||
</t>
|
|
||||||
</td>
|
|
||||||
</xpath>
|
|
||||||
</template>
|
|
||||||
</odoo>
|
|
||||||
Reference in New Issue
Block a user