use irrulecontext to control context of ir.rule

line: zugriff auf buchungen nur noch per berechtigungen

.gitignore

@@ -1,4 +1,4 @@
-syntax: glob
+*.pyc
 build/*
 dist/*
 mds_cashbook_report.egg-info/*

COPYRIGHT

@@ -0,0 +1,16 @@
+Copyright (C) 2015-2023 Cédric Krier.
+Copyright (C) 2015-2023 B2CK SPRL.
+Copyright (C) 2021-2024 martin-data services.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is 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.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  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.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  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 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. Use with the GNU Affero General Public License.
+
+  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 Affero 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 special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 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 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 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  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 GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

MANIFEST.in

@@ -0,0 +1,4 @@
+include LICENSE
+include COPYRIGHT
+include README.rst
+include versiondep.txt

README.rst

@@ -9,34 +9,27 @@ pip install mds-cashbook-report
 
 Requires
 ========
-- Tryton 6.0
+- Tryton 7.0
+
+Info
+====
+Module cashbook_report adds the following evaluations:
+- account balance as amount,
+- price difference according to stock exchange price as amount,
+- exchange rate difference in percent,
+- current value according to stock exchange price,
+- total yield
+
+The displayed data is selected according to cash books,
+types of cash books and cash books by category.
+The presentation can be done as pie, bar and line chart.
+For each evaluation, a dashboard view is also created,
+so that you can display several evaluations at the same time.
 
 Changes
 =======
 
-*6.0.5 - 06.02.2023*
+*7.0.0 - 06.12.2023*
 
-- fix: values on non-asset-cashbooks
+- compatibility to Tryton 7.0
 
-*6.0.4 - 05.02.2023*
-
-- add: investment to evaluation-types
-
-*6.0.3 - 08.11.2022*
-
-- add: cashbook-categories for evaluation
-- updt: optimized update of evaluation with existing dashboard-actions
-- updt: limit bookings in evaluation-result to today
-
-*6.0.2 - 05.11.2022*
-
-- evaluation-line: permissions optimized
-- evaluation: sorting by sequence
-
-*6.0.1 - 05.11.2022*
-
-- works
-
-*6.0.0 - 28.10.2022*
-
-- init

__init__.py

@@ -10,6 +10,7 @@ from .currency import Currency
 from .evaluation_context import EvaluationContext
 from .evaluation_wizard import OpenChartWizard
 from .investment import InvestmentEvaluation, InvestmentLine
+from .ir import Rule, IrActWindow
 
 
 def register():
@@ -18,6 +19,8 @@ def register():
         Evaluation,
         EvaluationLine,
         EvaluationContext,
+        Rule,
+        IrActWindow,
         module='cashbook_report', type_='model')
     Pool.register(
         OpenChartWizard,
@@ -25,4 +28,6 @@ def register():
     Pool.register(
         InvestmentEvaluation,
         InvestmentLine,
-        module='cashbook_report', type_='model', depends=['cashbook_investment'])
+        module='cashbook_report',
+        type_='model',
+        depends=['cashbook_investment'])

currency.py

@@ -13,8 +13,9 @@ from sql.conditionals import Case
 class Currency(metaclass=PoolMeta):
     __name__ = 'currency.currency'
 
-    cashbook_hasbookings = fields.Function(fields.Boolean(string='Has Bookings',
-        readonly=True), 'on_change_with_cashbook_hasbookings',
+    cashbook_hasbookings = fields.Function(fields.Boolean(
+        string='Has Bookings', readonly=True),
+        'on_change_with_cashbook_hasbookings',
         searcher='search_cashbook_hasbookings')
 
     @fields.depends('id')
@@ -24,11 +25,9 @@ class Currency(metaclass=PoolMeta):
         Lines = Pool().get('cashbook.line')
 
         with Transaction().set_context({
-            '_check_access': True,
-            }):
+                '_check_access': True}):
             if Lines.search_count([
-                ('cashbook.currency.id', '=', self.id),
-                ]) > 0:
+                    ('cashbook.currency.id', '=', self.id)]) > 0:
                 return True
         return False
 
@@ -45,18 +44,19 @@ class Currency(metaclass=PoolMeta):
         tab_line = Line.__table__()
         Operator = fields.SQL_OPERATORS[clause[1]]
 
-        query = tab_book.join(tab_line,
-                condition=tab_book.id==tab_line.cashbook,
-            ).join(tab_cur,
-                condition=tab_cur.id==tab_book.currency,
+        query = tab_book.join(
+                tab_line,
+                condition=tab_book.id == tab_line.cashbook,
+            ).join(
+                tab_cur,
+                condition=tab_cur.id == tab_book.currency,
             ).select(
                 tab_cur.id,
                 having=Operator(Case(
                         (Count(tab_line.id) > 0, True),
-                        else_ = False,
+                        else_=False,
                     ), clause[2]),
-                group_by=[tab_cur.id,],
-            )
+                group_by=[tab_cur.id])
         return [('id', 'in', query)]
 
 # end Currency

evaluation.py

@@ -3,14 +3,17 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
+from sql.conditionals import Case
 from trytond.model import ModelView, ModelSQL, fields, sequence_ordered
-from trytond.pyson import Eval
+from trytond.pyson import Eval, Bool
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 from trytond.i18n import gettext
+from trytond.exceptions import UserError
 from .colors import sel_color as sel_bgcolor
-from .templates import template_view_graph, template_view_line, \
-    cashbook_types, category_types
+from .templates import (
+    template_view_graph, template_view_line, cashbook_types,
+    category_types, booktype_types, currency_types)
 
 
 sel_chart = [
@@ -35,62 +38,121 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
     'Evaluation'
     __name__ = 'cashbook_report.evaluation'
 
-    company = fields.Many2One(string='Company', model_name='company.company',
+    company = fields.Many2One(
+        string='Company', model_name='company.company',
         required=True, ondelete="RESTRICT")
     name = fields.Char(string='Name', required=True)
-    dtype = fields.Selection(string='Data type', required=True,
-        sort=True, selection='get_sel_etype',
-        help='Type of data displayed')
-    dtype_string = dtype.translated('dtype')
-    chart = fields.Selection(string='Chart type', required=True,
-        sort=False, selection=sel_chart,
-        help='Type of graphical presentation.')
+
+    # max. 5x data tyypes to show
+    dtype1 = fields.Selection(
+        string='Data type 1', required=True, sort=True,
+        selection='get_sel_etype', help='Type of data displayed')
+    dtype1_string = dtype1.translated('dtype1')
+    dtype2 = fields.Selection(
+        string='Data type 2', sort=True,
+        selection='get_sel_etype2', help='Type of data displayed',
+        states={
+            'invisible': ~Bool(Eval('dtype1', '')),
+        }, depends=['dtype1'])
+    dtype2_string = dtype2.translated('dtype2')
+    dtype3 = fields.Selection(
+        string='Data type 3', sort=True,
+        selection='get_sel_etype2', help='Type of data displayed',
+        states={
+            'invisible': ~Bool(Eval('dtype2', '')),
+        }, depends=['dtype2'])
+    dtype3_string = dtype3.translated('dtype3')
+    dtype4 = fields.Selection(
+        string='Data type 4', sort=True,
+        selection='get_sel_etype2', help='Type of data displayed',
+        states={
+            'invisible': ~Bool(Eval('dtype3', '')),
+        }, depends=['dtype3'])
+    dtype4_string = dtype4.translated('dtype4')
+    dtype5 = fields.Selection(
+        string='Data type 5', sort=True,
+        selection='get_sel_etype2', help='Type of data displayed',
+        states={
+            'invisible': ~Bool(Eval('dtype4', '')),
+        }, depends=['dtype4'])
+    dtype5_string = dtype5.translated('dtype5')
+
+    chart = fields.Selection(
+        string='Chart type', required=True, sort=False,
+        selection=sel_chart, help='Type of graphical presentation.')
     legend = fields.Boolean(string='Legend')
-    maincolor = fields.Selection(string='Color scheme', required=True,
-        help='The color scheme determines the hue of all components of the chart.',
-        selection=sel_maincolor, sort=False)
-    bgcolor = fields.Selection(string='Background Color', required=True,
+    maincolor = fields.Selection(
+        string='Color scheme', required=True,
+        help='The color scheme determines the hue of all ' +
+        'components of the chart.', selection=sel_maincolor, sort=False)
+    bgcolor = fields.Selection(
+        string='Background Color', required=True,
         help='Background color of the chart area.', sort=False,
         selection=sel_bgcolor)
-    currency = fields.Many2One(string='Currency', ondelete='RESTRICT',
+    currency = fields.Many2One(
+        string='Currency', ondelete='RESTRICT',
         model_name='currency.currency')
 
-    cashbooks = fields.Many2Many(string='Cashbooks',
-        relation_name='cashbook_report.eval_line',
+    cashbooks = fields.Many2Many(
+        string='Cashbooks', relation_name='cashbook_report.eval_line',
         origin='evaluation', target='cashbook',
-        states={
-            'invisible': ~Eval('dtype', '').in_(cashbook_types),
-        }, depends=['dtype'])
-    types = fields.Many2Many(string='Types',
-        relation_name='cashbook_report.eval_line',
+        states={'invisible': ~Eval('dtype1', '').in_(cashbook_types)},
+        depends=['dtype1'])
+    types = fields.Many2Many(
+        string='Types', relation_name='cashbook_report.eval_line',
         origin='evaluation', target='dtype',
-        states={
-            'invisible': Eval('dtype', '') != 'types',
-        }, depends=['dtype'])
-    currencies = fields.Many2Many(string='Currencies',
-        relation_name='cashbook_report.eval_line',
+        states={'invisible': ~Eval('dtype1', '').in_(booktype_types)},
+        depends=['dtype1'])
+    currencies = fields.Many2Many(
+        string='Currencies', relation_name='cashbook_report.eval_line',
         origin='evaluation', target='currency',
         filter=[('cashbook_hasbookings', '=', True)],
-        states={
-            'invisible': Eval('dtype', '') != 'currencies',
-        }, depends=['dtype'])
-    categories = fields.Many2Many(string='Categories',
-        relation_name='cashbook_report.eval_line',
+        states={'invisible': Eval('dtype1', '') != 'currencies'},
+        depends=['dtype1'])
+    categories = fields.Many2Many(
+        string='Categories', relation_name='cashbook_report.eval_line',
         origin='evaluation', target='category',
-        states={
-            'invisible': ~Eval('dtype', '').in_(category_types),
-        }, depends=['dtype'])
+        states={'invisible': ~Eval('dtype1', '').in_(category_types)},
+        depends=['dtype1'])
 
-    line_values = fields.One2Many(string='Line Values',
-        field='evaluation', readonly=True,
+    line_values = fields.One2Many(
+        string='Line Values', field='evaluation', readonly=True,
         model_name='cashbook_report.eval_line')
 
-    ui_view_chart = fields.Many2One(string='UI View Chart',
-        model_name='ir.ui.view', ondelete='SET NULL')
-    dashb_actwin = fields.Many2One(string='Dashboard Window',
-        model_name='ir.action.act_window', ondelete='SET NULL')
-    dashb_actview = fields.Many2One(string='Dashboard View',
-        model_name='ir.action.act_window.view', ondelete='SET NULL')
+    ui_view_chart = fields.Many2One(
+        string='UI View Chart', model_name='ir.ui.view', ondelete='SET NULL')
+    dashb_actwin = fields.Many2One(
+        string='Dashboard Window', model_name='ir.action.act_window',
+        ondelete='SET NULL')
+    dashb_actview = fields.Many2One(
+        string='Dashboard View', model_name='ir.action.act_window.view',
+        ondelete='SET NULL')
+
+    @classmethod
+    def __register__(cls, module_name):
+        super(Evaluation, cls).__register__(module_name)
+
+        table = cls.__table_handler__(module_name)
+        tav_eval = cls.__table__()
+        cursor = Transaction().connection.cursor()
+
+        # x.0.9 --> x.0.10
+        if table.column_exist('dtype'):
+            query = tav_eval.update(
+                columns=[tav_eval.dtype1],
+                values=[Case(
+                    (tav_eval.dtype == 'category_gldiff',
+                        'categories_gldiff'),
+                    (tav_eval.dtype == 'category_glvalue',
+                        'categories_glvalue'),
+                    (tav_eval.dtype == 'category_glperc',
+                        'categories_glperc'),
+                    (tav_eval.dtype == 'category_glyield',
+                        'categories_glyield'),
+                    else_=tav_eval.dtype)
+                    ])
+            cursor.execute(*query)
+            table.drop_column('dtype')
 
     @classmethod
     def default_currency(cls):
@@ -127,11 +189,94 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
         return True
 
     @classmethod
-    def default_dtype(cls):
+    def default_dtype1(cls):
         """ default 'book'
         """
         return 'cashbooks'
 
+    @classmethod
+    def default_dtype2(cls):
+        """ default None
+        """
+        return None
+
+    @classmethod
+    def default_dtype3(cls):
+        """ default None
+        """
+        return None
+
+    @classmethod
+    def default_dtype4(cls):
+        """ default None
+        """
+        return None
+
+    @classmethod
+    def default_dtype5(cls):
+        """ default None
+        """
+        return None
+
+    @fields.depends('dtype1', 'dtype2', 'dtype3', 'dtype4', 'dtype5')
+    def on_change_dtype1(self):
+        """ update other dtype-fields
+        """
+        self.get_onchange_dtypes()
+
+    @fields.depends('dtype1', 'dtype2', 'dtype3', 'dtype4', 'dtype5')
+    def on_change_dtype2(self):
+        """ update other dtype-fields
+        """
+        self.get_onchange_dtypes()
+
+    @fields.depends('dtype1', 'dtype2', 'dtype3', 'dtype4', 'dtype5')
+    def on_change_dtype3(self):
+        """ update other dtype-fields
+        """
+        self.get_onchange_dtypes()
+
+    @fields.depends('dtype1', 'dtype2', 'dtype3', 'dtype4', 'dtype5')
+    def on_change_dtype4(self):
+        """ update other dtype-fields
+        """
+        self.get_onchange_dtypes()
+
+    @fields.depends('dtype1', 'dtype2', 'dtype3', 'dtype4', 'dtype5')
+    def on_change_dtype5(self):
+        """ update other dtype-fields
+        """
+        self.get_onchange_dtypes()
+
+    def get_onchange_dtypes(self):
+        """ update other dtype-fields
+        """
+        dtypes = [x[0] for x in self.get_sel_etype2()]
+
+        if not self.dtype1:
+            self.dtype2 = None
+
+        if self.dtype2 and (self.dtype2 not in dtypes):
+            self.dtype2 = None
+
+        if not self.dtype2:
+            self.dtype3 = None
+
+        if self.dtype3 and (self.dtype3 not in dtypes):
+            self.dtype3 = None
+
+        if not self.dtype3:
+            self.dtype4 = None
+
+        if self.dtype4 and (self.dtype4 not in dtypes):
+            self.dtype4 = None
+
+        if not self.dtype4:
+            self.dtype5 = None
+
+        if self.dtype5 and (self.dtype5 not in dtypes):
+            self.dtype5 = None
+
     @classmethod
     def default_chart(cls):
         """ default 'pie'
@@ -142,35 +287,60 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
     def get_sel_etype(cls):
         """ get list of evaluation-types
         """
-        return [
-            ('cashbooks', gettext('cashbook_report.msg_dtype_cashbook')),
-            ('types', gettext('cashbook_report.msg_dtype_type')),
-            ('currencies', gettext('cashbook_report.msg_dtype_currency')),
-            ('categories', gettext('cashbook_report.msg_dtype_category')),
-            ]
+        result = [('', '-/-')]
+        result.extend([
+            (x, gettext('cashbook_report.msg_dtype_%s' % x))
+            for x in ['cashbooks', 'types', 'currencies', 'categories']])
+        return result
+
+    @fields.depends('dtype1')
+    def get_sel_etype2(self):
+        """ get list of allowed evaluation-types for dtype2
+        """
+        Eval2 = Pool().get('cashbook_report.evaluation')
+
+        result = [('', '-/-')]
+
+        dtype1 = getattr(self, 'dtype1', None)
+        if not dtype1:
+            return result
+
+        dtype = dtype1.split('_')[0]
+        result.extend([
+            x
+            for x in Eval2.get_sel_etype()
+            if x[0].startswith(dtype)])
+        return result
 
     @classmethod
     def get_create_view_data(cls, evaluation):
         """ generate dictionary to create view-xml
         """
-        return {
+        dtypes = [{
+                'name': getattr(evaluation, 'dtype%d_string' % x),
+                'fname': 'value%d' % x}
+                for x in range(1, 6)
+                if getattr(evaluation, 'dtype%d' % x, None) is not None]
+
+        result = {
             'model': 'cashbook_report.eval_line',
             'module': 'cashbook_report',
             'priority': 10,
             'type': 'graph',
             'data': template_view_graph % {
-                'bgcol': '' if evaluation.bgcolor == 'default' \
+                'bgcol': '' if evaluation.bgcolor == 'default'
                     else 'background="%s"' % evaluation.bgcolor,
-                'legend': '1' if evaluation.legend == True else '0',
+                'legend': '1' if evaluation.legend is True else '0',
                 'type': evaluation.chart,
-                'colscheme': '' if evaluation.maincolor == 'default' \
+                'colscheme': '' if evaluation.maincolor == 'default'
                     else 'color="%s"' % evaluation.maincolor,
-                'lines': template_view_line % {
+                'lines': '\n'.join([
+                        template_view_line % {
                             'fill': '1',
-                    'string': evaluation.dtype_string,
-                    },
-                },
-            }
+                            'fname': x['fname'],
+                            'string': x['name']}
+                        for x in dtypes])}}
+        return result
 
     @classmethod
     def uiview_delete(cls, evaluations):
@@ -189,8 +359,7 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
                 to_delete_window.append(evaluation.dashb_actwin)
 
         with Transaction().set_context({
-            '_check_access': False,
-            }):
+                '_check_access': False}):
             if len(to_delete_uiview) > 0:
                 UiView.delete(to_delete_uiview)
             if len(to_delete_window) > 0:
@@ -205,17 +374,16 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
         ActWin = pool.get('ir.action.act_window')
         ActView = pool.get('ir.action.act_window.view')
         Evaluation2 = pool.get('cashbook_report.evaluation')
-        try :
+        try:
             DashboardAction = pool.get('dashboard.action')
-        except:
+        except Exception:
             DashboardAction = None
 
         to_write_eval = []
         to_write_dbaction = []
         for evaluation in evaluations:
             with Transaction().set_context({
-                '_check_access': False,
-                }):
+                    '_check_access': False}):
                 view_graph, = UiView.create([
                     cls.get_create_view_data(evaluation),
                     ])
@@ -224,7 +392,8 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
                     'name': evaluation.name,
                     'res_model': 'cashbook_report.eval_line',
                     'usage': 'dashboard',
-                    'domain': '[["evaluation", "=", %d]]' % evaluation.id,
+                    'context_domain': '[["evaluation", "=", %d]]' % (
+                        evaluation.id),
                     }])
 
                 dashb_actview, = ActView.create([{
@@ -256,12 +425,51 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
 
         if len(to_write_dbaction) > 0:
             DashboardAction.write(*to_write_dbaction)
-
         cls.uiview_delete(evaluations)
-
         if len(to_write_eval) > 0:
             Evaluation2.write(*to_write_eval)
 
+    @classmethod
+    def validate(cls, records):
+        """ check dtype_x
+        """
+        dtypes = []
+        dtypes.extend(cashbook_types)
+        dtypes.extend(category_types)
+        dtypes.extend(booktype_types)
+        dtypes.extend(currency_types)
+
+        for record in records:
+            if record.dtype1 not in dtypes:
+                raise UserError(gettext(
+                    'cashbook_report.msg_invalid_dtype',
+                    typename='one of: %(names)s' % {
+                        'names': ', '.join(dtypes)}))
+
+            # dtype2...5 must be of same range
+            dt1 = record.dtype1.split('_')[0]
+            for x in range(2, 6):
+                dt_val = getattr(record, 'dtype%d' % x, None)
+                if dt_val:
+
+                    if record.chart == 'pie':
+                        raise UserError(gettext(
+                            'cashbook_report.msg_no_pie_with_dtype2',
+                            evalname=record.rec_name))
+
+                    if dt_val not in dtypes:
+                        raise UserError(gettext(
+                            'cashbook_report.msg_invalid_dtype',
+                            typename='one of: %(names)s' % {
+                                'names': ', '.join(dtypes)}))
+
+                    if not dt_val.startswith(dt1):
+                        raise UserError(gettext(
+                            'cashbook_report.msg_not_same_basetype',
+                            typename=gettext(
+                                'cashbook_report.msg_dtype_%s' % record.dtype1)
+                            ))
+
     @classmethod
     def create(cls, vlist):
         """ add chart
@@ -272,33 +480,47 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
 
     @classmethod
     def write(cls, *args):
-        """ unlink records if dtype changes
+        """ unlink records if dtypex changes
         """
         to_write = []
         to_update_uiview = []
 
+        dtypes = {'dtype1', 'dtype2', 'dtype3', 'dtype4', 'dtype5'}
+
         actions = iter(args)
         for evaluations, values in zip(actions, actions):
             # update ui-view if related fields change
-            if len(set({'name', 'dtype', 'bgcolor', 'maincolor',
-                'legend', 'chart'}).intersection(values.keys())) > 0:
+            uiview_fields = {
+                'name', 'bgcolor', 'maincolor', 'legend', 'chart'}
+            uiview_fields.update(dtypes)
+            if uiview_fields.intersection(values.keys()):
                 to_update_uiview.extend(evaluations)
 
-            # unlink records if dtype changes
-            if 'dtype' in values.keys():
+            # unlink records if dtype(x) changes
+            if set(values.keys()).intersection(dtypes):
                 for evaluation in evaluations:
-                    if evaluation.dtype == values['dtype']:
+                    dt_value = {x: values.get(x, None) for x in dtypes}
+                    dt_eval = {x: getattr(evaluation, x, None) for x in dtypes}
+
+                    # skip un-link if same values are to write
+                    if dt_value == dt_eval:
+                        continue
+
+                    dtype1 = values.get('dtype1', evaluation.dtype1)
+                    for dt in [
+                            'cashbooks', 'types', 'currencies',
+                            'categories']:
+                        if dtype1.startswith(dt):
+                            continue
+
+                        lines = getattr(evaluation, dt)
+                        if not lines:
                             continue
 
-                    for dt in ['cashbooks', 'types', 'currencies', 'categories']:
-                        if (not values['dtype'].startswith(dt)) and \
-                                (len(getattr(evaluation, dt)) > 0):
                         to_write.extend([
                             [evaluation],
                             {
-                                    dt: [
-                                        ('remove', [x.id for x in getattr(evaluation, dt)])
-                                        ],
+                                dt: [('remove', [x.id for x in lines])],
                             }])
 
         args = list(args)
@@ -316,4 +538,3 @@ class Evaluation(sequence_ordered(), ModelSQL, ModelView):
         super(Evaluation, cls).delete(evaluations)
 
 # end Evaluation
-

evaluation.xml

@@ -96,7 +96,7 @@ full copyright notices and license terms. -->
         </record>
         <record model="ir.rule" id="rg_eval_rw_owner-1">
             <field name="domain" eval="[
-                ('create_uid', '=', Eval('user', {}).get('id', -1)),
+                ('create_uid', '=', Eval('user_id', -1)),
                 ]" pyson="1"/>
             <field name="rule_group" ref="rg_eval_rw_owner"/>
         </record>

evaluation_context.py

@@ -11,7 +11,8 @@ class EvaluationContext(ModelView):
     'Evaluation Context'
     __name__ = 'cashbook_report.evaluation.context'
 
-    evaluation = fields.Many2One(string='Evaluation', readonly=True,
+    evaluation = fields.Many2One(
+        string='Evaluation', readonly=True,
         model_name='cashbook_report.evaluation')
 
     @classmethod

evaluation_wizard.py

@@ -28,11 +28,10 @@ class OpenChartWizard(Wizard):
         if evaluation.ui_view_chart:
             action['pyson_context'] = PYSONEncoder().encode({
                 'active_evaluation': evaluation.id,
-                'evaluation': evaluation.id,
-                })
+                'evaluation': evaluation.id})
             action['name'] = gettext(
                 'cashbook_report.msg_name_graph',
-                gname = evaluation.rec_name)
+                gname=evaluation.rec_name)
         return action, {}
 
 # end OpenChartWizard

investment.py

@@ -17,12 +17,30 @@ class InvestmentEvaluation(metaclass=PoolMeta):
         """
         result = super(InvestmentEvaluation, cls).get_sel_etype()
         result.extend([
-            ('cashbooks_gldiff', gettext('cashbook_report.msg_dtype_cashbook_gldiff')),
-            ('cashbooks_glperc', gettext('cashbook_report.msg_dtype_cashbook_glperc')),
-            ('cashbooks_glvalue', gettext('cashbook_report.msg_dtype_cashbooks_glvalue')),
-            ('category_gldiff', gettext('cashbook_report.msg_dtype_category_gldiff')),
-            ('category_glvalue', gettext('cashbook_report.msg_dtype_category_glvalue')),
-            ('category_glperc',  gettext('cashbook_report.msg_dtype_category_glperc')),
+            ('cashbooks_gldiff', gettext(
+                'cashbook_report.msg_dtype_cashbooks_gldiff')),
+            ('cashbooks_glperc', gettext(
+                'cashbook_report.msg_dtype_cashbooks_glperc')),
+            ('cashbooks_glvalue', gettext(
+                'cashbook_report.msg_dtype_cashbooks_glvalue')),
+            ('cashbooks_glyield', gettext(
+                'cashbook_report.msg_dtype_cashbooks_glyield')),
+            ('categories_gldiff', gettext(
+                'cashbook_report.msg_dtype_categories_gldiff')),
+            ('categories_glvalue', gettext(
+                'cashbook_report.msg_dtype_categories_glvalue')),
+            ('categories_glperc',  gettext(
+                'cashbook_report.msg_dtype_categories_glperc')),
+            ('categories_glyield',  gettext(
+                'cashbook_report.msg_dtype_categories_glyield')),
+            ('types_gldiff', gettext(
+                'cashbook_report.msg_dtype_types_gldiff')),
+            ('types_glvalue', gettext(
+                'cashbook_report.msg_dtype_types_glvalue')),
+            ('types_glperc',  gettext(
+                'cashbook_report.msg_dtype_types_glperc')),
+            ('types_glyield',  gettext(
+                'cashbook_report.msg_dtype_types_glyield')),
             ])
         return result
 
@@ -32,110 +50,169 @@ class InvestmentEvaluation(metaclass=PoolMeta):
 class InvestmentLine(metaclass=PoolMeta):
     __name__ = 'cashbook_report.eval_line'
 
-    def get_value_category_glperc(self):
+    def get_percent_by_query(self, query):
         """ get percentual difference of bookings in categories
             converted to currency of evaluation
         """
         Book = Pool().get('cashbook.book')
 
-        if self.category is None:
-            return None
+        query2 = [('state', '=', 'open')]
+        query2.extend(query)
+        books = Book.search(query2)
 
-        books = Book.search([
-            ('state', '=', 'open'),
-            ('categories.id', '=', self.category.id),
-            ])
         value = Decimal('0.0')
         amount = Decimal('0.0')
 
         if len(books) > 0:
-            value = sum([x.current_value_ref for x in books
-                if (x.current_value_ref is not None) and (x.feature == 'asset')])
-            amount = sum([x.balance_ref for x in books
+            value = sum([
+                x.current_value_ref for x in books
+                if (x.current_value_ref is not None)
+                and (x.feature == 'asset')])
+            amount = sum([
+                x.balance_ref for x in books
                 if (x.balance_ref is not None) and (x.feature == 'asset')])
             if amount != Decimal('0.0'):
                 return self.convert_to_evalcurrency(
                     books[0].company.currency,
-                        Decimal('100.0') * value / amount - Decimal('100.0'),
-                    )
+                    Decimal('100.0') * value / amount - Decimal('100.0'))
         return Decimal('0.0')
 
-    def get_value_category_glvalue(self):
+    def get_difference_by_query(self, query):
+        """ get difference amount of bookings in categories
+            converted to currency of evaluation
+        """
+        Book = Pool().get('cashbook.book')
+
+        query2 = [('state', '=', 'open')]
+        query2.extend(query)
+        books = Book.search(query2)
+
+        result = Decimal('0.0')
+        if len(books) > 0:
+            result = sum([
+                x.current_value_ref - x.balance_ref for x in books
+                if (x.current_value_ref is not None) and
+                (x.balance_ref is not None) and
+                (x.feature == 'asset')])
+            result = self.convert_to_evalcurrency(
+                    books[0].company.currency, result)
+        return result
+
+    def get_currentvalue_by_query(self, query):
         """ get current value of bookings in categories
             converted to currency of evaluation
         """
         Book = Pool().get('cashbook.book')
 
-        if self.category is None:
-            return None
+        query2 = [('state', '=', 'open')]
+        query2.extend(query)
+        books = Book.search(query2)
 
-        books = Book.search([
-            ('state', '=', 'open'),
-            ('categories.id', '=', self.category.id),
-            ])
         result = Decimal('0.0')
         if len(books) > 0:
             for book in books:
-                if book.feature == 'asset':
+                if (book.feature == 'asset') or \
+                        ((book.feature is None) and
+                            (book.current_value_ref is not None)):
                     if book.current_value_ref is not None:
                         result += book.current_value_ref
-                else :
+                else:
                     if book.balance_ref is not None:
                         result += book.balance_ref
             return self.convert_to_evalcurrency(
                     books[0].company.currency, result)
         return result
 
-    def get_value_category_gldiff(self):
-        """ get difference amount of bookings in categories
+    def get_totalyield_by_query(self, query):
+        """ get total yield of cashbookings
             converted to currency of evaluation
         """
         Book = Pool().get('cashbook.book')
 
+        query2 = [('state', '=', 'open')]
+        query2.extend(query)
+        books = Book.search(query2)
+
+        result = Decimal('0.0')
+        if len(books) > 0:
+            for book in books:
+                if (book.feature == 'asset') and \
+                        (book.yield_balance is not None):
+                    result += self.convert_to_evalcurrency(
+                        books[0].currency, book.yield_balance)
+        return result
+
+    def get_value_categories_glperc(self):
+        """ get percent of profit/loss by category
+        """
         if self.category is None:
             return None
 
-        books = Book.search([
-            ('state', '=', 'open'),
+        return self.get_percent_by_query([
+            ('categories.id', '=', self.category.id)])
+
+    def get_value_categories_gldiff(self):
+        """ get difference amount by category
+        """
+        if self.category is None:
+            return None
+
+        return self.get_difference_by_query([
+            ('categories.id', '=', self.category.id)])
+
+    def get_value_categories_glvalue(self):
+        """ get current value by category
+        """
+        if self.category is None:
+            return None
+
+        return self.get_currentvalue_by_query([
+            ('categories.id', '=', self.category.id)])
+
+    def get_value_categories_glyield(self):
+        """ get total yield by type
+        """
+        if self.category is None:
+            return None
+
+        return self.get_totalyield_by_query([
             ('categories.id', '=', self.category.id),
             ])
-        result = Decimal('0.0')
-        if len(books) > 0:
-            result = sum([x.current_value_ref - x.balance_ref for x in books
-                if (x.current_value_ref is not None) and \
-                    (x.balance_ref is not None) and \
-                    (x.feature == 'asset')])
-            result = self.convert_to_evalcurrency(
-                    books[0].company.currency, result)
-        return result
 
-    def get_value_cashbooks_gldiff(self):
-        """ amount of profit/loss of cashbooks
+    def get_value_types_glperc(self):
+        """ get percent of profit/loss by type
         """
-        Currency = Pool().get('currency.currency')
+        if self.dtype is None:
+            return None
 
-        if self.cashbook:
-            if self.cashbook.feature == 'asset':
-                return self.convert_to_evalcurrency(
-                        self.cashbook.currency,
-                        self.cashbook.diff_amount)
-            else :
-                return Decimal('0.0')
+        return self.get_percent_by_query([('btype.id', '=', self.dtype.id)])
 
-    def get_value_cashbooks_glvalue(self):
-        """ current value of cashbooks
+    def get_value_types_gldiff(self):
+        """ get difference amount by type
         """
-        Currency = Pool().get('currency.currency')
+        if self.dtype is None:
+            return None
 
-        if self.cashbook:
-            if self.cashbook.feature == 'asset':
-                return self.convert_to_evalcurrency(
-                        self.cashbook.currency,
-                        self.cashbook.current_value)
-            else :
-                return self.convert_to_evalcurrency(
-                        self.cashbook.currency,
-                        self.cashbook.balance_ref)
+        return self.get_difference_by_query([
+            ('btype.id', '=', self.dtype.id)])
+
+    def get_value_types_glvalue(self):
+        """ get current value by type
+        """
+        if self.dtype is None:
+            return None
+
+        return self.get_currentvalue_by_query([
+            ('btype.id', '=', self.dtype.id)])
+
+    def get_value_types_glyield(self):
+        """ get total yield by type
+        """
+        if self.dtype is None:
+            return None
+
+        return self.get_totalyield_by_query([
+            ('btype.id', '=', self.dtype.id)])
 
     def get_value_cashbooks_glperc(self):
         """ percent of profit/loss of cashbooks
@@ -143,7 +220,40 @@ class InvestmentLine(metaclass=PoolMeta):
         if self.cashbook:
             if self.cashbook.feature == 'asset':
                 return self.cashbook.diff_percent
-            else :
+            else:
                 return Decimal('0.0')
 
+    def get_value_cashbooks_gldiff(self):
+        """ amount of profit/loss of cashbooks
+        """
+        if self.cashbook:
+            if self.cashbook.feature == 'asset':
+                return self.convert_to_evalcurrency(
+                        self.cashbook.currency,
+                        self.cashbook.diff_amount)
+            else:
+                return Decimal('0.0')
+
+    def get_value_cashbooks_glvalue(self):
+        """ current value of cashbooks
+        """
+        if self.cashbook:
+            if (self.cashbook.feature == 'asset') or \
+                    ((self.cashbook.feature is None) and
+                        (self.cashbook.current_value is not None)):
+                return self.convert_to_evalcurrency(
+                        self.cashbook.currency,
+                        self.cashbook.current_value)
+            else:
+                return self.convert_to_evalcurrency(
+                        self.cashbook.currency,
+                        self.cashbook.balance)
+
+    def get_value_cashbooks_glyield(self):
+        """ total yield of investment
+        """
+        if self.cashbook:
+            return self.get_totalyield_by_query([
+                    ('id', '=', self.cashbook.id)])
+
 # end InvestmentLine

ir.py

@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# This file is part of the cashbook-module from m-ds.de for Tryton.
+# The COPYRIGHT file at the top level of this repository contains the
+# full copyright notices and license terms.
+
+from trytond.pool import PoolMeta
+
+
+class Rule(metaclass=PoolMeta):
+    __name__ = 'ir.rule'
+
+    @classmethod
+    def _context_modelnames(cls):
+        """
+
+        Returns:
+            set: model-names
+        """
+        result = super(Rule, cls)._context_modelnames()
+        return result | {
+            'ir.action.act_window',
+            'cashbook_report.evaluation',
+            }
+
+# end Rule
+
+
+class IrActWindow(metaclass=PoolMeta):
+    __name__ = 'ir.action.act_window'
+
+    @classmethod
+    def __register__(cls, module_name):
+        super(IrActWindow, cls).__register__(module_name)
+
+        # migrate (6.0 --> 7.0): domain --> context_domain
+        records = cls.search([
+            ('res_model', '=', 'cashbook_report.eval_line'),
+            ('domain', '!=', None),
+            ('context_domain', '=', None),
+            ('context_model', '=', None)])
+        if records:
+            to_write = []
+            for record in records:
+                to_write.extend([
+                    [record],
+                    {
+                        'context_domain': record.domain,
+                        'domain': None,
+                    }])
+            cls.write(*to_write)
+
+# end IrActWindow

ir.xml

@@ -20,7 +20,7 @@ full copyright notices and license terms. -->
             <field name="domain" eval="[
                 ('res_model', '=', 'cashbook_report.eval_line'),
                 ['OR',
-                    ('create_uid', '=', Eval('user', {}).get('id', -1)),
+                    ('create_uid', '=', Eval('user_id', -1)),
                     ('create_uid', '=', 0),
                 ],
                 ]" pyson="1"/>

line.py

@@ -6,67 +6,99 @@
 from decimal import Decimal
 from sql.aggregate import Sum
 from trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import Eval
+from trytond.pyson import Eval, Bool
 from trytond.transaction import Transaction
 from trytond.i18n import gettext
 from trytond.exceptions import UserError
 from trytond.pool import Pool
-from .templates import cashbook_types, category_types
+from .templates import cashbook_types, category_types, booktype_types
 
 
 class EvaluationLine(ModelSQL, ModelView):
     'Evaluation Line Relation'
     __name__ = 'cashbook_report.eval_line'
 
-    evaluation = fields.Many2One(string='Evaluation', required=True,
-        select=True, ondelete='CASCADE',
+    evaluation = fields.Many2One(
+        string='Evaluation', required=True, ondelete='CASCADE',
         model_name='cashbook_report.evaluation')
-    cashbook = fields.Many2One(string='Cashbook', select=True, ondelete='CASCADE',
-        model_name='cashbook.book',
+    cashbook = fields.Many2One(
+        string='Cashbook', ondelete='CASCADE', model_name='cashbook.book',
         states={
-            'required': Eval('eval_dtype', '').in_(cashbook_types),
-        }, depends=['eval_dtype'])
-    dtype = fields.Many2One(string='Type', select=True, ondelete='CASCADE',
-        model_name='cashbook.type',
+            'required': Eval('eval_dtype1', '').in_(cashbook_types),
+        }, depends=['eval_dtype1'])
+    dtype = fields.Many2One(
+        string='Type', ondelete='CASCADE', model_name='cashbook.type',
         states={
-            'required': Eval('eval_dtype', '') == 'types',
-        }, depends=['eval_dtype'])
-    currency = fields.Many2One(string='Currency', select=True, ondelete='CASCADE',
-        model_name='currency.currency',
+            'required': Eval('eval_dtype1', '').in_(booktype_types),
+        }, depends=['eval_dtype1'])
+    currency = fields.Many2One(
+        string='Currency', ondelete='CASCADE', model_name='currency.currency',
         states={
-            'required': Eval('eval_dtype', '') == 'currencies',
-        }, depends=['eval_dtype'])
-    category = fields.Many2One(string='Category', select=True, ondelete='CASCADE',
+            'required': Eval('eval_dtype1', '') == 'currencies',
+        }, depends=['eval_dtype1'])
+    category = fields.Many2One(
+        string='Category', ondelete='CASCADE',
         model_name='cashbook.bookcategory',
         states={
-            'required': Eval('eval_dtype', '').in_(category_types),
-        }, depends=['eval_dtype'])
+            'required': Eval('eval_dtype1', '').in_(category_types),
+        }, depends=['eval_dtype1'])
 
-    # dtype + currency of evaluation
-    eval_dtype = fields.Function(fields.Char(string='Data type', readonly=True),
-        'on_change_with_eval_dtype')
-    eval_currency = fields.Function(fields.Many2One(model_name='currency.currency',
+    # dtypes + currency of evaluation
+    eval_dtype1 = fields.Function(fields.Char(
+        string='Data type 1', readonly=True), 'on_change_with_eval_dtype1')
+    eval_dtype2 = fields.Function(fields.Char(
+        string='Data type 2', readonly=True), 'on_change_with_eval_dtype2')
+    eval_dtype3 = fields.Function(fields.Char(
+        string='Data type 3', readonly=True), 'on_change_with_eval_dtype3')
+    eval_dtype4 = fields.Function(fields.Char(
+        string='Data type 4', readonly=True), 'on_change_with_eval_dtype4')
+    eval_dtype5 = fields.Function(fields.Char(
+        string='Data type 5', readonly=True), 'on_change_with_eval_dtype5')
+    eval_currency = fields.Function(fields.Many2One(
+        model_name='currency.currency',
         string="Currency", readonly=True), 'on_change_with_eval_currency')
-    currency_digits = fields.Function(fields.Integer(string='Currency Digits',
-        readonly=True), 'on_change_with_currency_digits')
+    currency_digits = fields.Function(fields.Integer(
+        string='Currency Digits', readonly=True),
+        'on_change_with_currency_digits')
 
-    name = fields.Function(fields.Char(string='Name'),
-        'on_change_with_name', setter='set_name_data')
+    name = fields.Function(fields.Char(
+        string='Name'), 'on_change_with_name', setter='set_name_data')
     name_line = fields.Char(string='Name', states={'invisible': True})
-    balance = fields.Function(fields.Numeric(string='Balance',
+    value1 = fields.Function(fields.Numeric(
+        string='Value 1',
         readonly=True, digits=(16, Eval('currency_digits', 2)),
         depends=['currency_digits']),
-        'on_change_with_balance')
+        'on_change_with_value1')
+    value2 = fields.Function(fields.Numeric(
+        string='Value 2',
+        readonly=True, digits=(16, Eval('currency_digits', 2)),
+        states={'invisible': ~Bool(Eval('eval_dtype2', ''))},
+        depends=['currency_digits', 'eval_dtype2']),
+        'on_change_with_value2')
+    value3 = fields.Function(fields.Numeric(
+        string='Value 3',
+        readonly=True, digits=(16, Eval('currency_digits', 2)),
+        states={'invisible': ~Bool(Eval('eval_dtype3', ''))},
+        depends=['currency_digits', 'eval_dtype3']),
+        'on_change_with_value3')
+    value4 = fields.Function(fields.Numeric(
+        string='Value 4',
+        readonly=True, digits=(16, Eval('currency_digits', 2)),
+        states={'invisible': ~Bool(Eval('eval_dtype4', ''))},
+        depends=['currency_digits', 'eval_dtype4']),
+        'on_change_with_value4')
+    value5 = fields.Function(fields.Numeric(
+        string='Value 5',
+        readonly=True, digits=(16, Eval('currency_digits', 2)),
+        states={'invisible': ~Bool(Eval('eval_dtype5', ''))},
+        depends=['currency_digits', 'eval_dtype5']),
+        'on_change_with_value5')
 
     @classmethod
     def set_name_data(cls, lines, name, value):
         """ store updated name
         """
-        cls.write(*[
-            lines,
-            {
-                'name_line': value,
-            }])
+        cls.write(*[lines, {'name_line': value}])
 
     @classmethod
     def fields_view_get(cls, view_id, view_type='form'):
@@ -94,12 +126,40 @@ class EvaluationLine(ModelSQL, ModelView):
         return super(EvaluationLine, cls).fields_view_get(
                     view_id=view_id, view_type=view_type)
 
-    @fields.depends('evaluation', '_parent_evaluation.dtype')
-    def on_change_with_eval_dtype(self, name=None):
-        """ get dtape from parent
+    @fields.depends('evaluation', '_parent_evaluation.dtype1')
+    def on_change_with_eval_dtype1(self, name=None):
+        """ get dtype1 from parent
         """
         if self.evaluation:
-            return self.evaluation.dtype
+            return self.evaluation.dtype1
+
+    @fields.depends('evaluation', '_parent_evaluation.dtype2')
+    def on_change_with_eval_dtype2(self, name=None):
+        """ get dtype2 from parent
+        """
+        if self.evaluation:
+            return self.evaluation.dtype2
+
+    @fields.depends('evaluation', '_parent_evaluation.dtype3')
+    def on_change_with_eval_dtype3(self, name=None):
+        """ get dtype3 from parent
+        """
+        if self.evaluation:
+            return self.evaluation.dtype3
+
+    @fields.depends('evaluation', '_parent_evaluation.dtype4')
+    def on_change_with_eval_dtype4(self, name=None):
+        """ get dtype4 from parent
+        """
+        if self.evaluation:
+            return self.evaluation.dtype4
+
+    @fields.depends('evaluation', '_parent_evaluation.dtype5')
+    def on_change_with_eval_dtype5(self, name=None):
+        """ get dtype5 from parent
+        """
+        if self.evaluation:
+            return self.evaluation.dtype5
 
     @fields.depends('evaluation', '_parent_evaluation.currency')
     def on_change_with_eval_currency(self, name=None):
@@ -117,7 +177,9 @@ class EvaluationLine(ModelSQL, ModelView):
         else:
             return 2
 
-    @fields.depends('eval_dtype', 'category', 'cashbook', 'dtype', 'currency', 'name_line')
+    @fields.depends(
+        'eval_dtype1', 'category', 'cashbook', 'dtype', 'currency',
+        'name_line')
     def on_change_with_name(self, name=None):
         """ get name of Type
         """
@@ -127,13 +189,14 @@ class EvaluationLine(ModelSQL, ModelView):
                 return self.name_line
 
         # otherwise use rec_name of linked record
-        if self.eval_dtype:
-            dtype_sel = {'types': 'dtype', 'currencies': 'currency'}
-            dtype_sel.update({x:'cashbook' for x in cashbook_types})
-            dtype_sel.update({x:'category' for x in category_types})
+        if self.eval_dtype1:
+            dtype_sel = {'currencies': 'currency'}
+            dtype_sel.update({x: 'cashbook' for x in cashbook_types})
+            dtype_sel.update({x: 'category' for x in category_types})
+            dtype_sel.update({x: 'dtype' for x in booktype_types})
 
             return getattr(
-                getattr(self, dtype_sel[self.eval_dtype], None),
+                getattr(self, dtype_sel[self.eval_dtype1], None),
                 'rec_name', None)
 
     def convert_to_evalcurrency(self, from_currency, amount):
@@ -142,11 +205,10 @@ class EvaluationLine(ModelSQL, ModelView):
         Currency = Pool().get('currency.currency')
 
         exp = Decimal(Decimal(1) / 10 ** self.currency_digits)
+        if amount is None:
+            return Decimal('0.0')
         return Currency.compute(
-                from_currency,
-                amount,
-                self.eval_currency,
-            ).quantize(exp)
+            from_currency, amount, self.eval_currency).quantize(exp)
 
     @classmethod
     def validate(cls, records):
@@ -154,32 +216,28 @@ class EvaluationLine(ModelSQL, ModelView):
         """
         super(EvaluationLine, cls).validate(records)
         for record in records:
-            if (record.evaluation.dtype not in cashbook_types) and \
+            if (record.evaluation.dtype1 not in cashbook_types) and \
                     (record.cashbook is not None):
                 raise UserError(gettext(
                     'cashbook_report.msg_invalid_dtype',
-                    typename = gettext('cashbook_report.msg_dtype_cashbook'),
-                    ))
-            if (record.evaluation.dtype != 'types') and \
+                    typename=gettext('cashbook_report.msg_dtype_cashbooks')))
+            if (record.evaluation.dtype1 not in booktype_types) and \
                     (record.dtype is not None):
                 raise UserError(gettext(
                     'cashbook_report.msg_invalid_dtype',
-                    typename = gettext('cashbook_report.msg_dtype_type'),
-                    ))
-            if (record.evaluation.dtype != 'currencies') and \
+                    typename=gettext('cashbook_report.msg_dtype_types')))
+            if (record.evaluation.dtype1 != 'currencies') and \
                     (record.currency is not None):
                 raise UserError(gettext(
                     'cashbook_report.msg_invalid_dtype',
-                    typename = gettext('cashbook_report.msg_dtype_currency'),
-                    ))
-            if (record.evaluation.dtype not in category_types) and \
+                    typename=gettext('cashbook_report.msg_dtype_currencies')))
+            if (record.evaluation.dtype1 not in category_types) and \
                     (record.category is not None):
                 raise UserError(gettext(
                     'cashbook_report.msg_invalid_dtype',
-                    typename = gettext('cashbook_report.msg_dtype_category'),
-                    ))
+                    typename=gettext('cashbook_report.msg_dtype_categories')))
 
-    def get_balance_by_query(self, query):
+    def get_value_by_query(self, query):
         """ run 'query' on Lines, convert used
             currencies to evaluation-currency
         """
@@ -193,21 +251,24 @@ class EvaluationLine(ModelSQL, ModelView):
 
         total_amount = Decimal('0.0')
         with Transaction().set_context({
-            '_check_access': True,
-            }):
+                '_check_access': True}):
             lines = Lines.search(query, query=True)
 
-            query = lines.join(tab_line, condition=lines.id==tab_line.id,
-                ).join(tab_book, condition=tab_book.id==tab_line.cashbook,
+            query = lines.join(
+                    tab_line,
+                    condition=lines.id == tab_line.id,
+                ).join(
+                    tab_book,
+                    condition=tab_book.id == tab_line.cashbook,
                 ).select(
                     tab_book.currency,
                     Sum(tab_line.credit - tab_line.debit).as_('balance'),
-                    group_by=[tab_book.currency],
-                )
+                    group_by=[tab_book.currency])
             cursor.execute(*query)
-            balances = cursor.fetchall()
-            for balance in balances:
-                (id_currency, bal1) = balance
+            records = cursor.fetchall()
+
+            for record in records:
+                (id_currency, bal1) = record
 
                 if bal1 is not None:
                     total_amount += self.convert_to_evalcurrency(
@@ -217,13 +278,9 @@ class EvaluationLine(ModelSQL, ModelView):
     def get_value_cashbooks(self):
         """ balance of cashbooks
         """
-        Currency = Pool().get('currency.currency')
-
         if self.cashbook:
             return self.convert_to_evalcurrency(
-                    self.cashbook.currency,
-                    self.cashbook.balance,
-                )
+                    self.cashbook.currency, self.cashbook.balance)
 
     def get_value_categories(self):
         """ get balance of bookings in categories
@@ -234,11 +291,10 @@ class EvaluationLine(ModelSQL, ModelView):
         if self.category is None:
             return None
 
-        return self.get_balance_by_query([
+        return self.get_value_by_query([
                 ('cashbook.categories.id', '=', self.category.id),
                 ('cashbook.state', '=', 'open'),
-                ('date', '<=', IrDate.today()),
-            ])
+                ('date', '<=', IrDate.today())])
 
     def get_value_types(self):
         """ get balance of bookings in cashbooks by 'type',
@@ -249,11 +305,10 @@ class EvaluationLine(ModelSQL, ModelView):
         if self.dtype is None:
             return None
 
-        return self.get_balance_by_query([
+        return self.get_value_by_query([
                 ('cashbook.btype.id', '=', self.dtype.id),
                 ('cashbook.state', '=', 'open'),
-                ('date', '<=', IrDate.today()),
-            ])
+                ('date', '<=', IrDate.today())])
 
     def get_value_currencies(self):
         """ get balance of bookings in cashbooks by 'currency',
@@ -264,22 +319,74 @@ class EvaluationLine(ModelSQL, ModelView):
         if self.currency is None:
             return None
 
-        return self.get_balance_by_query([
+        return self.get_value_by_query([
                 ('cashbook.currency.id', '=', self.currency.id),
                 ('cashbook.state', '=', 'open'),
-                ('date', '<=', IrDate.today()),
-            ])
+                ('date', '<=', IrDate.today())])
 
-    @fields.depends('eval_dtype', 'eval_currency', 'currency_digits', \
-        'cashbook', '_parent_cashbook.currency', '_parent_cashbook.balance',\
+    @fields.depends(
+        'eval_dtype1', 'eval_currency', 'currency_digits',
+        'cashbook', '_parent_cashbook.currency', '_parent_cashbook.balance',
         'category', '_parent_category.id',
         'evaluation', '_parent_evaluation.id', 'dtype', 'currency')
-    def on_change_with_balance(self, name=None):
+    def on_change_with_value1(self, name=None):
+        """ balance of value1
+        """
+        if (self.evaluation is None) or (self.eval_currency is None) or \
+                (self.currency_digits is None) or (self.eval_dtype1 is None):
+            return None
+        return getattr(self, 'get_value_%s' % self.eval_dtype1)()
+
+    @fields.depends(
+        'eval_dtype2', 'eval_currency', 'currency_digits',
+        'cashbook', '_parent_cashbook.currency', '_parent_cashbook.balance',
+        'category', '_parent_category.id',
+        'evaluation', '_parent_evaluation.id', 'dtype', 'currency')
+    def on_change_with_value2(self, name=None):
+        """ balance of value2
+        """
+        if (self.evaluation is None) or (self.eval_currency is None) or \
+                (self.currency_digits is None) or (self.eval_dtype2 is None):
+            return None
+        return getattr(self, 'get_value_%s' % self.eval_dtype2)()
+
+    @fields.depends(
+        'eval_dtype3', 'eval_currency', 'currency_digits',
+        'cashbook', '_parent_cashbook.currency', '_parent_cashbook.balance',
+        'category', '_parent_category.id',
+        'evaluation', '_parent_evaluation.id', 'dtype', 'currency')
+    def on_change_with_value3(self, name=None):
+        """ balance of value3
+        """
+        if (self.evaluation is None) or (self.eval_currency is None) or \
+                (self.currency_digits is None) or (self.eval_dtype3 is None):
+            return None
+        return getattr(self, 'get_value_%s' % self.eval_dtype3)()
+
+    @fields.depends(
+        'eval_dtype4', 'eval_currency', 'currency_digits',
+        'cashbook', '_parent_cashbook.currency', '_parent_cashbook.balance',
+        'category', '_parent_category.id',
+        'evaluation', '_parent_evaluation.id', 'dtype', 'currency')
+    def on_change_with_value4(self, name=None):
+        """ balance of value4
+        """
+        if (self.evaluation is None) or (self.eval_currency is None) or \
+                (self.currency_digits is None) or (self.eval_dtype4 is None):
+            return None
+        return getattr(self, 'get_value_%s' % self.eval_dtype4)()
+
+    @fields.depends(
+        'eval_dtype5', 'eval_currency', 'currency_digits',
+        'cashbook', '_parent_cashbook.currency', '_parent_cashbook.balance',
+        'category', '_parent_category.id',
+        'evaluation', '_parent_evaluation.id', 'dtype', 'currency')
+    def on_change_with_value5(self, name=None):
         """ balance of cashbook
         """
         if (self.evaluation is None) or (self.eval_currency is None) or \
-            (self.currency_digits is None) or (self.eval_dtype is None):
+                (self.currency_digits is None) or (self.eval_dtype5 is None):
             return None
-        return getattr(self, 'get_value_%s' % self.eval_dtype)()
+        return getattr(self, 'get_value_%s' % self.eval_dtype5)()
 
 # end EvaluationLine

locale/de.po

@@ -10,15 +10,15 @@ msgctxt "model:ir.message,text:msg_name_cashbook"
 msgid "Type of evaluation must be '%(typename)s'."
 msgstr "Typ der Auswertung mus '%(typename)s' sein."
 
-msgctxt "model:ir.message,text:msg_dtype_cashbook"
+msgctxt "model:ir.message,text:msg_dtype_cashbooks"
 msgid "Cashbooks [Amount]"
 msgstr "Kassenbücher [Betrag]"
 
-msgctxt "model:ir.message,text:msg_dtype_cashbook_gldiff"
+msgctxt "model:ir.message,text:msg_dtype_cashbooks_gldiff"
 msgid "Cashbooks [Amount of Profit/Loss]"
 msgstr "Kassenbücher [Betrag Gewinn/Verlust]"
 
-msgctxt "model:ir.message,text:msg_dtype_cashbook_glperc"
+msgctxt "model:ir.message,text:msg_dtype_cashbooks_glperc"
 msgid "Cashbooks [Percent of Profit/Loss]"
 msgstr "Kassenbücher [Prozent Gewinn/Verlust]"
 
@@ -26,34 +26,66 @@ msgctxt "model:ir.message,text:msg_dtype_cashbooks_glvalue"
 msgid "Cashbooks [Current Value]"
 msgstr "Kassenbücher [aktueller Wert]"
 
-msgctxt "model:ir.message,text:msg_dtype_type"
-msgid "Types of Cashbooks"
-msgstr "Typen von Kassenbüchern"
+msgctxt "model:ir.message,text:msg_dtype_cashbooks_glyield"
+msgid "Cashbooks [Total Yield]"
+msgstr "Kassenbücher [Gesamtertrag]"
 
-msgctxt "model:ir.message,text:msg_dtype_currency"
+msgctxt "model:ir.message,text:msg_dtype_types"
+msgid "Types of Cashbooks [Amount]"
+msgstr "Typen von Kassenbüchern [Betrag]"
+
+msgctxt "model:ir.message,text:msg_dtype_types_gldiff"
+msgid "Types of Cashbooks [Amount of Profit/Loss]"
+msgstr "Typen von Kassenbüchern [Betrag Gewinn/Verlust]"
+
+msgctxt "model:ir.message,text:msg_dtype_types_glvalue"
+msgid "Types of Cashbooks [Current Value]"
+msgstr "Typen von Kassenbüchern [aktueller Wert]"
+
+msgctxt "model:ir.message,text:msg_dtype_types_glperc"
+msgid "Types of Cashbooks [Percent of Profit/Loss]"
+msgstr "Typen von Kassenbüchern [Prozent Gewinn/Verlust]"
+
+msgctxt "model:ir.message,text:msg_dtype_types_glyield"
+msgid "Types of Cashbooks [Total Yield]"
+msgstr "Typen von Kassenbüchern [Gesamtertrag]"
+
+msgctxt "model:ir.message,text:msg_dtype_currencies"
 msgid "Currencies"
 msgstr "Währungen"
 
-msgctxt "model:ir.message,text:msg_dtype_category"
+msgctxt "model:ir.message,text:msg_dtype_categories"
 msgid "Categories [Amount]"
 msgstr "Kategorien [Betrag]"
 
-msgctxt "model:ir.message,text:msg_dtype_category_gldiff"
+msgctxt "model:ir.message,text:msg_dtype_categories_gldiff"
 msgid "Categories [Amount of Profit/Loss]"
 msgstr "Kategorien [Betrag Gewinn/Verlust]"
 
-msgctxt "model:ir.message,text:msg_dtype_category_glvalue"
+msgctxt "model:ir.message,text:msg_dtype_categories_glvalue"
 msgid "Categories [Current Value]"
 msgstr "Kategorien [aktueller Wert]"
 
-msgctxt "model:ir.message,text:msg_dtype_category_glperc"
+msgctxt "model:ir.message,text:msg_dtype_categories_glperc"
 msgid "Categories [Percent of Profit/Loss]"
 msgstr "Kategorien [Prozent Gewinn/Verlust]"
 
+msgctxt "model:ir.message,text:msg_dtype_categories_glyield"
+msgid "Categories [Total Yield]"
+msgstr "Kategorien [Gesamtertrag]"
+
 msgctxt "model:ir.message,text:msg_name_graph"
 msgid "Graph: %(gname)s"
 msgstr "Diagramm: %(gname)s"
 
+msgctxt "model:ir.message,text:msg_not_same_basetype"
+msgid "Type of evaluation must be of the same base type like '%(typename)s'."
+msgstr "Die Art der Auswertung muss vom gleichen Basistyp wie '%(typename)s' sein."
+
+msgctxt "model:ir.message,text:msg_no_pie_with_dtype2"
+msgid "The pie display cannot be used by multiple data sources in the evaluation '%(evalname)s'."
+msgstr "Die Tortendarstellung kann nicht mehreren Datenquellen verwendet werden, in der Auswertung '%(evalname)s'."
+
 
 #################
 # ir.rule.group #
@@ -110,17 +142,49 @@ msgctxt "field:cashbook_report.eval_line,currency_digits:"
 msgid "Currency Digits"
 msgstr "Nachkommastellen Währung"
 
-msgctxt "field:cashbook_report.eval_line,eval_dtype:"
-msgid "Data type"
-msgstr "Datenart"
+msgctxt "field:cashbook_report.eval_line,eval_dtype1:"
+msgid "Data type 1"
+msgstr "Datenart 1"
+
+msgctxt "field:cashbook_report.eval_line,eval_dtype2:"
+msgid "Data type 2"
+msgstr "Datenart 2"
+
+msgctxt "field:cashbook_report.eval_line,eval_dtype3:"
+msgid "Data type 3"
+msgstr "Datenart 3"
+
+msgctxt "field:cashbook_report.eval_line,eval_dtype4:"
+msgid "Data type 4"
+msgstr "Datenart 4"
+
+msgctxt "field:cashbook_report.eval_line,eval_dtype5:"
+msgid "Data type 5"
+msgstr "Datenart 5"
 
 msgctxt "field:cashbook_report.eval_line,name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:cashbook_report.eval_line,balance:"
-msgid "Balance"
-msgstr "Saldo"
+msgctxt "field:cashbook_report.eval_line,value1:"
+msgid "Value 1"
+msgstr "Wert 1"
+
+msgctxt "field:cashbook_report.eval_line,value2:"
+msgid "Value 2"
+msgstr "Wert 2"
+
+msgctxt "field:cashbook_report.eval_line,value3:"
+msgid "Value 3"
+msgstr "Wert 3"
+
+msgctxt "field:cashbook_report.eval_line,value4:"
+msgid "Value 4"
+msgstr "Wert 4"
+
+msgctxt "field:cashbook_report.eval_line,value5:"
+msgid "Value 5"
+msgstr "Wert 5"
 
 
 ##############################
@@ -142,31 +206,51 @@ msgctxt "view:cashbook_report.evaluation:"
 msgid "Representation"
 msgstr "Darstellung"
 
+msgctxt "view:cashbook_report.evaluation:"
+msgid "Type of data displayed"
+msgstr "Art der dargestellten Daten"
+
 msgctxt "field:cashbook_report.evaluation,name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:cashbook_report.evaluation,dtype:"
-msgid "Data type"
-msgstr "Datenart"
+msgctxt "field:cashbook_report.evaluation,dtype1:"
+msgid "Data type 1"
+msgstr "Datenart 1"
 
-msgctxt "selection:cashbook_report.evaluation,dtype:"
-msgid "Cashbooks"
-msgstr "Kassenbücher"
+msgctxt "help:cashbook_report.evaluation,dtype1:"
+msgid "Type of data displayed"
+msgstr "Art der dargestellten Daten"
 
-msgctxt "selection:cashbook_report.evaluation,dtype:"
-msgid "Types of Cashbooks"
-msgstr "Typen von Kassenbüchern"
+msgctxt "field:cashbook_report.evaluation,dtype2:"
+msgid "Data type 2"
+msgstr "Datenart 2"
 
-msgctxt "selection:cashbook_report.evaluation,dtype:"
-msgid "Currencys"
-msgstr "Währungen"
+msgctxt "help:cashbook_report.evaluation,dtype2:"
+msgid "Type of data displayed"
+msgstr "Art der dargestellten Daten"
 
-msgctxt "selection:cashbook_report.evaluation,dtype:"
-msgid "Categories"
-msgstr "Kategorien"
+msgctxt "field:cashbook_report.evaluation,dtype3:"
+msgid "Data type 3"
+msgstr "Datenart 3"
 
-msgctxt "help:cashbook_report.evaluation,dtype:"
+msgctxt "help:cashbook_report.evaluation,dtype3:"
+msgid "Type of data displayed"
+msgstr "Art der dargestellten Daten"
+
+msgctxt "field:cashbook_report.evaluation,dtype4:"
+msgid "Data type 4"
+msgstr "Datenart 4"
+
+msgctxt "help:cashbook_report.evaluation,dtype4:"
+msgid "Type of data displayed"
+msgstr "Art der dargestellten Daten"
+
+msgctxt "field:cashbook_report.evaluation,dtype5:"
+msgid "Data type 5"
+msgstr "Datenart 5"
+
+msgctxt "help:cashbook_report.evaluation,dtype5:"
 msgid "Type of data displayed"
 msgstr "Art der dargestellten Daten"
 

locale/en.po

@@ -6,15 +6,15 @@ msgctxt "model:ir.message,text:msg_name_cashbook"
 msgid "Type of evaluation must be '%(typename)s'."
 msgstr "Type of evaluation must be '%(typename)s'."
 
-msgctxt "model:ir.message,text:msg_dtype_cashbook"
+msgctxt "model:ir.message,text:msg_dtype_cashbooks"
 msgid "Cashbooks [Amount]"
 msgstr "Cashbooks [Amount]"
 
-msgctxt "model:ir.message,text:msg_dtype_cashbook_gldiff"
+msgctxt "model:ir.message,text:msg_dtype_cashbooks_gldiff"
 msgid "Cashbooks [Amount of Profit/Loss]"
 msgstr "Cashbooks [Amount of Profit/Loss]"
 
-msgctxt "model:ir.message,text:msg_dtype_cashbook_glperc"
+msgctxt "model:ir.message,text:msg_dtype_cashbooks_glperc"
 msgid "Cashbooks [Percent of Profit/Loss]"
 msgstr "Cashbooks [Percent of Profit/Loss]"
 
@@ -22,34 +22,66 @@ msgctxt "model:ir.message,text:msg_dtype_cashbooks_glvalue"
 msgid "Cashbooks [Current Value]"
 msgstr "Cashbooks [Current Value]"
 
-msgctxt "model:ir.message,text:msg_dtype_type"
-msgid "Types of Cashbooks"
-msgstr "Types of Cashbooks"
+msgctxt "model:ir.message,text:msg_dtype_cashbooks_glyield"
+msgid "Cashbooks [Total Yield]"
+msgstr "Cashbooks [Total Yield]"
 
-msgctxt "model:ir.message,text:msg_dtype_currency"
+msgctxt "model:ir.message,text:msg_dtype_types"
+msgid "Types of Cashbooks [Amount]"
+msgstr "Types of Cashbooks [Amount]"
+
+msgctxt "model:ir.message,text:msg_dtype_types_gldiff"
+msgid "Types of Cashbooks [Amount of Profit/Loss]"
+msgstr "Types of Cashbooks [Amount of Profit/Loss]"
+
+msgctxt "model:ir.message,text:msg_dtype_types_glvalue"
+msgid "Types of Cashbooks [Current Value]"
+msgstr "Types of Cashbooks [Current Value]"
+
+msgctxt "model:ir.message,text:msg_dtype_types_glperc"
+msgid "Types of Cashbooks [Percent of Profit/Loss]"
+msgstr "Types of Cashbooks [Percent of Profit/Loss]"
+
+msgctxt "model:ir.message,text:msg_dtype_types_glyield"
+msgid "Types of Cashbooks [Total Yield]"
+msgstr "Types of Cashbooks [Total Yield]"
+
+msgctxt "model:ir.message,text:msg_dtype_currencies"
 msgid "Currencies"
 msgstr "Currencies"
 
-msgctxt "model:ir.message,text:msg_dtype_category"
+msgctxt "model:ir.message,text:msg_dtype_categories"
 msgid "Categories [Amount]"
 msgstr "Categories [Amount]"
 
-msgctxt "model:ir.message,text:msg_dtype_category_gldiff"
+msgctxt "model:ir.message,text:msg_dtype_categories_gldiff"
 msgid "Categories [Amount of Profit/Loss]"
 msgstr "Categories [Amount of Profit/Loss]"
 
-msgctxt "model:ir.message,text:msg_dtype_category_glvalue"
+msgctxt "model:ir.message,text:msg_dtype_categories_glvalue"
 msgid "Categories [Current Value]"
 msgstr "Categories [Current Value]"
 
-msgctxt "model:ir.message,text:msg_dtype_category_glperc"
+msgctxt "model:ir.message,text:msg_dtype_categories_glperc"
 msgid "Categories [Percent of Profit/Loss]"
 msgstr "Categories [Percent of Profit/Loss]"
 
+msgctxt "model:ir.message,text:msg_dtype_categories_glyield"
+msgid "Categories [Total Yield]"
+msgstr "Categories [Total Yield]"
+
 msgctxt "model:ir.message,text:msg_name_graph"
 msgid "Graph: %(gname)s"
 msgstr "Graph: %(gname)s"
 
+msgctxt "model:ir.message,text:msg_not_same_basetype"
+msgid "Type of evaluation must be of the same base type like '%(typename)s'."
+msgstr "Type of evaluation must be of the same base type like '%(typename)s'."
+
+msgctxt "model:ir.message,text:msg_no_pie_with_dtype2"
+msgid "The pie display cannot be used by multiple data sources in the evaluation '%(evalname)s'."
+msgstr "The pie display cannot be used by multiple data sources in the evaluation '%(evalname)s'."
+
 msgctxt "model:ir.rule.group,name:rg_eval_write_adm"
 msgid "Administrators: Evaluation read/write"
 msgstr "Administrators: Evaluation read/write"
@@ -94,17 +126,49 @@ msgctxt "field:cashbook_report.eval_line,currency_digits:"
 msgid "Currency Digits"
 msgstr "Currency Digits"
 
-msgctxt "field:cashbook_report.eval_line,eval_dtype:"
-msgid "Data type"
-msgstr "Data type"
+msgctxt "field:cashbook_report.eval_line,eval_dtype1:"
+msgid "Data type 1"
+msgstr "Data type 1"
+
+msgctxt "field:cashbook_report.eval_line,eval_dtype2:"
+msgid "Data type 2"
+msgstr "Data type 2"
+
+msgctxt "field:cashbook_report.eval_line,eval_dtype3:"
+msgid "Data type 3"
+msgstr "Data type 3"
+
+msgctxt "field:cashbook_report.eval_line,eval_dtype4:"
+msgid "Data type 4"
+msgstr "Data type 4"
+
+msgctxt "field:cashbook_report.eval_line,eval_dtype5:"
+msgid "Data type 5"
+msgstr "Data type 5"
 
 msgctxt "field:cashbook_report.eval_line,name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:cashbook_report.eval_line,balance:"
-msgid "Balance"
-msgstr "Balance"
+msgctxt "field:cashbook_report.eval_line,value1:"
+msgid "Value 1"
+msgstr "Value 1"
+
+msgctxt "field:cashbook_report.eval_line,value2:"
+msgid "Value 2"
+msgstr "Value 2"
+
+msgctxt "field:cashbook_report.eval_line,value3:"
+msgid "Value 3"
+msgstr "Value 3"
+
+msgctxt "field:cashbook_report.eval_line,value4:"
+msgid "Value 4"
+msgstr "Value 4"
+
+msgctxt "field:cashbook_report.eval_line,value5:"
+msgid "Value 5"
+msgstr "Value 5"
 
 msgctxt "model:cashbook_report.evaluation,name:"
 msgid "Evaluation"
@@ -122,31 +186,51 @@ msgctxt "view:cashbook_report.evaluation:"
 msgid "Representation"
 msgstr "Representation"
 
+msgctxt "view:cashbook_report.evaluation:"
+msgid "Type of data displayed"
+msgstr "Type of data displayed"
+
 msgctxt "field:cashbook_report.evaluation,name:"
 msgid "Name"
 msgstr "Name"
 
-msgctxt "field:cashbook_report.evaluation,dtype:"
-msgid "Data type"
-msgstr "Data type"
+msgctxt "field:cashbook_report.evaluation,dtype1:"
+msgid "Data type 1"
+msgstr "Data type 1"
 
-msgctxt "selection:cashbook_report.evaluation,dtype:"
-msgid "Cashbooks"
-msgstr "Cashbooks"
+msgctxt "help:cashbook_report.evaluation,dtype1:"
+msgid "Type of data displayed"
+msgstr "Type of data displayed"
 
-msgctxt "selection:cashbook_report.evaluation,dtype:"
-msgid "Types of Cashbooks"
-msgstr "Types of Cashbooks"
+msgctxt "field:cashbook_report.evaluation,dtype2:"
+msgid "Data type 2"
+msgstr "Data type 2"
 
-msgctxt "selection:cashbook_report.evaluation,dtype:"
-msgid "Currencys"
-msgstr "Currencys"
+msgctxt "help:cashbook_report.evaluation,dtype2:"
+msgid "Type of data displayed"
+msgstr "Type of data displayed"
 
-msgctxt "selection:cashbook_report.evaluation,dtype:"
-msgid "Categories"
-msgstr "Categories"
+msgctxt "field:cashbook_report.evaluation,dtype3:"
+msgid "Data type 3"
+msgstr "Data type 3"
 
-msgctxt "help:cashbook_report.evaluation,dtype:"
+msgctxt "help:cashbook_report.evaluation,dtype3:"
+msgid "Type of data displayed"
+msgstr "Type of data displayed"
+
+msgctxt "field:cashbook_report.evaluation,dtype4:"
+msgid "Data type 4"
+msgstr "Data type 4"
+
+msgctxt "help:cashbook_report.evaluation,dtype4:"
+msgid "Type of data displayed"
+msgstr "Type of data displayed"
+
+msgctxt "field:cashbook_report.evaluation,dtype5:"
+msgid "Data type 5"
+msgstr "Data type 5"
+
+msgctxt "help:cashbook_report.evaluation,dtype5:"
 msgid "Type of data displayed"
 msgstr "Type of data displayed"
 

message.xml

@@ -8,39 +8,63 @@ full copyright notices and license terms. -->
         <record model="ir.message" id="msg_invalid_dtype">
             <field name="text">Type of evaluation must be '%(typename)s'.</field>
         </record>
-        <record model="ir.message" id="msg_dtype_cashbook">
+        <record model="ir.message" id="msg_not_same_basetype">
+            <field name="text">Type of evaluation must be of the same base type like '%(typename)s'.</field>
+        </record>
+        <record model="ir.message" id="msg_dtype_cashbooks">
             <field name="text">Cashbooks [Amount]</field>
         </record>
-        <record model="ir.message" id="msg_dtype_cashbook_gldiff">
+        <record model="ir.message" id="msg_dtype_cashbooks_gldiff">
             <field name="text">Cashbooks [Amount of Profit/Loss]</field>
         </record>
-        <record model="ir.message" id="msg_dtype_cashbook_glperc">
+        <record model="ir.message" id="msg_dtype_cashbooks_glperc">
             <field name="text">Cashbooks [Percent of Profit/Loss]</field>
         </record>
         <record model="ir.message" id="msg_dtype_cashbooks_glvalue">
             <field name="text">Cashbooks [Current Value]</field>
         </record>
-        <record model="ir.message" id="msg_dtype_type">
-            <field name="text">Types of Cashbooks</field>
+        <record model="ir.message" id="msg_dtype_cashbooks_glyield">
+            <field name="text">Cashbooks [Total Yield]</field>
         </record>
-        <record model="ir.message" id="msg_dtype_currency">
+        <record model="ir.message" id="msg_dtype_types">
+            <field name="text">Types of Cashbooks [Amount]</field>
+        </record>
+        <record model="ir.message" id="msg_dtype_types_gldiff">
+            <field name="text">Types of Cashbooks [Amount of Profit/Loss]</field>
+        </record>
+        <record model="ir.message" id="msg_dtype_types_glvalue">
+            <field name="text">ypes of Cashbooks [Current Value]</field>
+        </record>
+        <record model="ir.message" id="msg_dtype_types_glperc">
+            <field name="text">Types of Cashbooks [Percent of Profit/Loss]</field>
+        </record>
+        <record model="ir.message" id="msg_dtype_types_glyield">
+            <field name="text">Types of Cashbooks [Total Yield]</field>
+        </record>
+        <record model="ir.message" id="msg_dtype_currencies">
             <field name="text">Currencies</field>
         </record>
-        <record model="ir.message" id="msg_dtype_category">
+        <record model="ir.message" id="msg_dtype_categories">
             <field name="text">Categories [Amount]</field>
         </record>
-        <record model="ir.message" id="msg_dtype_category_gldiff">
+        <record model="ir.message" id="msg_dtype_categories_gldiff">
             <field name="text">Categories [Amount of Profit/Loss]</field>
         </record>
-        <record model="ir.message" id="msg_dtype_category_glvalue">
+        <record model="ir.message" id="msg_dtype_categories_glvalue">
             <field name="text">Categories [Current Value]</field>
         </record>
-        <record model="ir.message" id="msg_dtype_category_glperc">
+        <record model="ir.message" id="msg_dtype_categories_glperc">
             <field name="text">Categories [Percent of Profit/Loss]</field>
         </record>
+        <record model="ir.message" id="msg_dtype_categories_glyield">
+            <field name="text">Categories [Total Yield]</field>
+        </record>
         <record model="ir.message" id="msg_name_graph">
             <field name="text">Graph: %(gname)s</field>
         </record>
+        <record model="ir.message" id="msg_no_pie_with_dtype2">
+            <field name="text">The pie display cannot be used by multiple data sources in the evaluation '%(evalname)s'.</field>
+        </record>
 
     </data>
 </tryton>

setup.py

@@ -2,7 +2,7 @@
 """
 
 # Always prefer setuptools over distutils
-from setuptools import setup, find_packages
+from setuptools import setup
 # To use a consistent encoding
 from codecs import open
 from os import path
@@ -36,10 +36,10 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f:
         l2 = i.strip().split(';')
         if len(l2) < 4:
             continue
-        modversion[l2[0]] = {'min':l2[1], 'max':l2[2], 'prefix':l2[3]}
+        modversion[l2[0]] = {'min': l2[1], 'max': l2[2], 'prefix': l2[3]}
 
 # tryton-version
-major_version = 6
+major_version = 7
 minor_version = 0
 
 requires = []
@@ -51,22 +51,25 @@ for dep in info.get('depends', []):
                 prefix = modversion[dep]['prefix']
 
             if len(modversion[dep]['max']) > 0:
-                requires.append('%s_%s >= %s, <= %s' %
-                    (prefix, dep, modversion[dep]['min'], modversion[dep]['max']))
-            else :
-                requires.append('%s_%s >= %s' %
-                    (prefix, dep, modversion[dep]['min']))
-        else :
-          requires.append('%s_%s >= %s.%s, < %s.%s' %
-                ('trytond', dep, major_version, minor_version,
+                requires.append('%s_%s >= %s, <= %s' % (
+                    prefix, dep, modversion[dep]['min'],
+                    modversion[dep]['max']))
+            else:
+                requires.append('%s_%s >= %s' % (
+                    prefix, dep, modversion[dep]['min']))
+        else:
+            requires.append('%s_%s >= %s.%s, < %s.%s' % (
+                'trytond', dep, major_version, minor_version,
                 major_version, minor_version + 1))
-requires.append('trytond >= %s.%s, < %s.%s' %
-        (major_version, minor_version, major_version, minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' % (
+    major_version, minor_version, major_version, minor_version + 1))
 
-setup(name='%s_%s' % (PREFIX, MODULE),
+setup(
+    name='%s_%s' % (PREFIX, MODULE),
     version=info.get('version', '0.0.1'),
     description='Tryton module to add reports to cashbook.',
     long_description=long_description,
+    long_description_content_type='text/x-rst',
     url='https://www.m-ds.de/',
     download_url='https://scmdev.m-ds.de/Tryton/Extra/cashbook_report',
     author='martin-data services',
@@ -88,6 +91,7 @@ setup(name='%s_%s' % (PREFIX, MODULE),
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
 
     keywords='tryton cashbook report',
@@ -96,7 +100,8 @@ setup(name='%s_%s' % (PREFIX, MODULE),
         'trytond.modules.%s' % MODULE,
         ],
     package_data={
-        'trytond.modules.%s' % MODULE: (info.get('xml', [])
+        'trytond.modules.%s' % MODULE: (
+            info.get('xml', [])
             + ['tryton.cfg', 'locale/*.po', 'tests/*.py',
                 'view/*.xml', 'icon/*.svg',
                 'report/*.fods', 'versiondep.txt', 'README.rst']),

templates.py

@@ -3,10 +3,19 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-cashbook_types = ['cashbooks', 'cashbooks_gldiff', 'cashbooks_glperc', 'cashbooks_glvalue']
-category_types = ['categories', 'category_gldiff', 'category_glvalue', 'category_glperc']
+cashbook_types = [
+    'cashbooks', 'cashbooks_gldiff', 'cashbooks_glperc',
+    'cashbooks_glvalue', 'cashbooks_glyield']
+category_types = [
+    'categories', 'categories_gldiff', 'categories_glvalue',
+    'categories_glperc', 'categories_glyield']
+booktype_types = [
+    'types', 'types_gldiff', 'types_glvalue',
+    'types_glperc', 'types_glyield']
+currency_types = ['currencies']
 
-template_view_line = '<field name="balance" fill="%(fill)s" empty="0" string="%(string)s"/>'
+template_view_line = '<field name="%(fname)s" fill="%(fill)s" ' + \
+    'empty="0" string="%(string)s"/>'
 
 template_view_graph = """<?xml version="1.0"?>
 <graph type="%(type)s" legend="%(legend)s" %(colscheme)s %(bgcol)s>

tests/__init__.py

@@ -1,24 +1,4 @@
-# This file is part of Tryton.  The COPYRIGHT file at the top level of
-# this repository contains the full copyright notices and license terms.
-
-import trytond.tests.test_tryton
-import unittest
-
-from trytond.modules.cashbook_report.tests.test_report import ReportTestCase
-
-
-__all__ = ['suite']
-
-
-class CashbookReportTestCase(\
-    ReportTestCase,\
-    ):
-    'Test cashbook report module'
-    module = 'cashbook_report'
-
-# end CashbookReportTestCase
-
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(CashbookReportTestCase))
-    return suite
+# -*- coding: utf-8 -*-
+# This file is part of the cashbook-module from m-ds for Tryton.
+# The COPYRIGHT file at the top level of this repository contains the
+# full copyright notices and license terms.

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=6.0.5
+version=7.0.0
 depends:
     res
     cashbook

versiondep.txt

@@ -1,3 +1,2 @@
-cashbook;6.0.24;6.0.999;mds
-cashbook_bookcategory;6.0.3;6.0.999;mds
-cashbook_investment;6.0.5;6.0.999;mds
+cashbook;7.0.32;7.0.999;mds
+cashbook_bookcategory;7.0.5;7.0.999;mds

view/evalline_form.xml

@@ -5,7 +5,19 @@ full copyright notices and license terms. -->
 <form>
     <label name="name"/>
     <field name="name"/>
-    <label name="balance"/>
-    <field name="balance"/>
     <field name="name_line"/>
+    <newline/>
+
+    <label name="value1"/>
+    <field name="value1"/>
+    <label name="value2"/>
+    <field name="value2"/>
+
+    <label name="value3"/>
+    <field name="value3"/>
+    <label name="value4"/>
+    <field name="value4"/>
+
+    <label name="value5"/>
+    <field name="value5"/>
 </form>

view/evalline_graph.xml

@@ -7,6 +7,6 @@ full copyright notices and license terms. -->
         <field name="name"/>
     </x>
     <y>
-        <field name="balance" fill="1" empty="0"/>
+        <field name="value1" fill="1" empty="0"/>
     </y>
 </graph>

view/evalline_list.xml

@@ -4,5 +4,9 @@ The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tree >
     <field name="name"/>
-    <field name="balance"/>
+    <field name="value1"/>
+    <field name="value2"/>
+    <field name="value3"/>
+    <field name="value4"/>
+    <field name="value5"/>
 </tree>

view/evaluation_form.xml

@@ -5,10 +5,23 @@ full copyright notices and license terms. -->
 <form col="6">
     <label name="name"/>
     <field name="name"/>
-    <label name="dtype"/>
-    <field name="dtype"/>
     <label name="currency"/>
     <field name="currency"/>
+    <newline/>
+
+    <separator colspan="6" id="sepdtype" string="Type of data displayed"/>
+    <label name="dtype1"/>
+    <field name="dtype1"/>
+    <label name="dtype2"/>
+    <field name="dtype2"/>
+    <label name="dtype3"/>
+    <field name="dtype3"/>
+
+    <label name="dtype4"/>
+    <field name="dtype4"/>
+    <label name="dtype5"/>
+    <field name="dtype5"/>
+    <newline/>
 
     <separator colspan="6" id="sepdisplay" string="Representation"/>
     <label name="chart"/>

view/evaluation_list.xml

@@ -4,7 +4,11 @@ The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tree keyword_open="1" sequence="sequence">
     <field name="name"/>
-    <field name="dtype"/>
+    <field name="dtype1"/>
+    <field name="dtype2" optional="0"/>
+    <field name="dtype3" optional="1"/>
+    <field name="dtype4" optional="1"/>
+    <field name="dtype5" optional="1"/>
     <field name="chart"/>
     <field name="legend"/>
     <field name="maincolor"/>