Merge PR #1104 into 17.0

Signed-off-by pedrobaeza
2025-02-13 17:57:24 +02:00 · 2024-08-24 16:55:37 +00:00
parent aa9e6c4175 fbf05ba7eb
commit d829b67534
22 changed files with 1052 additions and 0 deletions
--- a/contract_variable_qty_timesheet/README.rst
+++ b/contract_variable_qty_timesheet/README.rst
@@ -0,0 +1,118 @@
+===============================
+Contract Variable Qty Timesheet
+===============================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:73b06705689ef093fa9faf3acbdfedbee3ddf23da70d43f7137298b1bd32c7eb
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github
+    :target: https://github.com/OCA/contract/tree/17.0/contract_variable_qty_timesheet
+    :alt: OCA/contract
+.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
+    :target: https://translation.odoo-community.org/projects/contract-17-0/contract-17-0-contract_variable_qty_timesheet
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/contract&target_branch=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module extends the functionality of contract_variable_quantity
+adding several variable quantity formulas to allow to invoice lines from
+Timesheet (Analytic Lines).
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Usage
+=====
+
+To use this module, you need to:
+
+1. Go to Invoicing > Customers > Customer Contracts and select or create
+   a new contract.
+2. Check *Generate recurring invoices automatically*.
+3. Add a new recurring invoicing line.
+4. Select "Variable quantity" in column "Qty. type".
+5. Select "Project Timesheets", "Tasks Timesheets" or "Analytic Same
+   Product" depending on your need.
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/contract/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/contract/issues/new?body=module:%20contract_variable_qty_timesheet%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* Tecnativa
+
+Contributors
+------------
+
+-  `Tecnativa <https://www.tecnativa.com>`__:
+
+   -  Carlos Dauden
+   -  Pedro M. Baeza
+   -  Carolina Fernandez
+   -  Juan José Seguí
+
+-  `Guadaltech <https://www.guadaltech.es>`__:
+
+   -  Fernando La Chica <fernandolachica@gmail.com>
+
+-  `Coopdevs Treball <https://coopdevs.coop>`__:
+
+   -  Daniel Palomar <daniel.palomar@coopdevs.org>
+
+Maintainers
+-----------
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+.. |maintainer-carlosdauden| image:: https://github.com/carlosdauden.png?size=40px
+    :target: https://github.com/carlosdauden
+    :alt: carlosdauden
+.. |maintainer-pedrobaeza| image:: https://github.com/pedrobaeza.png?size=40px
+    :target: https://github.com/pedrobaeza
+    :alt: pedrobaeza
+.. |maintainer-danypr92| image:: https://github.com/danypr92.png?size=40px
+    :target: https://github.com/danypr92
+    :alt: danypr92
+
+Current `maintainers <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-carlosdauden| |maintainer-pedrobaeza| |maintainer-danypr92| 
+
+This module is part of the `OCA/contract <https://github.com/OCA/contract/tree/17.0/contract_variable_qty_timesheet>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
--- a/contract_variable_qty_timesheet/init.py
+++ b/contract_variable_qty_timesheet/init.py
@@ -0,0 +1 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
--- a/contract_variable_qty_timesheet/manifest.py
+++ b/contract_variable_qty_timesheet/manifest.py
@@ -0,0 +1,17 @@
+# Copyright 2018 Tecnativa - Carlos Dauden
+# Copyright 2019 Tecnativa - Pedro M. Baeza
+# Copyright 2023 Tecnativa - Carolina Fernandez
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+{
+    "name": "Contract Variable Qty Timesheet",
+    "summary": "Add formula to invoice ",
+    "version": "17.0.1.0.0",
+    "category": "Contract Management",
+    "website": "https://github.com/OCA/contract",
+    "author": "Tecnativa, " "Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "installable": True,
+    "depends": ["contract_variable_quantity", "hr_timesheet"],
+    "data": ["data/contract_line_qty_formula_data.xml"],
+    "maintainers": ["carlosdauden", "pedrobaeza", "danypr92"],
+}
--- a/contract_variable_qty_timesheet/data/contract_line_qty_formula_data.xml
+++ b/contract_variable_qty_timesheet/data/contract_line_qty_formula_data.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2018 Tecnativa - Carlos Dauden
+     Copyright 2019 Tecnativa - Pedro M. Baeza
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+    <record
+        id="contract_line_qty_formula_project_timesheet"
+        model="contract.line.qty.formula"
+    >
+        <field name='name'>Project Timesheets</field>
+        <field name="code">
+account_analytic_ids = line.analytic_distribution and [int(_id) for _id in list(line.analytic_distribution.keys())] or []
+group = env['account.analytic.line'].read_group([
+    ('account_id', 'in', account_analytic_ids),
+    ('product_id', '=', False),
+    ('project_id', '!=', False),
+    ('date', '&gt;=', period_first_date),
+    ('date', '&lt;=', period_last_date),
+], fields=['unit_amount'], groupby=[])
+result = group and group[0]['unit_amount'] or 0.0
+    </field>
+    </record>
+    <record
+        id="contract_line_qty_formula_task_timesheet"
+        model="contract.line.qty.formula"
+    >
+        <field name='name'>Task Timesheets</field>
+        <field name="code">
+account_analytic_ids = line.analytic_distribution and [int(_id) for _id in list(line.analytic_distribution.keys())] or []
+group = env['account.analytic.line'].read_group([
+    ('account_id', 'in', account_analytic_ids),
+    ('product_id', '=', False),
+    ('task_id', '!=', False),
+    ('date', '&gt;=', period_first_date),
+    ('date', '&lt;=', period_last_date),
+], fields=['unit_amount'], groupby=[])
+result = group and group[0]['unit_amount'] or 0.0
+    </field>
+    </record>
+    <record
+        id="contract_line_qty_formula_analytic_same_product"
+        model="contract.line.qty.formula"
+    >
+        <field name='name'>Analytic Same Product</field>
+        <field name="code">
+account_analytic_ids = line.analytic_distribution and [int(_id) for _id in list(line.analytic_distribution.keys())] or []
+group = env['account.analytic.line'].read_group([
+    ('account_id', 'in', account_analytic_ids),
+    ('product_id', '=', line.product_id.id),
+    ('date', '&gt;=', period_first_date),
+    ('date', '&lt;=', period_last_date),
+], fields=['unit_amount'], groupby=[])
+result = group and group[0]['unit_amount'] or 0.0
+    </field>
+    </record>
+</odoo>
--- a/contract_variable_qty_timesheet/i18n/contract_variable_qty_timesheet.pot
+++ b/contract_variable_qty_timesheet/i18n/contract_variable_qty_timesheet.pot
@@ -0,0 +1,29 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* contract_variable_qty_timesheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \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: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product
+msgid "Analytic Same Product"
+msgstr ""
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet
+msgid "Project Timesheets"
+msgstr ""
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet
+msgid "Task Timesheets"
+msgstr ""
--- a/contract_variable_qty_timesheet/i18n/de.po
+++ b/contract_variable_qty_timesheet/i18n/de.po
@@ -0,0 +1,32 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* contract_variable_qty_timesheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2019-03-07 15:53+0000\n"
+"Last-Translator: Maria Sparenberg <maria.sparenberg@gmx.net>\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.4\n"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product
+msgid "Analytic Same Product"
+msgstr "Gleiches Produkt"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet
+msgid "Project Timesheets"
+msgstr "Projekt-Zeiterfassungen"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet
+msgid "Task Timesheets"
+msgstr "Aufgaben-Zeiterfassungen"
--- a/contract_variable_qty_timesheet/i18n/es.po
+++ b/contract_variable_qty_timesheet/i18n/es.po
@@ -0,0 +1,33 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* contract_variable_qty_timesheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-03-29 11:13+0200\n"
+"PO-Revision-Date: 2018-03-29 11:21+0200\n"
+"Last-Translator: Carlos Dauden <carlos.dauden@tecnativa.com>\n"
+"Language-Team: \n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.8.7.1\n"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product
+msgid "Analytic Same Product"
+msgstr "Analítica mismo producto"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet
+msgid "Project Timesheets"
+msgstr "Partes de horas de proyectos"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet
+msgid "Task Timesheets"
+msgstr "Partes de horas de tareas"
--- a/contract_variable_qty_timesheet/i18n/fr.po
+++ b/contract_variable_qty_timesheet/i18n/fr.po
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_variable_qty_timesheet
+#
+# Translators:
+# Quentin THEURET <odoo@kerpeo.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-06 21:09+0000\n"
+"PO-Revision-Date: 2018-04-06 21:09+0000\n"
+"Last-Translator: Quentin THEURET <odoo@kerpeo.com>, 2018\n"
+"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product
+msgid "Analytic Same Product"
+msgstr "Même produit analytique"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet
+msgid "Project Timesheets"
+msgstr "Feuilles de temps du projet"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet
+msgid "Task Timesheets"
+msgstr "Feuille de temps de la tâche"
--- a/contract_variable_qty_timesheet/i18n/it.po
+++ b/contract_variable_qty_timesheet/i18n/it.po
@@ -0,0 +1,32 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* contract_variable_qty_timesheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2018-12-24 23:58+0000\n"
+"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.3\n"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product
+msgid "Analytic Same Product"
+msgstr ""
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet
+msgid "Project Timesheets"
+msgstr "Fogli ore progetto"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet
+msgid "Task Timesheets"
+msgstr "Fogli ore attività"
--- a/contract_variable_qty_timesheet/i18n/pt.po
+++ b/contract_variable_qty_timesheet/i18n/pt.po
@@ -0,0 +1,32 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* contract_variable_qty_timesheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-02-17 19:13+0000\n"
+"Last-Translator: Pedro Castro Silva <pedrocs@exo.pt>\n"
+"Language-Team: none\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 3.10\n"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product
+msgid "Analytic Same Product"
+msgstr "Analítica Mesmo Produto"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet
+msgid "Project Timesheets"
+msgstr "Folhas de Horas de Projetos"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet
+msgid "Task Timesheets"
+msgstr "Folhas de horas de Tarefas"
--- a/contract_variable_qty_timesheet/i18n/pt_BR.po
+++ b/contract_variable_qty_timesheet/i18n/pt_BR.po
@@ -0,0 +1,32 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* contract_variable_qty_timesheet
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 12.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2022-10-12 03:42+0000\n"
+"Last-Translator: Douglas Custódio <douglascstd@yahoo.com>\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.3.2\n"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product
+msgid "Analytic Same Product"
+msgstr "Mesmo Produto Analítico"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet
+msgid "Project Timesheets"
+msgstr "Apontamentos de horas do Projeto"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet
+msgid "Task Timesheets"
+msgstr "Planilhas de Tempo da Tarefa"
--- a/contract_variable_qty_timesheet/i18n/zh.po
+++ b/contract_variable_qty_timesheet/i18n/zh.po
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * contract_variable_qty_timesheet
+#
+# Translators:
+# DIT INTL <ditintlgroup@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-27 01:12+0000\n"
+"PO-Revision-Date: 2018-04-27 01:12+0000\n"
+"Last-Translator: DIT INTL <ditintlgroup@gmail.com>, 2018\n"
+"Language-Team: Chinese (https://www.transifex.com/oca/teams/23907/zh/)\n"
+"Language: zh\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product
+msgid "Analytic Same Product"
+msgstr "分析同一产品"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet
+msgid "Project Timesheets"
+msgstr "项目时间表"
+
+#. module: contract_variable_qty_timesheet
+#: model:contract.line.qty.formula,name:contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet
+msgid "Task Timesheets"
+msgstr "任务时间表"
--- a/contract_variable_qty_timesheet/pyproject.toml
+++ b/contract_variable_qty_timesheet/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
--- a/contract_variable_qty_timesheet/readme/CONTRIBUTORS.md
+++ b/contract_variable_qty_timesheet/readme/CONTRIBUTORS.md
@@ -0,0 +1,9 @@
+- [Tecnativa](https://www.tecnativa.com):
+  - Carlos Dauden
+  - Pedro M. Baeza
+  - Carolina Fernandez
+  - Juan José Seguí
+- [Guadaltech](https://www.guadaltech.es):
+  - Fernando La Chica \<<fernandolachica@gmail.com>\>
+- [Coopdevs Treball](https://coopdevs.coop):
+  - Daniel Palomar \<<daniel.palomar@coopdevs.org>\>
--- a/contract_variable_qty_timesheet/readme/DESCRIPTION.md
+++ b/contract_variable_qty_timesheet/readme/DESCRIPTION.md
@@ -0,0 +1,3 @@
+This module extends the functionality of contract_variable_quantity
+adding several variable quantity formulas to allow to invoice lines from
+Timesheet (Analytic Lines).
--- a/contract_variable_qty_timesheet/readme/USAGE.md
+++ b/contract_variable_qty_timesheet/readme/USAGE.md
@@ -0,0 +1,9 @@
+To use this module, you need to:
+
+1.  Go to Invoicing \> Customers \> Customer Contracts and select or
+    create a new contract.
+2.  Check *Generate recurring invoices automatically*.
+3.  Add a new recurring invoicing line.
+4.  Select "Variable quantity" in column "Qty. type".
+5.  Select "Project Timesheets", "Tasks Timesheets" or "Analytic Same
+    Product" depending on your need.
--- a/contract_variable_qty_timesheet/setup/.setuptools-odoo-make-default-ignore
+++ b/contract_variable_qty_timesheet/setup/.setuptools-odoo-make-default-ignore
@@ -0,0 +1,2 @@
+# addons listed in this file are ignored by
+# setuptools-odoo-make-default (one addon per line)
--- a/contract_variable_qty_timesheet/setup/README
+++ b/contract_variable_qty_timesheet/setup/README
@@ -0,0 +1,2 @@
+To learn more about this directory, please visit
+https://pypi.python.org/pypi/setuptools-odoo
--- a/contract_variable_qty_timesheet/static/description/icon.png
+++ b/contract_variable_qty_timesheet/static/description/icon.png
--- a/contract_variable_qty_timesheet/static/description/index.html
+++ b/contract_variable_qty_timesheet/static/description/index.html
@@ -0,0 +1,455 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Contract Variable Qty Timesheet</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="contract-variable-qty-timesheet">
+<h1 class="title">Contract Variable Qty Timesheet</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:73b06705689ef093fa9faf3acbdfedbee3ddf23da70d43f7137298b1bd32c7eb
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/contract/tree/17.0/contract_variable_qty_timesheet"><img alt="OCA/contract" src="https://img.shields.io/badge/github-OCA%2Fcontract-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/contract-17-0/contract-17-0-contract_variable_qty_timesheet"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/contract&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module extends the functionality of contract_variable_quantity
+adding several variable quantity formulas to allow to invoice lines from
+Timesheet (Analytic Lines).</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
+<p>To use this module, you need to:</p>
+<ol class="arabic simple">
+<li>Go to Invoicing &gt; Customers &gt; Customer Contracts and select or create
+a new contract.</li>
+<li>Check <em>Generate recurring invoices automatically</em>.</li>
+<li>Add a new recurring invoicing line.</li>
+<li>Select “Variable quantity” in column “Qty. type”.</li>
+<li>Select “Project Timesheets”, “Tasks Timesheets” or “Analytic Same
+Product” depending on your need.</li>
+</ol>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/contract/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/contract/issues/new?body=module:%20contract_variable_qty_timesheet%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
+<ul class="simple">
+<li>Tecnativa</li>
+</ul>
+</div>
+<div class="section" id="contributors">
+<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
+<ul class="simple">
+<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
+<li>Carlos Dauden</li>
+<li>Pedro M. Baeza</li>
+<li>Carolina Fernandez</li>
+<li>Juan José Seguí</li>
+</ul>
+</li>
+<li><a class="reference external" href="https://www.guadaltech.es">Guadaltech</a>:<ul>
+<li>Fernando La Chica &lt;<a class="reference external" href="mailto:fernandolachica&#64;gmail.com">fernandolachica&#64;gmail.com</a>&gt;</li>
+</ul>
+</li>
+<li><a class="reference external" href="https://coopdevs.coop">Coopdevs Treball</a>:<ul>
+<li>Daniel Palomar &lt;<a class="reference external" href="mailto:daniel.palomar&#64;coopdevs.org">daniel.palomar&#64;coopdevs.org</a>&gt;</li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.</p>
+<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
+<p><a class="reference external image-reference" href="https://github.com/carlosdauden"><img alt="carlosdauden" src="https://github.com/carlosdauden.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/pedrobaeza"><img alt="pedrobaeza" src="https://github.com/pedrobaeza.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/danypr92"><img alt="danypr92" src="https://github.com/danypr92.png?size=40px" /></a></p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/contract/tree/17.0/contract_variable_qty_timesheet">OCA/contract</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
--- a/contract_variable_qty_timesheet/tests/init.py
+++ b/contract_variable_qty_timesheet/tests/init.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import test_contract_variable_qty_timesheet
--- a/contract_variable_qty_timesheet/tests/test_contract_variable_qty_timesheet.py
+++ b/contract_variable_qty_timesheet/tests/test_contract_variable_qty_timesheet.py
@@ -0,0 +1,116 @@
+# Copyright 2019 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields
+from odoo.tests.common import TransactionCase
+
+
+class TestContractVariableQtyTimesheet(TransactionCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.company = cls.env.company
+        cls.partner = cls.env["res.partner"].create(
+            {"name": "Test partner", "company_id": cls.company.id}
+        )
+        cls.plan = cls.env["account.analytic.plan"].create({"name": "Test Plan"})
+        cls.analytic_account = cls.env["account.analytic.account"].create(
+            {
+                "name": "Test analytic account",
+                "plan_id": cls.plan.id,
+                "company_id": cls.company.id,
+            }
+        )
+        cls.contract = cls.env["contract.contract"].create(
+            {
+                "name": "Test contract",
+                "partner_id": cls.partner.id,
+                "company_id": cls.company.id,
+            }
+        )
+        cls.product = cls.env["product.product"].create(
+            {"name": "Test product", "company_id": cls.company.id}
+        )
+        cls.employee = cls.env["hr.employee"].create(
+            {
+                "name": "Test Employee",
+                "company_id": cls.company.id,
+            }
+        )
+        contract_line_vals = {
+            "name": "Test contract line",
+            "contract_id": cls.contract.id,
+            "date_start": "2020-01-01",
+            "date_end": "2020-12-31",
+            "product_id": cls.product.id,
+            "qty_formula_id": cls.env.ref(
+                "contract_variable_qty_timesheet.contract_line_qty_formula_project_timesheet"
+            ).id,
+            "sequence": 10,
+            "state": "in-progress",
+            "company_id": cls.company.id,
+            "qty_type": "variable",
+            "analytic_distribution": {str(cls.analytic_account.id): 100},
+        }
+        cls.contract_line = cls.env["contract.line"].create(contract_line_vals)
+        cls.project = cls.env["project.project"].create(
+            {
+                "name": "Test project",
+                "analytic_account_id": cls.analytic_account.id,
+                "company_id": cls.company.id,
+            }
+        )
+        cls.task = cls.env["project.task"].create(
+            {
+                "project_id": cls.project.id,
+                "name": "Test task",
+                "company_id": cls.company.id,
+            }
+        )
+
+    def _contract_invoicing(self, contract):
+        date_ref = fields.Date.from_string("2020-01-01")
+        contract._recurring_create_invoice(date_ref)
+        return contract._get_related_invoices()
+
+    def _create_analytic_line(self, project, task, date, product, unit_amount):
+        return self.env["account.analytic.line"].create(
+            {
+                "account_id": self.analytic_account.id,
+                "project_id": project and project.id,
+                "task_id": task and task.id,
+                "name": f"Test {date} {unit_amount}",
+                "date": date,
+                "product_id": product and product.id,
+                "unit_amount": unit_amount,
+                "employee_id": self.employee.id,
+                "company_id": self.company.id,
+            }
+        )
+
+    def test_project_timesheet(self):
+        self._create_analytic_line(self.project, self.task, "2020-01-01", False, 3)
+        self._create_analytic_line(False, False, "2020-01-01", False, 1)
+        invoice = self.contract._recurring_create_invoice()
+        self.assertEqual(len(invoice.invoice_line_ids), 1)
+        self.assertAlmostEqual(invoice.invoice_line_ids.quantity, 3)
+
+    def test_task_timesheet(self):
+        self.contract_line.qty_formula_id = self.env.ref(
+            "contract_variable_qty_timesheet.contract_line_qty_formula_task_timesheet"
+        ).id
+        self._create_analytic_line(self.project, self.task, "2020-01-01", False, 3)
+        self._create_analytic_line(self.project, False, "2020-01-01", False, 1)
+        invoice = self.contract._recurring_create_invoice()
+        self.assertEqual(len(invoice.invoice_line_ids), 1)
+        self.assertAlmostEqual(invoice.invoice_line_ids.quantity, 3)
+
+    def test_same_product(self):
+        self.contract_line.qty_formula_id = self.env.ref(
+            "contract_variable_qty_timesheet.contract_line_qty_formula_analytic_same_product"
+        ).id
+        self._create_analytic_line(False, False, "2020-01-01", self.product, 3)
+        self._create_analytic_line(self.project, False, "2020-01-01", False, 1)
+        invoice = self.contract._recurring_create_invoice()
+        self.assertEqual(len(invoice.invoice_line_ids), 1)
+        self.assertAlmostEqual(invoice.invoice_line_ids.quantity, 3)
				`@@ -0,0 +1 @@`
				`# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).`