Compare commits
5 Commits
16.0-fix-f
...
16.0-fix
| Author | SHA1 | Date | |
|---|---|---|---|
| ecba73e832 | |||
| 2f73c1b3a7 | |||
| b65b6431b6 | |||
| 7803d476d9 | |||
| 821b17fbd5 |
@@ -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 @@
|
|||||||
===================================
|
|
||||||
allow_negative_leave_and_allocation
|
|
||||||
===================================
|
|
||||||
|
|
||||||
allow negative leaves and allocations
|
|
||||||
|
|
||||||
Installation
|
|
||||||
============
|
|
||||||
|
|
||||||
Use Odoo normal module installation procedure to install
|
|
||||||
``allow_negative_leave_and_allocation``.
|
|
||||||
|
|
||||||
Known issues / Roadmap
|
|
||||||
======================
|
|
||||||
|
|
||||||
None yet.
|
|
||||||
|
|
||||||
Bug Tracker
|
|
||||||
===========
|
|
||||||
|
|
||||||
Bugs are tracked on `our issues website <https://github.com/elabore-coop/allow_negative_leave_and_allocation/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
|
|
||||||
------------
|
|
||||||
|
|
||||||
* `Elabore <mailto:laetitia.dacosta@elabore.coop>`
|
|
||||||
|
|
||||||
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,40 +0,0 @@
|
|||||||
# Copyright 2024 Elabore ()
|
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "allow_negative_leave_and_allocation",
|
|
||||||
"version": "16.0.1.1.0",
|
|
||||||
"author": "Elabore",
|
|
||||||
"website": "https://elabore.coop",
|
|
||||||
"maintainer": "Elabore",
|
|
||||||
"license": "AGPL-3",
|
|
||||||
"category": "hr",
|
|
||||||
"summary": "allow negative leaves and allocations",
|
|
||||||
# any module necessary for this one to work correctly
|
|
||||||
"depends": [
|
|
||||||
"base","hr_holidays",
|
|
||||||
],
|
|
||||||
"qweb": [],
|
|
||||||
"external_dependencies": {
|
|
||||||
"python": [],
|
|
||||||
},
|
|
||||||
# always loaded
|
|
||||||
"data": [
|
|
||||||
"views/hr_leave_type_views.xml",
|
|
||||||
"views/hr_leave_views.xml",
|
|
||||||
],
|
|
||||||
"assets": {
|
|
||||||
'web.assets_backend': [
|
|
||||||
'allow_negative_leave_and_allocation/static/src/xml/time_off_card.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,60 +0,0 @@
|
|||||||
# Translation of Odoo Server.
|
|
||||||
# This file contains the translation of the following modules:
|
|
||||||
# * allow_negative_leave_and_allocation
|
|
||||||
#
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: Odoo Server 16.0\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2025-01-02 12:11+0000\n"
|
|
||||||
"PO-Revision-Date: 2025-01-02 12:11+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: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model.fields,field_description:allow_negative_leave_and_allocation.field_hr_leave_type__allows_negative
|
|
||||||
msgid "Allow Negative Leaves"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model_terms:ir.ui.view,arch_db:allow_negative_leave_and_allocation.hr_leave_type_negative_leave
|
|
||||||
msgid "Allow negative"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model.fields,help:allow_negative_leave_and_allocation.field_hr_leave_type__allows_negative
|
|
||||||
msgid ""
|
|
||||||
"If checked, users request can exceed the allocated days and balance can go "
|
|
||||||
"in negative."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model.constraint,message:allow_negative_leave_and_allocation.constraint_hr_leave_allocation_duration_check
|
|
||||||
msgid "The duration must be greater than 0."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model.constraint,message:allow_negative_leave_and_allocation.constraint_hr_leave_allocation_type_value
|
|
||||||
msgid ""
|
|
||||||
"The employee, department, company or employee category of this request is "
|
|
||||||
"missing. Please make sure that your user login is linked to an employee."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model,name:allow_negative_leave_and_allocation.model_hr_leave
|
|
||||||
msgid "Time Off"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model,name:allow_negative_leave_and_allocation.model_hr_leave_allocation
|
|
||||||
msgid "Time Off Allocation"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model,name:allow_negative_leave_and_allocation.model_hr_leave_type
|
|
||||||
msgid "Time Off Type"
|
|
||||||
msgstr ""
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
# Translation of Odoo Server.
|
|
||||||
# This file contains the translation of the following modules:
|
|
||||||
# * allow_negative_leave_and_allocation
|
|
||||||
#
|
|
||||||
msgid ""
|
|
||||||
msgstr ""
|
|
||||||
"Project-Id-Version: Odoo Server 16.0\n"
|
|
||||||
"Report-Msgid-Bugs-To: \n"
|
|
||||||
"POT-Creation-Date: 2025-01-02 12:11+0000\n"
|
|
||||||
"PO-Revision-Date: 2025-01-02 12:11+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: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model.fields,field_description:allow_negative_leave_and_allocation.field_hr_leave_type__allows_negative
|
|
||||||
msgid "Allow Negative Leaves"
|
|
||||||
msgstr "Autoriser les congés négatifs"
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model_terms:ir.ui.view,arch_db:allow_negative_leave_and_allocation.hr_leave_type_negative_leave
|
|
||||||
msgid "Allow negative"
|
|
||||||
msgstr "Autoriser les congés négatifs"
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model.fields,help:allow_negative_leave_and_allocation.field_hr_leave_type__allows_negative
|
|
||||||
msgid ""
|
|
||||||
"If checked, users request can exceed the allocated days and balance can go "
|
|
||||||
"in negative."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model.constraint,message:allow_negative_leave_and_allocation.constraint_hr_leave_allocation_duration_check
|
|
||||||
msgid "The duration must be greater than 0."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model.constraint,message:allow_negative_leave_and_allocation.constraint_hr_leave_allocation_type_value
|
|
||||||
msgid ""
|
|
||||||
"The employee, department, company or employee category of this request is "
|
|
||||||
"missing. Please make sure that your user login is linked to an employee."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model,name:allow_negative_leave_and_allocation.model_hr_leave
|
|
||||||
msgid "Time Off"
|
|
||||||
msgstr "Congés"
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model,name:allow_negative_leave_and_allocation.model_hr_leave_allocation
|
|
||||||
msgid "Time Off Allocation"
|
|
||||||
msgstr "Allocation de congés"
|
|
||||||
|
|
||||||
#. module: allow_negative_leave_and_allocation
|
|
||||||
#: model:ir.model,name:allow_negative_leave_and_allocation.model_hr_leave_type
|
|
||||||
msgid "Time Off Type"
|
|
||||||
msgstr "Type de congés"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
from . import hr_leave_type, hr_leave, hr_leave_allocation
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
||||||
|
|
||||||
# Copyright (c) 2005-2006 Axelor SARL. (http://www.axelor.com)
|
|
||||||
|
|
||||||
from odoo import api, models
|
|
||||||
|
|
||||||
class HrLeave(models.Model):
|
|
||||||
_inherit = "hr.leave"
|
|
||||||
|
|
||||||
@api.constrains('state', 'number_of_days', 'holiday_status_id')
|
|
||||||
def _check_holidays(self):
|
|
||||||
# On ne garde que les congés qui ne permettent pas le négatif
|
|
||||||
to_check = self.filtered(lambda h: not h.holiday_status_id.allows_negative)
|
|
||||||
if to_check:
|
|
||||||
super(HrLeave, to_check)._check_holidays()
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
||||||
|
|
||||||
# Copyright (c) 2005-2006 Axelor SARL. (http://www.axelor.com)
|
|
||||||
|
|
||||||
from odoo import models
|
|
||||||
|
|
||||||
class HrLeaveAllocation(models.Model):
|
|
||||||
_inherit = "hr.leave.allocation"
|
|
||||||
|
|
||||||
_sql_constraints = [
|
|
||||||
('type_value',
|
|
||||||
"CHECK( (holiday_type='employee' AND (employee_id IS NOT NULL OR multi_employee IS TRUE)) or "
|
|
||||||
"(holiday_type='category' AND category_id IS NOT NULL) or "
|
|
||||||
"(holiday_type='department' AND department_id IS NOT NULL) or "
|
|
||||||
"(holiday_type='company' AND mode_company_id IS NOT NULL))",
|
|
||||||
"The employee, department, company or employee category of this request is missing. Please make sure that your user login is linked to an employee."),
|
|
||||||
]
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
||||||
|
|
||||||
from odoo import api, fields, models
|
|
||||||
|
|
||||||
|
|
||||||
class HolidaysType(models.Model):
|
|
||||||
_inherit = "hr.leave.type"
|
|
||||||
|
|
||||||
# negative time off
|
|
||||||
allows_negative = fields.Boolean(string='Allow Negative Leaves',
|
|
||||||
help="If checked, users request can exceed the allocated days and balance can go in negative.")
|
|
||||||
|
|
||||||
@api.depends('requires_allocation')
|
|
||||||
def _compute_valid(self):
|
|
||||||
res = super()._compute_valid()
|
|
||||||
for holiday_type in res:
|
|
||||||
if not holiday_type.has_valid_allocation:
|
|
||||||
holiday_type.has_valid_allocation = holiday_type.allows_negative
|
|
||||||
|
|
||||||
def _get_days_request(self):
|
|
||||||
res = super()._get_days_request()
|
|
||||||
res[1]['allows_negative'] = self.allows_negative
|
|
||||||
return res
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
<template>
|
|
||||||
<t t-name="allow_negative_leave_and_allocation.TimeOffCard" t-inherit="hr_holidays.TimeOffCard" t-inherit-mode="extension" owl="1">
|
|
||||||
<xpath expr="//t[@t-set='duration']" position="replace">
|
|
||||||
<t t-set="duration" t-value="props.requires_allocation
|
|
||||||
? (props.data['allows_negative'] ? data.usable_remaining_leaves : data.virtual_remaining_leaves)
|
|
||||||
: data.virtual_leaves_taken" />
|
|
||||||
</xpath>
|
|
||||||
</t>
|
|
||||||
</template>
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<odoo>
|
|
||||||
<record id="hr_leave_type_negative_leave" model="ir.ui.view">
|
|
||||||
<field name="name">hr.leave.type.negative.leave</field>
|
|
||||||
<field name="model">hr.leave.type</field>
|
|
||||||
<field name="inherit_id" ref="hr_holidays.edit_holiday_status_form" />
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//group[@name='allocation_validation']" position="inside">
|
|
||||||
<group>
|
|
||||||
<group name="negative_leave" id="negative_leave"
|
|
||||||
string="Allow negative"
|
|
||||||
attrs="{'invisible':[('requires_allocation', '=', 'no')]}"
|
|
||||||
>
|
|
||||||
<field name="allows_negative" />
|
|
||||||
</group>
|
|
||||||
</group>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
</odoo>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<odoo>
|
|
||||||
<record id="hr_leave_view_negative_leave" model="ir.ui.view">
|
|
||||||
<field name="name">hr.leave.view.negative.leave</field>
|
|
||||||
<field name="model">hr.leave</field>
|
|
||||||
<field name="inherit_id" ref="hr_holidays.hr_leave_view_form" />
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<xpath expr="//field[@name='holiday_status_id']" position="attributes">
|
|
||||||
<attribute name="domain">[
|
|
||||||
'|',
|
|
||||||
('requires_allocation', '=', 'no'),
|
|
||||||
'&',
|
|
||||||
('has_valid_allocation', '=', True),
|
|
||||||
'|',
|
|
||||||
('allows_negative', '=', True),
|
|
||||||
'&',
|
|
||||||
('virtual_remaining_leaves', '>', 0),
|
|
||||||
('allows_negative', '=', False),
|
|
||||||
]</attribute>
|
|
||||||
</xpath>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
</odoo>
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "hr_employee_stats_sheet",
|
"name": "hr_employee_stats_sheet",
|
||||||
"version": "16.0.3.1.3",
|
"version": "16.0.3.3.0",
|
||||||
"description": "Add global sheet for employee stats",
|
"description": "Add global sheet for employee stats",
|
||||||
"summary": "Add global sheet for employee stats",
|
"summary": "Add global sheet for employee stats",
|
||||||
"author": "Nicolas JEUDY",
|
"author": "Nicolas JEUDY",
|
||||||
|
|||||||
@@ -121,14 +121,14 @@ class HrEmployeeStats(models.Model):
|
|||||||
("request_date_to", ">=", self.date),
|
("request_date_to", ">=", self.date),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
if recovery_ids:
|
|
||||||
for recovery_id in recovery_ids:
|
for recovery_id in recovery_ids:
|
||||||
if recovery_id.request_unit_hours:
|
if recovery_id.request_date_from == recovery_id.request_date_to:
|
||||||
recovery_hours = recovery_id.number_of_hours_display
|
# single-day request (hours or half-day):
|
||||||
total_recovery_hours += min(recovery_hours,self._get_total_planned_hours())
|
# Odoo already computed the hours from the calendar
|
||||||
elif recovery_id.request_unit_half:
|
total_recovery_hours += recovery_id.number_of_hours_display
|
||||||
total_recovery_hours += self._get_total_planned_hours() / 2
|
else:
|
||||||
else :
|
# multi-day request: we take the planned hours
|
||||||
|
# of THAT specific day
|
||||||
total_recovery_hours += self._get_total_planned_hours()
|
total_recovery_hours += self._get_total_planned_hours()
|
||||||
return total_recovery_hours
|
return total_recovery_hours
|
||||||
|
|
||||||
@@ -143,16 +143,18 @@ class HrEmployeeStats(models.Model):
|
|||||||
("holiday_status_id", "!=", self._get_holiday_status_id()),
|
("holiday_status_id", "!=", self._get_holiday_status_id()),
|
||||||
("request_date_from", "<=", self.date),
|
("request_date_from", "<=", self.date),
|
||||||
("request_date_to", ">=", self.date),
|
("request_date_to", ">=", self.date),
|
||||||
|
("state", '=', 'validate'),
|
||||||
|
("active", '=', True),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
if leave_ids:
|
|
||||||
for leave_id in leave_ids:
|
for leave_id in leave_ids:
|
||||||
if leave_id.request_unit_hours:
|
if leave_id.request_date_from == leave_id.request_date_to:
|
||||||
leave_hours = leave_id.number_of_hours_display
|
# single-day request (hours or half-day):
|
||||||
total_leave_hours += min(leave_hours,self._get_total_planned_hours())
|
# Odoo already computed the hours from the calendar
|
||||||
elif leave_id.request_unit_half:
|
total_leave_hours += leave_id.number_of_hours_display
|
||||||
total_leave_hours += self._get_total_planned_hours() / 2
|
else:
|
||||||
else :
|
# multi-day request: we take the planned hours
|
||||||
|
# of THAT specific day
|
||||||
total_leave_hours += self._get_total_planned_hours()
|
total_leave_hours += self._get_total_planned_hours()
|
||||||
return total_leave_hours
|
return total_leave_hours
|
||||||
|
|
||||||
|
|||||||
@@ -41,6 +41,13 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
|
|||||||
self.employee.resource_calendar_id = self.base_calendar
|
self.employee.resource_calendar_id = self.base_calendar
|
||||||
self.env.company.recovery_type_id = self.recovery_type
|
self.env.company.recovery_type_id = self.recovery_type
|
||||||
self.env.company.coef = 25
|
self.env.company.coef = 25
|
||||||
|
analytic_plan = self.env['account.analytic.plan'].create({
|
||||||
|
'name': 'Test Plan',
|
||||||
|
})
|
||||||
|
self.analytic_account = self.env['account.analytic.account'].create({
|
||||||
|
'name': 'Test Analytic Account',
|
||||||
|
'plan_id': analytic_plan.id,
|
||||||
|
})
|
||||||
|
|
||||||
def _create_timesheet_sheet(self, start_date):
|
def _create_timesheet_sheet(self, start_date):
|
||||||
# Create a timesheet for the week (Monday to Sunday)
|
# Create a timesheet for the week (Monday to Sunday)
|
||||||
@@ -57,7 +64,7 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
|
|||||||
'employee_id': self.employee.id,
|
'employee_id': self.employee.id,
|
||||||
'date': start_date + timedelta(days=i),
|
'date': start_date + timedelta(days=i),
|
||||||
'unit_amount': unit_amount,
|
'unit_amount': unit_amount,
|
||||||
'account_id': 1,
|
'account_id': self.analytic_account.id,
|
||||||
'name': 'Work Entry',
|
'name': 'Work Entry',
|
||||||
})
|
})
|
||||||
# Generate hr.employee.stats for each day of the period
|
# Generate hr.employee.stats for each day of the period
|
||||||
@@ -259,7 +266,6 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
|
|||||||
for stat in stats:
|
for stat in stats:
|
||||||
stat._compute_dayofweek()
|
stat._compute_dayofweek()
|
||||||
stat._compute_hours()
|
stat._compute_hours()
|
||||||
print("stat :", stat.date, stat.total_hours, stat.total_planned_hours, stat.gap_hours)
|
|
||||||
timesheet_sheet.action_generate_recovery_allocation()
|
timesheet_sheet.action_generate_recovery_allocation()
|
||||||
self.assertEqual(timesheet_sheet.timesheet_sheet_gap_hours, 0, "timesheet_sheet_gap_hours should be 0",)
|
self.assertEqual(timesheet_sheet.timesheet_sheet_gap_hours, 0, "timesheet_sheet_gap_hours should be 0",)
|
||||||
self.assertEqual(timesheet_sheet.timesheet_sheet_recovery_hours, 0, "timesheet_sheet_recovery_hours should be 0",)
|
self.assertEqual(timesheet_sheet.timesheet_sheet_recovery_hours, 0, "timesheet_sheet_recovery_hours should be 0",)
|
||||||
@@ -320,7 +326,6 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
|
|||||||
for stat in stats:
|
for stat in stats:
|
||||||
stat._compute_dayofweek()
|
stat._compute_dayofweek()
|
||||||
stat._compute_hours()
|
stat._compute_hours()
|
||||||
print("stat :", stat.date, stat.total_hours, stat.total_planned_hours, stat.gap_hours)
|
|
||||||
timesheet_sheet_1.action_generate_recovery_allocation()
|
timesheet_sheet_1.action_generate_recovery_allocation()
|
||||||
self.assertEqual(timesheet_sheet_1.timesheet_sheet_gap_hours, 5, "timesheet_sheet_gap_hours should be 0",)
|
self.assertEqual(timesheet_sheet_1.timesheet_sheet_gap_hours, 5, "timesheet_sheet_gap_hours should be 0",)
|
||||||
self.assertEqual(timesheet_sheet_1.timesheet_sheet_recovery_hours, 6.25, "timesheet_sheet_recovery_hours should be 6,25",)
|
self.assertEqual(timesheet_sheet_1.timesheet_sheet_recovery_hours, 6.25, "timesheet_sheet_recovery_hours should be 6,25",)
|
||||||
@@ -389,7 +394,184 @@ class TestHrEmployeeStatsRecovery(TransactionCase):
|
|||||||
self.assertEqual(recovery_allocation.number_of_days,1.25, "The recovery allocation should be 1,25 days")
|
self.assertEqual(recovery_allocation.number_of_days,1.25, "The recovery allocation should be 1,25 days")
|
||||||
|
|
||||||
|
|
||||||
|
@tagged("post_install", "-at_install")
|
||||||
|
class TestHrEmployeeStatsLeaveAndRecoveryUnit(TransactionCase):
|
||||||
|
"""Check that _get_total_recovery_hours() and _get_total_leave_hours()
|
||||||
|
work whatever the request_unit of the leave type
|
||||||
|
('hour', 'half_day' or 'day'), both for a single-day request and for a
|
||||||
|
multi-day request."""
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
super().setUp()
|
||||||
|
self.employee = self.env['hr.employee'].create({
|
||||||
|
'name': 'Dominique',
|
||||||
|
'tz': 'Europe/Paris',
|
||||||
|
})
|
||||||
|
# Full-time calendar: Monday to Friday, 9am-12pm and 1pm-5pm (7h/day).
|
||||||
|
# The calendar timezone must match the employee's so that hour-based
|
||||||
|
# requests fall exactly on the working hours.
|
||||||
|
self.base_calendar = self.env['resource.calendar'].create({
|
||||||
|
'name': 'Default Calendar',
|
||||||
|
'tz': 'Europe/Paris',
|
||||||
|
'attendance_ids': [
|
||||||
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
self.base_calendar.hours_per_day = 7
|
||||||
|
self.employee.resource_calendar_id = self.base_calendar
|
||||||
|
# hr.employee.calendar used by _get_total_planned_hours() (multi-day case)
|
||||||
|
self.env['hr.employee.calendar'].create({
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'date_start': Date.to_date("2025-01-01"),
|
||||||
|
'date_end': None,
|
||||||
|
'calendar_id': self.base_calendar.id,
|
||||||
|
})
|
||||||
|
# Company recovery type (used by _get_total_recovery_hours)
|
||||||
|
self.recovery_type = self.env['hr.leave.type'].create({
|
||||||
|
'name': 'Recovery',
|
||||||
|
'request_unit': 'hour',
|
||||||
|
'requires_allocation': 'no',
|
||||||
|
'allows_negative': True,
|
||||||
|
'leave_validation_type': 'no_validation',
|
||||||
|
})
|
||||||
|
self.env.company.recovery_type_id = self.recovery_type
|
||||||
|
# Monday and Tuesday with no public holiday over the period
|
||||||
|
self.monday = Date.to_date("2025-03-03")
|
||||||
|
self.tuesday = Date.to_date("2025-03-04")
|
||||||
|
|
||||||
|
# --- Helpers ------------------------------------------------------------
|
||||||
|
|
||||||
|
def _create_leave_type(self, request_unit):
|
||||||
|
return self.env['hr.leave.type'].create({
|
||||||
|
'name': 'Leave %s' % request_unit,
|
||||||
|
'request_unit': request_unit,
|
||||||
|
'requires_allocation': 'no',
|
||||||
|
'allows_negative': True,
|
||||||
|
'leave_validation_type': 'no_validation',
|
||||||
|
})
|
||||||
|
|
||||||
|
def _create_leave(self, leave_type, date_from, date_to, half=False,
|
||||||
|
period='am', hours=False, hour_from=None, hour_to=None):
|
||||||
|
vals = {
|
||||||
|
'name': 'Leave',
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'holiday_status_id': leave_type.id,
|
||||||
|
'request_date_from': date_from,
|
||||||
|
'request_date_to': date_to,
|
||||||
|
}
|
||||||
|
if half:
|
||||||
|
vals['request_unit_half'] = True
|
||||||
|
vals['request_date_from_period'] = period
|
||||||
|
if hours:
|
||||||
|
vals['request_unit_hours'] = True
|
||||||
|
vals['request_hour_from'] = hour_from
|
||||||
|
vals['request_hour_to'] = hour_to
|
||||||
|
leave = self.env['hr.leave'].create(vals)
|
||||||
|
leave._compute_date_from_to()
|
||||||
|
leave.action_validate()
|
||||||
|
return leave
|
||||||
|
|
||||||
|
def _create_stat(self, day):
|
||||||
|
stat = self.env['hr.employee.stats'].create({
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'date': day,
|
||||||
|
})
|
||||||
|
stat._compute_dayofweek()
|
||||||
|
stat._compute_hours()
|
||||||
|
return stat
|
||||||
|
|
||||||
|
# --- _get_total_recovery_hours -----------------------------------------
|
||||||
|
|
||||||
|
def test_recovery_hours_unit_day_single_day(self):
|
||||||
|
# 'day' type, a recovery taken on Monday only
|
||||||
|
self.recovery_type.request_unit = 'day'
|
||||||
|
self._create_leave(self.recovery_type, self.monday, self.monday)
|
||||||
|
stat = self._create_stat(self.monday)
|
||||||
|
# single-day request: Odoo already computed 7h from the calendar
|
||||||
|
self.assertEqual(stat.total_recovery_hours, 7, "total_recovery_hours should be 7")
|
||||||
|
|
||||||
|
def test_recovery_hours_unit_half_day(self):
|
||||||
|
# 'half_day' type, recovery taken on Monday morning (9am-12pm = 3h)
|
||||||
|
self.recovery_type.request_unit = 'half_day'
|
||||||
|
self._create_leave(self.recovery_type, self.monday, self.monday, half=True, period='am')
|
||||||
|
stat = self._create_stat(self.monday)
|
||||||
|
self.assertEqual(stat.total_recovery_hours, 3, "total_recovery_hours should be 3 (morning 9am-12pm)")
|
||||||
|
|
||||||
|
def test_recovery_hours_unit_hour(self):
|
||||||
|
# 'hour' type, recovery taken from 9am to 12pm (3h)
|
||||||
|
self.recovery_type.request_unit = 'hour'
|
||||||
|
self._create_leave(self.recovery_type, self.monday, self.monday, hours=True, hour_from='9', hour_to='12')
|
||||||
|
stat = self._create_stat(self.monday)
|
||||||
|
self.assertEqual(stat.total_recovery_hours, 3, "total_recovery_hours should be 3 (9am-12pm)")
|
||||||
|
|
||||||
|
def test_recovery_hours_unit_day_several_days(self):
|
||||||
|
# 'day' type, recovery taken on Monday AND Tuesday: for each day we
|
||||||
|
# fall back to the planned hours of THAT specific day (7h)
|
||||||
|
self.recovery_type.request_unit = 'day'
|
||||||
|
self._create_leave(self.recovery_type, self.monday, self.tuesday)
|
||||||
|
monday_stat = self._create_stat(self.monday)
|
||||||
|
tuesday_stat = self._create_stat(self.tuesday)
|
||||||
|
self.assertEqual(monday_stat.total_recovery_hours, 7, "total_recovery_hours should be 7 on monday")
|
||||||
|
self.assertEqual(tuesday_stat.total_recovery_hours, 7, "total_recovery_hours should be 7 on tuesday")
|
||||||
|
|
||||||
|
# --- _get_total_leave_hours --------------------------------------------
|
||||||
|
|
||||||
|
def test_leave_hours_unit_day_single_day(self):
|
||||||
|
leave_type = self._create_leave_type('day')
|
||||||
|
self._create_leave(leave_type, self.monday, self.monday)
|
||||||
|
stat = self._create_stat(self.monday)
|
||||||
|
self.assertEqual(stat.total_leave_hours, 7, "total_leave_hours should be 7")
|
||||||
|
|
||||||
|
def test_leave_hours_unit_half_day(self):
|
||||||
|
leave_type = self._create_leave_type('half_day')
|
||||||
|
self._create_leave(leave_type, self.monday, self.monday, half=True, period='am')
|
||||||
|
stat = self._create_stat(self.monday)
|
||||||
|
self.assertEqual(stat.total_leave_hours, 3, "total_leave_hours should be 3 (morning 9am-12pm)")
|
||||||
|
|
||||||
|
def test_leave_hours_unit_hour(self):
|
||||||
|
leave_type = self._create_leave_type('hour')
|
||||||
|
self._create_leave(leave_type, self.monday, self.monday, hours=True, hour_from='9', hour_to='12')
|
||||||
|
stat = self._create_stat(self.monday)
|
||||||
|
self.assertEqual(stat.total_leave_hours, 3, "total_leave_hours should be 3 (9am-12pm)")
|
||||||
|
|
||||||
|
def test_leave_hours_unit_day_several_days(self):
|
||||||
|
leave_type = self._create_leave_type('day')
|
||||||
|
self._create_leave(leave_type, self.monday, self.tuesday)
|
||||||
|
monday_stat = self._create_stat(self.monday)
|
||||||
|
tuesday_stat = self._create_stat(self.tuesday)
|
||||||
|
self.assertEqual(monday_stat.total_leave_hours, 7, "total_leave_hours should be 7 on monday")
|
||||||
|
self.assertEqual(tuesday_stat.total_leave_hours, 7, "total_leave_hours should be 7 on tuesday")
|
||||||
|
|
||||||
|
def test_leave_hours_ignore_non_validated_leave(self):
|
||||||
|
# _get_total_leave_hours only counts validated and active leaves
|
||||||
|
leave_type = self._create_leave_type('day')
|
||||||
|
leave = self.env['hr.leave'].create({
|
||||||
|
'name': 'Draft leave',
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'holiday_status_id': leave_type.id,
|
||||||
|
'request_date_from': self.monday,
|
||||||
|
'request_date_to': self.monday,
|
||||||
|
})
|
||||||
|
leave._compute_date_from_to() # left unvalidated
|
||||||
|
stat = self._create_stat(self.monday)
|
||||||
|
self.assertEqual(stat.total_leave_hours, 0, "an unvalidated leave must not be counted")
|
||||||
|
|
||||||
|
def test_leave_hours_excludes_recovery_type(self):
|
||||||
|
# a "recovery" type leave must not be counted as a regular leave
|
||||||
|
self.recovery_type.request_unit = 'day'
|
||||||
|
self._create_leave(self.recovery_type, self.monday, self.monday)
|
||||||
|
stat = self._create_stat(self.monday)
|
||||||
|
self.assertEqual(stat.total_leave_hours, 0, "recovery must not count as a leave")
|
||||||
|
self.assertEqual(stat.total_recovery_hours, 7, "it must count as a recovery")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "hr_negative_leave",
|
"name": "hr_negative_leave",
|
||||||
"version": "16.0.3.0.0",
|
"version": "16.0.3.0.1",
|
||||||
"author": "Elabore",
|
"author": "Elabore",
|
||||||
"website": "https://elabore.coop",
|
"website": "https://elabore.coop",
|
||||||
"maintainer": "Elabore",
|
"maintainer": "Elabore",
|
||||||
|
|||||||
@@ -5,16 +5,25 @@
|
|||||||
<field name="inherit_id" ref="hr_holidays.hr_leave_view_form" />
|
<field name="inherit_id" ref="hr_holidays.hr_leave_view_form" />
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<xpath expr="//field[@name='holiday_status_id']" position="attributes">
|
<xpath expr="//field[@name='holiday_status_id']" position="attributes">
|
||||||
|
<!-- Pseudo-code for the domain:
|
||||||
|
if requires_allocation == 'no':
|
||||||
|
ok
|
||||||
|
elif has_valid_allocation and virtual_remaining_leaves > 0 and max_leaves > 0:
|
||||||
|
ok
|
||||||
|
elif allows_negative == True:
|
||||||
|
ok
|
||||||
|
else:
|
||||||
|
refuse
|
||||||
|
-->
|
||||||
<attribute name="domain">[
|
<attribute name="domain">[
|
||||||
'|',
|
'|', '|',
|
||||||
('requires_allocation', '=', 'no'),
|
('requires_allocation', '=', 'no'),
|
||||||
'&',
|
'&',
|
||||||
('has_valid_allocation', '=', True),
|
('has_valid_allocation', '=', True),
|
||||||
'|',
|
|
||||||
('allows_negative', '=', True),
|
|
||||||
'&',
|
'&',
|
||||||
('virtual_remaining_leaves', '>', 0),
|
('virtual_remaining_leaves', '>', 0),
|
||||||
('allows_negative', '=', False),
|
('max_leaves', '>', 0),
|
||||||
|
('allows_negative', '=', True)
|
||||||
]</attribute>
|
]</attribute>
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ Credits
|
|||||||
Contributors
|
Contributors
|
||||||
------------
|
------------
|
||||||
|
|
||||||
* `Elabore <mailto:contacnt@elabore.coop>`
|
* `Elabore <mailto:contact@elabore.coop>`
|
||||||
|
|
||||||
Funders
|
Funders
|
||||||
-------
|
-------
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "France - Time Off",
|
"name": "France - Time Off",
|
||||||
"version": "16.0.1.0.1",
|
"version": "16.0.1.1.0",
|
||||||
"category": "Human Resources/Time Off",
|
"category": "Human Resources/Time Off",
|
||||||
"countries": ["fr"],
|
"countries": ["fr"],
|
||||||
"summary": "Management of leaves for part-time workers in France",
|
"summary": "Management of leaves for part-time workers in France",
|
||||||
|
|||||||
@@ -175,9 +175,14 @@ class HrLeave(models.Model):
|
|||||||
#@overwrite
|
#@overwrite
|
||||||
def _get_number_of_days_batch(self, date_from, date_to, employee_ids):
|
def _get_number_of_days_batch(self, date_from, date_to, employee_ids):
|
||||||
"""
|
"""
|
||||||
Returns a dict with the number of legal leave days for each employee,
|
Returns a dict with the number of legal leave days for each employee.
|
||||||
based on the company's calendar. In France, part-time employees accrue and take leave on company working days,
|
In France, part-time employees' leave is counted in company working days
|
||||||
not only on their own working days. Handles half-day requests and rounds according to French rules.
|
(jours ouvrables) from the first day of absence to the return day
|
||||||
|
(exclusive). The absence period is determined by the employee's calendar,
|
||||||
|
but the day count uses the company's calendar. Public holidays and other
|
||||||
|
global leaves registered on the company calendar are excluded.
|
||||||
|
For half-day requests, the first day counts as 0.5 if the employee
|
||||||
|
works the other half of that day (returns same day), or 1 otherwise.
|
||||||
"""
|
"""
|
||||||
employee = self.env['hr.employee'].browse(employee_ids)
|
employee = self.env['hr.employee'].browse(employee_ids)
|
||||||
# Force the company in the domain, as we are likely in a compute_sudo context
|
# Force the company in the domain, as we are likely in a compute_sudo context
|
||||||
@@ -188,12 +193,55 @@ class HrLeave(models.Model):
|
|||||||
calendar = self._get_calendar()
|
calendar = self._get_calendar()
|
||||||
result = employee._get_work_days_data_batch(date_from, date_to, calendar=calendar, domain=domain)
|
result = employee._get_work_days_data_batch(date_from, date_to, calendar=calendar, domain=domain)
|
||||||
for employee_id in result:
|
for employee_id in result:
|
||||||
# For non-French context: a half-day leave always counts as 0.5 day
|
if self._l10n_fr_leave_applies():
|
||||||
if self.request_unit_half and result[employee_id]['hours'] > 0 and not self._l10n_fr_leave_applies():
|
company_calendar = calendar
|
||||||
|
employee_calendar = self.resource_calendar_id
|
||||||
|
first_day = date_from.date()
|
||||||
|
last_date = date_to.date()
|
||||||
|
|
||||||
|
# _get_fr_date_from_to returns date_to with different semantics:
|
||||||
|
# - AM half-day, employee doesn't work PM: date_to = return day
|
||||||
|
# (must be excluded from the count)
|
||||||
|
# - AM half-day, employee works PM: date_to = same day (leave day)
|
||||||
|
# - General case (full-day, PM half-day): date_to = last leave day
|
||||||
|
# (day before the return, must be included)
|
||||||
|
# Only the first case has date_to as the return day. It is
|
||||||
|
# detected by: AM half-day, date_to strictly after date_from.
|
||||||
|
if (self.request_unit_half and self.request_date_from_period == 'am'
|
||||||
|
and last_date > first_day):
|
||||||
|
last_date -= relativedelta(days=1)
|
||||||
|
|
||||||
|
# Get the set of dates where the company actually works between
|
||||||
|
# first_day and last_date, excluding public holidays (global leaves).
|
||||||
|
# Don't pass the company_id-filtered domain here: the leave is
|
||||||
|
# already matched by calendar_id in _leave_intervals_batch, and
|
||||||
|
# the company_id filter would exclude holidays created on the
|
||||||
|
# french company when self.env.company is the main company.
|
||||||
|
working_dates = company_calendar._get_working_dates(first_day, last_date)
|
||||||
|
|
||||||
|
if self.request_unit_half:
|
||||||
|
# Check if the employee works the other half of the first day
|
||||||
|
dayofweek = str(first_day.weekday())
|
||||||
|
other_period = 'afternoon' if self.request_date_from_period == 'am' else 'morning'
|
||||||
|
other_half = employee_calendar.attendance_ids.filtered(
|
||||||
|
lambda a: a.dayofweek == dayofweek and a.day_period == other_period
|
||||||
|
)
|
||||||
|
first_day_count = 0.5 if (other_half and first_day in working_dates) else (1.0 if first_day in working_dates else 0.0)
|
||||||
|
days_count = first_day_count
|
||||||
|
current_date = first_day + relativedelta(days=1)
|
||||||
|
else:
|
||||||
|
days_count = 0
|
||||||
|
current_date = first_day
|
||||||
|
|
||||||
|
while current_date <= last_date:
|
||||||
|
if current_date in working_dates:
|
||||||
|
days_count += 1
|
||||||
|
current_date += relativedelta(days=1)
|
||||||
|
|
||||||
|
result[employee_id]['days'] = float(days_count)
|
||||||
|
elif self.request_unit_half and result[employee_id]['hours'] > 0:
|
||||||
|
# Non-French context: a half-day leave always counts as 0.5 day
|
||||||
result[employee_id]['days'] = 0.5
|
result[employee_id]['days'] = 0.5
|
||||||
# For French context: round the number of days to the nearest half-day (legal rule)
|
|
||||||
elif self.request_unit_half and result[employee_id]['hours'] > 0 and self._l10n_fr_leave_applies():
|
|
||||||
result[employee_id]['days'] = self._round_to_nearest_half(result[employee_id]['days'])
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def _round_to_nearest_half(self, x):
|
def _round_to_nearest_half(self, x):
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
# -*- coding:utf-8 -*-
|
# -*- coding:utf-8 -*-
|
||||||
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
||||||
|
|
||||||
from odoo import models
|
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
|
from datetime import datetime, time
|
||||||
|
|
||||||
|
from odoo import models
|
||||||
|
|
||||||
|
|
||||||
class ResourceCalendar(models.Model):
|
class ResourceCalendar(models.Model):
|
||||||
_inherit = 'resource.calendar'
|
_inherit = 'resource.calendar'
|
||||||
@@ -24,3 +27,16 @@ class ResourceCalendar(models.Model):
|
|||||||
for attendance in self.attendance_ids:
|
for attendance in self.attendance_ids:
|
||||||
working_days[attendance.week_type][attendance.dayofweek] = True
|
working_days[attendance.week_type][attendance.dayofweek] = True
|
||||||
return working_days
|
return working_days
|
||||||
|
|
||||||
|
def _get_working_dates(self, from_date, to_date, domain=None):
|
||||||
|
"""Return a set of dates where the company actually works between
|
||||||
|
from_date and to_date (inclusive), excluding public holidays
|
||||||
|
and other global leaves registered on the calendar.
|
||||||
|
"""
|
||||||
|
self.ensure_one()
|
||||||
|
from pytz import timezone
|
||||||
|
tz = timezone(self.tz or 'UTC')
|
||||||
|
from_dt = tz.localize(datetime.combine(from_date, time.min))
|
||||||
|
to_dt = tz.localize(datetime.combine(to_date, time(23, 59, 59)))
|
||||||
|
intervals = self._work_intervals_batch(from_dt, to_dt, domain=domain)[False]
|
||||||
|
return {start.astimezone(tz).date() for start, stop, meta in intervals}
|
||||||
|
|||||||
@@ -15,7 +15,13 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
'country_id': country_fr.id,
|
'country_id': country_fr.id,
|
||||||
})
|
})
|
||||||
|
|
||||||
cls.employee = cls.env['hr.employee'].create({
|
cls.base_calendar = cls.env['resource.calendar'].create({
|
||||||
|
'name': 'default calendar',
|
||||||
|
'company_id': cls.company.id,
|
||||||
|
})
|
||||||
|
cls.company.resource_calendar_id = cls.base_calendar
|
||||||
|
|
||||||
|
cls.employee = cls.env['hr.employee'].with_company(cls.company).create({
|
||||||
'name': 'Camille',
|
'name': 'Camille',
|
||||||
'gender': 'other',
|
'gender': 'other',
|
||||||
'birthday': '1973-03-29',
|
'birthday': '1973-03-29',
|
||||||
@@ -32,14 +38,29 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
'l10n_fr_reference_leave_type': cls.time_off_type.id,
|
'l10n_fr_reference_leave_type': cls.time_off_type.id,
|
||||||
})
|
})
|
||||||
|
|
||||||
cls.base_calendar = cls.env['resource.calendar'].create({
|
def _set_employee_calendar(self, calendar):
|
||||||
'name': 'default calendar',
|
"""Set employee resource calendar and update hr.employee.calendar
|
||||||
|
planning record if hr_employee_calendar_planning is installed.
|
||||||
|
The planning module overrides resource_calendar_id on hr.leave via
|
||||||
|
_compute_resource_calendar_id, so we must keep the planning record
|
||||||
|
in sync with the test's intended employee calendar.
|
||||||
|
"""
|
||||||
|
self.employee.resource_calendar_id = calendar
|
||||||
|
if 'hr.employee.calendar' in self.env:
|
||||||
|
planning = self.env['hr.employee.calendar'].search(
|
||||||
|
[('employee_id', '=', self.employee.id)], limit=1)
|
||||||
|
if planning:
|
||||||
|
planning.calendar_id = calendar
|
||||||
|
else:
|
||||||
|
self.env['hr.employee.calendar'].create({
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'calendar_id': calendar.id,
|
||||||
})
|
})
|
||||||
|
|
||||||
def test_no_differences(self):
|
def test_no_differences(self):
|
||||||
# Base case that should not have a different behaviour
|
# Base case that should not have a different behaviour
|
||||||
self.company.resource_calendar_id = self.base_calendar
|
self.company.resource_calendar_id = self.base_calendar
|
||||||
self.employee.resource_calendar_id = self.base_calendar
|
self._set_employee_calendar(self.base_calendar)
|
||||||
|
|
||||||
leave = self.env['hr.leave'].create({
|
leave = self.env['hr.leave'].create({
|
||||||
'name': 'Test',
|
'name': 'Test',
|
||||||
@@ -57,6 +78,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
def test_end_of_week(self):
|
def test_end_of_week(self):
|
||||||
employee_calendar = self.env['resource.calendar'].create({
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
'name': 'Employee Calendar',
|
'name': 'Employee Calendar',
|
||||||
|
'company_id': self.company.id,
|
||||||
'attendance_ids': [
|
'attendance_ids': [
|
||||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
@@ -67,7 +89,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
self.company.resource_calendar_id = self.base_calendar
|
self.company.resource_calendar_id = self.base_calendar
|
||||||
self.employee.resource_calendar_id = employee_calendar
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
|
||||||
leave = self.env['hr.leave'].create({
|
leave = self.env['hr.leave'].create({
|
||||||
'name': 'Test',
|
'name': 'Test',
|
||||||
@@ -85,6 +107,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
def test_start_of_week(self):
|
def test_start_of_week(self):
|
||||||
employee_calendar = self.env['resource.calendar'].create({
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
'name': 'Employee Calendar',
|
'name': 'Employee Calendar',
|
||||||
|
'company_id': self.company.id,
|
||||||
'attendance_ids': [
|
'attendance_ids': [
|
||||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
@@ -95,7 +118,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
self.company.resource_calendar_id = self.base_calendar
|
self.company.resource_calendar_id = self.base_calendar
|
||||||
self.employee.resource_calendar_id = employee_calendar
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
|
||||||
leave = self.env['hr.leave'].create({
|
leave = self.env['hr.leave'].create({
|
||||||
'name': 'Test',
|
'name': 'Test',
|
||||||
@@ -114,6 +137,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
def test_last_day_half(self):
|
def test_last_day_half(self):
|
||||||
employee_calendar = self.env['resource.calendar'].create({
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
'name': 'Employee Calendar',
|
'name': 'Employee Calendar',
|
||||||
|
'company_id': self.company.id,
|
||||||
'attendance_ids': [
|
'attendance_ids': [
|
||||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
@@ -124,7 +148,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
self.company.resource_calendar_id = self.base_calendar
|
self.company.resource_calendar_id = self.base_calendar
|
||||||
self.employee.resource_calendar_id = employee_calendar
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
|
||||||
leave = self.env['hr.leave'].create({
|
leave = self.env['hr.leave'].create({
|
||||||
'name': 'Test',
|
'name': 'Test',
|
||||||
@@ -150,6 +174,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
def test_full_time_am_day_half(self):
|
def test_full_time_am_day_half(self):
|
||||||
employee_calendar = self.env['resource.calendar'].create({
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
'name': 'Employee Calendar',
|
'name': 'Employee Calendar',
|
||||||
|
'company_id': self.company.id,
|
||||||
'attendance_ids': [
|
'attendance_ids': [
|
||||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
@@ -163,7 +188,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
self.company.resource_calendar_id = self.base_calendar
|
self.company.resource_calendar_id = self.base_calendar
|
||||||
self.employee.resource_calendar_id = employee_calendar
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
|
||||||
leave = self.env['hr.leave'].create({
|
leave = self.env['hr.leave'].create({
|
||||||
'name': 'Test',
|
'name': 'Test',
|
||||||
@@ -184,6 +209,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
def test_am_day_half(self):
|
def test_am_day_half(self):
|
||||||
employee_calendar = self.env['resource.calendar'].create({
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
'name': 'Employee Calendar',
|
'name': 'Employee Calendar',
|
||||||
|
'company_id': self.company.id,
|
||||||
'attendance_ids': [
|
'attendance_ids': [
|
||||||
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
@@ -193,7 +219,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
self.company.resource_calendar_id = self.base_calendar
|
self.company.resource_calendar_id = self.base_calendar
|
||||||
self.employee.resource_calendar_id = employee_calendar
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
|
||||||
leave = self.env['hr.leave'].create({
|
leave = self.env['hr.leave'].create({
|
||||||
'name': 'Test',
|
'name': 'Test',
|
||||||
@@ -214,6 +240,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
def test_calendar_with_holes(self):
|
def test_calendar_with_holes(self):
|
||||||
employee_calendar = self.env['resource.calendar'].create({
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
'name': 'Employee Calendar',
|
'name': 'Employee Calendar',
|
||||||
|
'company_id': self.company.id,
|
||||||
'attendance_ids': [
|
'attendance_ids': [
|
||||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
@@ -224,7 +251,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
self.company.resource_calendar_id = self.base_calendar
|
self.company.resource_calendar_id = self.base_calendar
|
||||||
self.employee.resource_calendar_id = employee_calendar
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
|
||||||
leave = self.env['hr.leave'].create({
|
leave = self.env['hr.leave'].create({
|
||||||
'name': 'Test',
|
'name': 'Test',
|
||||||
@@ -242,6 +269,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
def test_calendar_end_week_hole(self):
|
def test_calendar_end_week_hole(self):
|
||||||
employee_calendar = self.env['resource.calendar'].create({
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
'name': 'Employee Calendar',
|
'name': 'Employee Calendar',
|
||||||
|
'company_id': self.company.id,
|
||||||
'attendance_ids': [
|
'attendance_ids': [
|
||||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
@@ -250,7 +278,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
self.company.resource_calendar_id = self.base_calendar
|
self.company.resource_calendar_id = self.base_calendar
|
||||||
self.employee.resource_calendar_id = employee_calendar
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
|
||||||
leave = self.env['hr.leave'].create({
|
leave = self.env['hr.leave'].create({
|
||||||
'name': 'Test',
|
'name': 'Test',
|
||||||
@@ -268,6 +296,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
def test_2_weeks_calendar(self):
|
def test_2_weeks_calendar(self):
|
||||||
company_calendar = self.env['resource.calendar'].create({
|
company_calendar = self.env['resource.calendar'].create({
|
||||||
'name': 'Company Calendar',
|
'name': 'Company Calendar',
|
||||||
|
'company_id': self.company.id,
|
||||||
'two_weeks_calendar': True,
|
'two_weeks_calendar': True,
|
||||||
'attendance_ids': [
|
'attendance_ids': [
|
||||||
(0, 0, {'week_type': '0', 'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
(0, 0, {'week_type': '0', 'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
@@ -291,6 +320,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
})
|
})
|
||||||
employee_calendar = self.env['resource.calendar'].create({
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
'name': 'Employee Calendar',
|
'name': 'Employee Calendar',
|
||||||
|
'company_id': self.company.id,
|
||||||
'attendance_ids': [
|
'attendance_ids': [
|
||||||
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
@@ -301,7 +331,7 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
self.company.resource_calendar_id = company_calendar
|
self.company.resource_calendar_id = company_calendar
|
||||||
self.employee.resource_calendar_id = employee_calendar
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
|
||||||
# Week type 0
|
# Week type 0
|
||||||
leave = self.env['hr.leave'].create({
|
leave = self.env['hr.leave'].create({
|
||||||
@@ -351,9 +381,241 @@ class TestFrenchLeaves(TransactionCase):
|
|||||||
'employee_id': self.employee.id,
|
'employee_id': self.employee.id,
|
||||||
'request_date_from': '2021-09-13',
|
'request_date_from': '2021-09-13',
|
||||||
'request_date_to': '2021-09-22',
|
'request_date_to': '2021-09-22',
|
||||||
'company_id': self.company.id,
|
'employee_company_id': self.company.id,
|
||||||
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||||
})
|
})
|
||||||
leave._compute_date_from_to()
|
leave._compute_date_from_to()
|
||||||
self.assertEqual(leave.number_of_days, 8, 'The number of days should be equal to 3.')
|
self.assertEqual(leave.number_of_days, 8, 'The number of days should be equal to 3.')
|
||||||
leave.unlink()
|
leave.unlink()
|
||||||
|
|
||||||
|
def test_part_time_different_hours(self):
|
||||||
|
# Regression test: when the employee's working hours differ from the
|
||||||
|
# company's on the boundary day, the hourly-ratio computation used to
|
||||||
|
# return a fractional number of days (e.g. 12.86 instead of 13).
|
||||||
|
# French legal rule: paid leaves are counted in company working days
|
||||||
|
# (jours ouvrables) as full days.
|
||||||
|
# Company works 6 days/week (Mon-Sat), 9-12 + 13-17 = 7h/day.
|
||||||
|
company_calendar = self.env['resource.calendar'].create({
|
||||||
|
'name': 'Company Calendar 6d/week',
|
||||||
|
'company_id': self.company.id,
|
||||||
|
'attendance_ids': [
|
||||||
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Saturday Morning', 'dayofweek': '5', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Saturday Afternoon', 'dayofweek': '5', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
# Employee works Mon, Tue, Thu (part-time), 8-12 + 13-16 = 7h/day but
|
||||||
|
# with shifted hours vs the company, so the boundary day is fractional
|
||||||
|
# under the old hourly-ratio computation.
|
||||||
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
|
'name': 'Employee Calendar Part Time',
|
||||||
|
'company_id': self.company.id,
|
||||||
|
'attendance_ids': [
|
||||||
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
self.company.resource_calendar_id = company_calendar
|
||||||
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
self.employee.tz = 'Europe/Paris'
|
||||||
|
|
||||||
|
# Leave from 12/01/2026 (Monday) to 26/01/2026 (Monday) inclusive.
|
||||||
|
# Period: 15 calendar days, 2 Sundays -> 13 company working days.
|
||||||
|
# Dates must be in the past: default_get sets date_to to today if
|
||||||
|
# request_date_to is not in defaults, and the SQL constraint
|
||||||
|
# CHECK(date_from <= date_to) fails if date_from > today during
|
||||||
|
# the intermediate flush in _compute_date_from_to.
|
||||||
|
leave = self.env['hr.leave'].create({
|
||||||
|
'name': 'Test part-time bug',
|
||||||
|
'holiday_status_id': self.time_off_type.id,
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'request_date_from': '2026-01-12',
|
||||||
|
'request_date_to': '2026-01-26',
|
||||||
|
'employee_company_id': self.company.id,
|
||||||
|
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||||
|
})
|
||||||
|
leave._compute_date_from_to()
|
||||||
|
self.assertEqual(leave.number_of_days, 13.0,
|
||||||
|
'The number of days should be 13 (jours ouvrables), not 12.86.')
|
||||||
|
leave.unlink()
|
||||||
|
|
||||||
|
def test_part_time_half_day_different_hours(self):
|
||||||
|
# Regression test for French part-time half-day leave counting.
|
||||||
|
# Employee works: Mon, Tue, Wed(AM only), Thu, Fri(AM only).
|
||||||
|
# Company works 6 days/week (Mon-Sat), 9-17h.
|
||||||
|
# French rule: count company working days (jours ouvrables) from
|
||||||
|
# first day of absence to return day (exclusive).
|
||||||
|
company_calendar = self.env['resource.calendar'].create({
|
||||||
|
'name': 'Company Calendar 6d/week',
|
||||||
|
'company_id': self.company.id,
|
||||||
|
'attendance_ids': [
|
||||||
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Saturday Morning', 'dayofweek': '5', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Saturday Afternoon', 'dayofweek': '5', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
|
'name': 'Employee Calendar Part Time',
|
||||||
|
'company_id': self.company.id,
|
||||||
|
'attendance_ids': [
|
||||||
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
self.company.resource_calendar_id = company_calendar
|
||||||
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
self.employee.tz = 'Europe/Paris'
|
||||||
|
|
||||||
|
# Case 1: Wednesday AM half-day.
|
||||||
|
# Employee doesn't work Wed PM -> return = Thu.
|
||||||
|
# Company working days from Wed to Thu (exclusive) = Wed = 1 day.
|
||||||
|
leave = self.env['hr.leave'].create({
|
||||||
|
'name': 'Test Wed AM',
|
||||||
|
'holiday_status_id': self.time_off_type.id,
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'request_date_from': '2021-09-08',
|
||||||
|
'request_date_to': '2021-09-08',
|
||||||
|
'request_unit_half': True,
|
||||||
|
'request_date_from_period': 'am',
|
||||||
|
'employee_company_id': self.company.id,
|
||||||
|
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||||
|
})
|
||||||
|
leave._compute_date_from_to()
|
||||||
|
self.assertEqual(leave.number_of_days, 1.0,
|
||||||
|
'Wed AM half-day should count as 1 jour ouvrable.')
|
||||||
|
leave.unlink()
|
||||||
|
|
||||||
|
# Case 2: Thursday + Friday full days.
|
||||||
|
# Return = Monday. Company working days: Thu, Fri, Sat = 3 days.
|
||||||
|
leave = self.env['hr.leave'].create({
|
||||||
|
'name': 'Test Thu+Fri',
|
||||||
|
'holiday_status_id': self.time_off_type.id,
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'request_date_from': '2021-09-09',
|
||||||
|
'request_date_to': '2021-09-10',
|
||||||
|
'employee_company_id': self.company.id,
|
||||||
|
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||||
|
})
|
||||||
|
leave._compute_date_from_to()
|
||||||
|
self.assertEqual(leave.number_of_days, 3.0,
|
||||||
|
'Thu+Fri full days should count as 3 jours ouvrables (Thu, Fri, Sat).')
|
||||||
|
leave.unlink()
|
||||||
|
|
||||||
|
# Case 3: Friday AM half-day.
|
||||||
|
# Employee doesn't work Fri PM -> return = Monday.
|
||||||
|
# Company working days from Fri to Mon (exclusive) = Fri, Sat = 2 days.
|
||||||
|
leave = self.env['hr.leave'].create({
|
||||||
|
'name': 'Test Fri AM',
|
||||||
|
'holiday_status_id': self.time_off_type.id,
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'request_date_from': '2021-09-10',
|
||||||
|
'request_date_to': '2021-09-10',
|
||||||
|
'request_unit_half': True,
|
||||||
|
'request_date_from_period': 'am',
|
||||||
|
'employee_company_id': self.company.id,
|
||||||
|
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||||
|
})
|
||||||
|
leave._compute_date_from_to()
|
||||||
|
self.assertEqual(leave.number_of_days, 2.0,
|
||||||
|
'Fri AM half-day should count as 2 jours ouvrables (Fri, Sat).')
|
||||||
|
leave.unlink()
|
||||||
|
|
||||||
|
def test_public_holiday_exclusion(self):
|
||||||
|
# Regression test: public holidays (global leaves on the company
|
||||||
|
# calendar) must be excluded from the jours ouvrables count.
|
||||||
|
# Company works 6 days/week (Mon-Sat). Public holiday on 14/07/2020.
|
||||||
|
# Leave 13/07/2020 (Mon) -> 19/07/2020 (Sun).
|
||||||
|
# Company working days without holiday: 13, 14, 15, 16, 17, 18 = 6
|
||||||
|
# With 14/07 being a public holiday: 13, 15, 16, 17, 18 = 5
|
||||||
|
company_calendar = self.env['resource.calendar'].create({
|
||||||
|
'name': 'Company Calendar 6d/week',
|
||||||
|
'company_id': self.company.id,
|
||||||
|
'tz': 'Europe/Paris',
|
||||||
|
'attendance_ids': [
|
||||||
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Wednesday Morning', 'dayofweek': '2', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Wednesday Afternoon', 'dayofweek': '2', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Saturday Morning', 'dayofweek': '5', 'hour_from': 9, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Saturday Afternoon', 'dayofweek': '5', 'hour_from': 13, 'hour_to': 17, 'day_period': 'afternoon'}),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
employee_calendar = self.env['resource.calendar'].create({
|
||||||
|
'name': 'Employee Calendar Part Time',
|
||||||
|
'company_id': self.company.id,
|
||||||
|
'tz': 'Europe/Paris',
|
||||||
|
'attendance_ids': [
|
||||||
|
(0, 0, {'name': 'Monday Morning', 'dayofweek': '0', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Monday Afternoon', 'dayofweek': '0', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Morning', 'dayofweek': '1', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Tuesday Afternoon', 'dayofweek': '1', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Thursday Morning', 'dayofweek': '3', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Thursday Afternoon', 'dayofweek': '3', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
(0, 0, {'name': 'Friday Morning', 'dayofweek': '4', 'hour_from': 8, 'hour_to': 12, 'day_period': 'morning'}),
|
||||||
|
(0, 0, {'name': 'Friday Afternoon', 'dayofweek': '4', 'hour_from': 13, 'hour_to': 16, 'day_period': 'afternoon'}),
|
||||||
|
],
|
||||||
|
})
|
||||||
|
self.company.resource_calendar_id = company_calendar
|
||||||
|
self._set_employee_calendar(employee_calendar)
|
||||||
|
self.employee.tz = 'Europe/Paris'
|
||||||
|
|
||||||
|
# Create a public holiday on 14/07/2020 (Tuesday) on the company calendar
|
||||||
|
self.env['resource.calendar.leaves'].create({
|
||||||
|
'name': 'Bastille Day',
|
||||||
|
'calendar_id': company_calendar.id,
|
||||||
|
'date_from': '2020-07-14 00:00:00',
|
||||||
|
'date_to': '2020-07-14 23:59:59',
|
||||||
|
})
|
||||||
|
|
||||||
|
# Leave from 13/07/2020 (Monday) to 19/07/2020 (Sunday).
|
||||||
|
# Employee works Mon, Tue, Thu, Fri. Leave covers Mon-Sun.
|
||||||
|
# Return = Monday 20/07. date_to extended to Sunday 19/07 (non-working).
|
||||||
|
# Company working days (Mon-Sat) excluding 14/07 holiday:
|
||||||
|
# 13(Mon), 15(Wed), 16(Thu), 17(Fri), 18(Sat) = 5 days
|
||||||
|
leave = self.env['hr.leave'].create({
|
||||||
|
'name': 'Test public holiday',
|
||||||
|
'holiday_status_id': self.time_off_type.id,
|
||||||
|
'employee_id': self.employee.id,
|
||||||
|
'request_date_from': '2020-07-13',
|
||||||
|
'request_date_to': '2020-07-19',
|
||||||
|
'employee_company_id': self.company.id,
|
||||||
|
'resource_calendar_id': self.employee.resource_calendar_id.id,
|
||||||
|
})
|
||||||
|
leave._compute_date_from_to()
|
||||||
|
self.assertEqual(leave.number_of_days, 5.0,
|
||||||
|
'The number of days should be 5 (14/07 excluded as public holiday).')
|
||||||
|
leave.unlink()
|
||||||
|
|||||||
Reference in New Issue
Block a user