Skip to content

Commit

Permalink
[MIG] sale_timesheet_line_exclude: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Rogos authored and Mohamed Osman committed Feb 27, 2024
1 parent 91ba1e0 commit 15a55a6
Show file tree
Hide file tree
Showing 12 changed files with 84 additions and 79 deletions.
23 changes: 13 additions & 10 deletions sale_timesheet_line_exclude/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@
Sales Timesheet: exclude Timesheet Line from Sale Order
=======================================================

.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:8c20f242767ac3ee39564c477ad4a887702d3a6ac3725233e566ea61ac8cfc94
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
Expand All @@ -14,16 +17,16 @@ Sales Timesheet: exclude Timesheet Line from Sale Order
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github
:target: https://github.com/OCA/timesheet/tree/15.0/sale_timesheet_line_exclude
:target: https://github.com/OCA/timesheet/tree/16.0/sale_timesheet_line_exclude
:alt: OCA/timesheet
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
:target: https://translation.odoo-community.org/projects/timesheet-15-0/timesheet-15-0-sale_timesheet_line_exclude
:target: https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-sale_timesheet_line_exclude
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
:target: https://runbot.odoo-community.org/runbot/117/15.0
:alt: Try me on Runbot
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/timesheet&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
|badge1| |badge2| |badge3| |badge4| |badge5|

Allows to exclude specific *Timesheet* line from Sale Order.

Expand Down Expand Up @@ -56,8 +59,8 @@ Bug Tracker

Bugs are tracked on `GitHub Issues <https://github.com/OCA/timesheet/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 <https://github.com/OCA/timesheet/issues/new?body=module:%20sale_timesheet_line_exclude%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/timesheet/issues/new?body=module:%20sale_timesheet_line_exclude%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

Do not contact contributors directly about support or help with technical issues.

Expand Down Expand Up @@ -90,6 +93,6 @@ 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.

This module is part of the `OCA/timesheet <https://github.com/OCA/timesheet/tree/15.0/sale_timesheet_line_exclude>`_ project on GitHub.
This module is part of the `OCA/timesheet <https://github.com/OCA/timesheet/tree/16.0/sale_timesheet_line_exclude>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
2 changes: 1 addition & 1 deletion sale_timesheet_line_exclude/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
"name": "Sales Timesheet: exclude Timesheet Line from Sale Order",
"version": "15.0.1.0.0",
"version": "16.0.1.0.0",
"category": "Sales",
"website": "https://github.com/OCA/timesheet",
"author": "CorporateHub, " "Odoo Community Association (OCA)",
Expand Down
15 changes: 7 additions & 8 deletions sale_timesheet_line_exclude/i18n/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,24 @@ msgstr "Kostenstellenbuchung"

#. module: sale_timesheet_line_exclude
#: model:ir.model.fields,help:sale_timesheet_line_exclude.field_account_analytic_line__exclude_from_sale_order
#: model:ir.model.fields,help:sale_timesheet_line_exclude.field_hr_timesheet_switch__exclude_from_sale_order
msgid "Checking this would exclude this timesheet entry from Sale Order"
msgstr ""
"Wenn der Haken gesetzt ist, wird diese Zeiterfassung für die Abrechnung über "
"einen Verkaufsauftrag ausgeschlossen."

#. module: sale_timesheet_line_exclude
#: model:ir.model.fields,field_description:sale_timesheet_line_exclude.field_account_analytic_line__exclude_from_sale_order
#: model:ir.model.fields,field_description:sale_timesheet_line_exclude.field_hr_timesheet_switch__exclude_from_sale_order
msgid "Non-billable"
msgstr "von Abrechnung ausschließen"

#. module: sale_timesheet_line_exclude
#: model_terms:ir.ui.view,arch_db:sale_timesheet_line_exclude.account_analytic_line_search
msgid "Excluded From Sale Order"
msgstr "von Abrechnung ausgeschlossen"

#. module: sale_timesheet_line_exclude
#: code:addons/sale_timesheet_line_exclude/models/account_analytic_line.py:38
#: model:ir.model.fields,field_description:sale_timesheet_line_exclude.field_account_analytic_line__exclude_from_sale_order
msgid "Non-billable"
msgstr "von Abrechnung ausschließen"

#. module: sale_timesheet_line_exclude
#. odoo-python
#: code:addons/sale_timesheet_line_exclude/models/account_analytic_line.py:0
#, python-format
msgid ""
"You can not modify timesheets in a way that would affect invoices since "
Expand Down
15 changes: 7 additions & 8 deletions sale_timesheet_line_exclude/i18n/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,23 @@ msgstr "Línea analítica"

#. module: sale_timesheet_line_exclude
#: model:ir.model.fields,help:sale_timesheet_line_exclude.field_account_analytic_line__exclude_from_sale_order
#: model:ir.model.fields,help:sale_timesheet_line_exclude.field_hr_timesheet_switch__exclude_from_sale_order
msgid "Checking this would exclude this timesheet entry from Sale Order"
msgstr ""
"Marcando esto excluirá esta entrada del Parte de horas del pedido de venta"

#. module: sale_timesheet_line_exclude
#: model:ir.model.fields,field_description:sale_timesheet_line_exclude.field_account_analytic_line__exclude_from_sale_order
#: model:ir.model.fields,field_description:sale_timesheet_line_exclude.field_hr_timesheet_switch__exclude_from_sale_order
msgid "Non-billable"
msgstr "Excluir del pedido de venta"

#. module: sale_timesheet_line_exclude
#: model_terms:ir.ui.view,arch_db:sale_timesheet_line_exclude.account_analytic_line_search
msgid "Excluded From Sale Order"
msgstr "Excluido del pedido de venta"

#. module: sale_timesheet_line_exclude
#: code:addons/sale_timesheet_line_exclude/models/account_analytic_line.py:38
#: model:ir.model.fields,field_description:sale_timesheet_line_exclude.field_account_analytic_line__exclude_from_sale_order
msgid "Non-billable"
msgstr "Excluir del pedido de venta"

#. module: sale_timesheet_line_exclude
#. odoo-python
#: code:addons/sale_timesheet_line_exclude/models/account_analytic_line.py:0
#, python-format
msgid ""
"You can not modify timesheets in a way that would affect invoices since "
Expand Down
21 changes: 11 additions & 10 deletions sale_timesheet_line_exclude/i18n/fr.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * sale_timesheet_line_exclude
# * sale_timesheet_line_exclude
#
msgid ""
msgstr ""
Expand All @@ -23,27 +23,28 @@ msgstr "Ligne analytique"

#. module: sale_timesheet_line_exclude
#: model:ir.model.fields,help:sale_timesheet_line_exclude.field_account_analytic_line__exclude_from_sale_order
#: model:ir.model.fields,help:sale_timesheet_line_exclude.field_hr_timesheet_switch__exclude_from_sale_order
msgid "Checking this would exclude this timesheet entry from Sale Order"
msgstr ""
"Cocher cette case exclut cette entrée de feuille de temps de la commande "
"client"

#. module: sale_timesheet_line_exclude
#: model:ir.model.fields,field_description:sale_timesheet_line_exclude.field_account_analytic_line__exclude_from_sale_order
#: model:ir.model.fields,field_description:sale_timesheet_line_exclude.field_hr_timesheet_switch__exclude_from_sale_order
msgid "Non-billable"
msgstr "Non facturable"

#. module: sale_timesheet_line_exclude
#: model_terms:ir.ui.view,arch_db:sale_timesheet_line_exclude.account_analytic_line_search
msgid "Excluded From Sale Order"
msgstr "Exclue de la commande client"

#. module: sale_timesheet_line_exclude
#: code:addons/sale_timesheet_line_exclude/models/account_analytic_line.py:38
#: model:ir.model.fields,field_description:sale_timesheet_line_exclude.field_account_analytic_line__exclude_from_sale_order
msgid "Non-billable"
msgstr "Non facturable"

#. module: sale_timesheet_line_exclude
#. odoo-python
#: code:addons/sale_timesheet_line_exclude/models/account_analytic_line.py:0
#, python-format
msgid "You can not modify timesheets in a way that would affect invoices since these timesheets were already invoiced."
msgid ""
"You can not modify timesheets in a way that would affect invoices since "
"these timesheets were already invoiced."
msgstr ""
"Vous ne pouvez pas modifier les feuilles de temps d'une manière qui "
"affecterait les factures puisque ces feuilles de temps étaient déjà "
Expand Down
1 change: 1 addition & 0 deletions sale_timesheet_line_exclude/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ msgid "Non-billable"
msgstr "Non fatturabile"

#. module: sale_timesheet_line_exclude
#. odoo-python
#: code:addons/sale_timesheet_line_exclude/models/account_analytic_line.py:0
#, python-format
msgid ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 15.0\n"
"Project-Id-Version: Odoo Server 16.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -34,6 +34,7 @@ msgid "Non-billable"
msgstr ""

#. module: sale_timesheet_line_exclude
#. odoo-python
#: code:addons/sale_timesheet_line_exclude/models/account_analytic_line.py:0
#, python-format
msgid ""
Expand Down
4 changes: 2 additions & 2 deletions sale_timesheet_line_exclude/models/account_analytic_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ def _constrains_exclude_from_sale_order(self):

@api.depends("exclude_from_sale_order")
def _compute_timesheet_invoice_type(self):
result = super()._compute_timesheet_invoice_type()
res = super()._compute_timesheet_invoice_type()
for line in self:
if line.exclude_from_sale_order:
line.timesheet_invoice_type = "non_billable"
return result
return res

@api.depends("exclude_from_sale_order")
def _compute_so_line_on_exclude(self):
Expand Down
42 changes: 22 additions & 20 deletions sale_timesheet_line_exclude/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<!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 0.15.1: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
<title>Sales Timesheet: exclude Timesheet Line from Sale Order</title>
<style type="text/css">

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/

Expand Down Expand Up @@ -366,8 +366,10 @@ <h1 class="title">Sales Timesheet: exclude Timesheet Line from Sale Order</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:8c20f242767ac3ee39564c477ad4a887702d3a6ac3725233e566ea61ac8cfc94
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" 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" 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" href="https://github.com/OCA/timesheet/tree/15.0/sale_timesheet_line_exclude"><img alt="OCA/timesheet" src="https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/timesheet-15-0/timesheet-15-0-sale_timesheet_line_exclude"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/117/15.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<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/timesheet/tree/16.0/sale_timesheet_line_exclude"><img alt="OCA/timesheet" src="https://img.shields.io/badge/github-OCA%2Ftimesheet-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/timesheet-16-0/timesheet-16-0-sale_timesheet_line_exclude"><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/timesheet&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>Allows to exclude specific <em>Timesheet</em> line from Sale Order.</p>
<p>This feature proves itself useful for <em>By Task</em> billing approach, when
a specific timesheet entry tracked towards a billable task needs to be
Expand All @@ -376,18 +378,18 @@ <h1 class="title">Sales Timesheet: exclude Timesheet Line from Sale Order</h1>
<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="id1">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
<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="#id1">Usage</a></h1>
<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<p>To exclude a specific timesheet entry from invoicing:</p>
<blockquote>
# Go to <em>Timesheets &gt; Timesheet &gt; All Timesheets</em>
Expand All @@ -398,23 +400,23 @@ <h1><a class="toc-backref" href="#id1">Usage</a></h1>
# On the Task form, <em>Timesheets</em> tab, check <em>Non-billable</em> for specific timesheet entries</blockquote>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
<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/timesheet/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 smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/timesheet/issues/new?body=module:%20sale_timesheet_line_exclude%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
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/timesheet/issues/new?body=module:%20sale_timesheet_line_exclude%0Aversion:%2016.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="#id3">Credits</a></h1>
<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id4">Authors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
<ul class="simple">
<li>CorporateHub</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<ul class="simple">
<li><a class="reference external" href="https://corporatehub.eu/">CorporateHub</a><ul>
<li>Alexey Pelykh &lt;<a class="reference external" href="mailto:alexey.pelykh&#64;corphub.eu">alexey.pelykh&#64;corphub.eu</a>&gt;</li>
Expand All @@ -424,13 +426,13 @@ <h2><a class="toc-backref" href="#id5">Contributors</a></h2>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
<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>This module is part of the <a class="reference external" href="https://github.com/OCA/timesheet/tree/15.0/sale_timesheet_line_exclude">OCA/timesheet</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/timesheet/tree/16.0/sale_timesheet_line_exclude">OCA/timesheet</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>
Expand Down
8 changes: 0 additions & 8 deletions sale_timesheet_line_exclude/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).

from odoo.addons.sale_timesheet.tests import common
from odoo.addons.sale_timesheet.tests import test_sale_timesheet
from odoo.addons.sale_timesheet.tests import test_sale_service
from odoo.addons.sale_timesheet.tests import test_project_billing
from odoo.addons.sale_timesheet.tests import test_reinvoice
from odoo.addons.sale_timesheet.tests import test_reporting

from . import test_sale_timesheet_line_exclude
Loading

0 comments on commit 15a55a6

Please sign in to comment.